From 614ca05ab04509f12a3bcff71db0068a6ac8af48 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 14:58:40 +0200 Subject: gnu: glib: Update to 2.56.1. * gnu/packages/glib.scm (glib): Update to 2.56.1. --- 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 6ea73ac12e..3f61fb0a36 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -149,7 +149,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.56.0") + (version "2.56.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -157,7 +157,7 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "1iqgi90fmpl3l23jm2iv44qp7hqsxvnv7978s18933bvx4bnxvzc")) + "138b3hi7glfpbia49gi07lyz1dh9k0jl9vpd3aiwflf6y923zvs0")) (patches (search-patches "glib-tests-timer.patch")))) (build-system gnu-build-system) (outputs '("out" ; everything -- cgit v1.2.3 From e85f7ac21ce6ce6d0bbe035d30d5a9ec59d5d88c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 15:00:28 +0200 Subject: gnu: gobject-introspection: Update to 1.56.1. * gnu/packages/glib.scm (gobject-introspection): Update to 1.56.1. --- 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 3f61fb0a36..e68df128f0 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -302,14 +302,14 @@ dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.56.0") + (version "1.56.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "1y50pbn5qqbcv2h9rkz96wvv5jls2gma9bkqjq6wapmaszx5jw0d")) + (base32 "0jx2kryjd7l0vl5gb3qp1qjfy3cjiizvcd1snsm7pzwrzz67aa2v")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 41db0517cea14688306593ff5f50a1f60dc00e89 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 15:02:46 +0200 Subject: gnu: pango: Update to 1.42.1. * gnu/packages/gtk.scm (pango): Update to 1.42.1. --- 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 b55af15900..dda1a50c0c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -216,7 +216,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public pango (package (name "pango") - (version "1.42.0") + (version "1.42.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -224,7 +224,7 @@ affine transformation (scale, rotation, shear, etc.).") name "-" version ".tar.xz")) (sha256 (base32 - "0illn78nfwpa8y5knh9ir74wa1skc2hi8f3ny19zgpyf7n5dh94r")))) + "0cnfgcya3wbs9m8g44cl5ww6wbp6qbw96qvsgkr8ymwqn9b6fnli")))) (build-system gnu-build-system) (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files. -- cgit v1.2.3 From d12dff4526def2bc8c3681c2e6af6641647734a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 15:14:00 +0200 Subject: gnu: cairo: Update to 1.14.12. * gnu/packages/gtk.scm (cairo): Update to 1.14.12. --- 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 dda1a50c0c..79d0646b7e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -111,14 +111,14 @@ tools have full access to view and control running applications.") (define-public cairo (package (name "cairo") - (version "1.14.10") + (version "1.14.12") (source (origin (method url-fetch) (uri (string-append "https://cairographics.org/releases/cairo-" version ".tar.xz")) (sha256 (base32 - "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy")) + "05mzyxkvsfc1annjw2dja8vka01ampp9pp93lg09j8hba06g144c")) (patches (search-patches "cairo-CVE-2016-9082.patch")))) (build-system gnu-build-system) (propagated-inputs -- cgit v1.2.3 From 30d900d4eeb203ab6766bb7dabfeba62263d1617 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Apr 2018 21:36:44 +0200 Subject: gnu: sqlite: Update to 3.23.1. * gnu/packages/databases.scm (sqlite): Update to 3.23.1. --- 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 441a6977f6..bd12f4cdb1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1008,7 +1008,7 @@ for example from a shell script.") (define-public sqlite (package (name "sqlite") - (version "3.23.0") + (version "3.23.1") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -1024,7 +1024,7 @@ for example from a shell script.") numeric-version ".tar.gz"))) (sha256 (base32 - "0jbf78g3cm5wq77k7sfg8fb6rz44hnp9hs7p5d66fwd000c1lwdp")))) + "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.2.3 From 1f172d8003e23f4d0679ef99ca0566f2b8777a4e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Apr 2018 20:01:06 +0200 Subject: gnu: libuv: Update to 1.20.2. * gnu/packages/libevent.scm (libuv): Update to 1.20.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 983c8625e4..f80b205726 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -121,14 +121,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.19.2") + (version "1.20.2") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1msk9ac1z69whww88ibrwjqkd1apdla6l77cm2fwy5kigq0z5g3w")))) + "08h39zhg75lmfmk4lx17hpxqrr5yjgnc9b5rpchcankc3lcsqxbb")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From c98fe1d0648ba5d94f2954e9e5c3b2a22ef18fb6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Apr 2018 20:02:56 +0200 Subject: gnu: cmake: Update to 3.11.1. * gnu/packages/cmake.scm (cmake): Update to 3.11.1. --- 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 e9fa866411..42391158c6 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -42,7 +42,7 @@ (define-public cmake (package (name "cmake") - (version "3.11.0") + (version "3.11.1") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -50,7 +50,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "0sv5k9q6braa8hhw0y3w19avqn0xn5czv5jf5fz5blnlf7ivw4y3")) + "033x45q0lyaqr32pv92pv87pw20nja6i9794hmijrm6ilinbrgjp")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 957aac763bc7fcad5fec362938be04cdd9b2f055 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 30 Apr 2018 21:19:04 +0200 Subject: gnu: xz: Update to 5.2.4. * gnu/packages/compression.scm (xz): Update to 5.2.4. --- 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 6f44c4fb02..4a34e89324 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -373,7 +373,7 @@ compressed with pbzip2 can be decompressed with bzip2).") (define-public xz (package (name "xz") - (version "5.2.3") + (version "5.2.4") (source (origin (method url-fetch) (uri (list (string-append "http://tukaani.org/xz/xz-" version @@ -382,7 +382,7 @@ compressed with pbzip2 can be decompressed with bzip2).") version ".tar.gz"))) (sha256 (base32 - "1jr8pxnz55ifc8cvp3ivgl79ph9iik5aypsc9cma228aglsqp4ki")))) + "0ibi2zsfaz6l756spjwc5rayf4ckgc9hwmy8qinppcyk4svz64mm")))) (build-system gnu-build-system) (synopsis "General-purpose data compression") (description -- cgit v1.2.3 From 48869860bed868708c3b830da0fd94886fab3af0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 03:28:48 +0200 Subject: gnu: poppler: Update to 0.64.0. * gnu/packages/pdf.scm (poppler): Update to 0.64.0. --- gnu/packages/pdf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index c9a53698bd..ca3a601826 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017 Rene Saavedra -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -79,14 +79,14 @@ (define-public poppler (package (name "poppler") - (version "0.63.0") + (version "0.64.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17")))) + "1cb4gz3h7cfqyphhx71qc9mp417bdphchbfghmvhcy4zm4ngj7dj")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3 From 32c18fcb3c3cb10303aa4ef07571867e8ce3fe8d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Apr 2018 03:34:17 +0200 Subject: gnu: file: Update to 5.33. * gnu/packages/file.scm (file): Update to 5.33. --- gnu/packages/file.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm index 0473c519d5..78f0360c2e 100644 --- a/gnu/packages/file.scm +++ b/gnu/packages/file.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,14 +29,14 @@ (define-public file (package (name "file") - (version "5.32") + (version "5.33") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.astron.com/pub/file/file-" version ".tar.gz")) (sha256 (base32 - "0l1bfa0icng9vdwya00ff48fhvjazi5610ylbhl35qi13d6xqfc6")))) + "1iipnwjkag7q04zjkaqic41r9nlw0ml6mhqian6qkkbisb1whlhw")))) (build-system gnu-build-system) ;; When cross-compiling, this package depends upon a native install of -- cgit v1.2.3 From 38e4d5956f8d585b1c0263a1a6c79e749d7e7c90 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 03:34:47 +0200 Subject: gnu: libjpeg: Update to 9c. * gnu/packages/image.scm (libjpeg): Update to 9c. --- 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 a6d8b320da..5a3542b4aa 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -251,13 +251,13 @@ files. It can compress them as much as 40% losslessly.") (define-public libjpeg (package (name "libjpeg") - (version "9b") + (version "9c") (source (origin (method url-fetch) (uri (string-append "http://www.ijg.org/files/jpegsrc.v" version ".tar.gz")) (sha256 (base32 - "0lnhpahgdwlrkd41lx6cr90r199f8mc6ydlh7jznj5klvacd63r4")))) + "08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5")))) (build-system gnu-build-system) (synopsis "Library for handling JPEG files") (description -- cgit v1.2.3 From 5ecd5fefd0e9fb0965662f2094c16363325ba614 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 03:45:03 +0200 Subject: gnu: libgpg-error: Update to 1.29. * gnu/packages/gnupg.scm (libgpg-error): Update to 1.29. [source]: Remove upstreamed patch. * gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/gnupg.scm | 5 +- .../patches/libgpg-error-aarch64-logging-fix.patch | 58 ---------------------- 3 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index e2dc64b7e9..74e86d97a0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -850,7 +850,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ - %D%/packages/patches/libgpg-error-aarch64-logging-fix.patch \ %D%/packages/patches/libgxps-CVE-2017-11590.patch \ %D%/packages/patches/libffi-3.2.1-complex-alpha.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 17207e2173..df86ee2fc6 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -69,7 +69,7 @@ (define-public libgpg-error (package (name "libgpg-error") - (version "1.28") + (version "1.29") (source (origin (method url-fetch) @@ -77,8 +77,7 @@ version ".tar.bz2")) (sha256 (base32 - "0jfsfnh9bxlxiwxws60yah4ybjw2hshmvqp31pri4m4h8ivrbnry")) - (patches (search-patches "libgpg-error-aarch64-logging-fix.patch")))) + "1smihcrhkfy58kazjaigmfbagy52rw98fqfsv1x7ml8razx2dsgc")))) (build-system gnu-build-system) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") diff --git a/gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch b/gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch deleted file mode 100644 index d848d639b2..0000000000 --- a/gnu/packages/patches/libgpg-error-aarch64-logging-fix.patch +++ /dev/null @@ -1,58 +0,0 @@ -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=patch;h=791177de023574223eddf7288eb7c5a0721ac623 - -From 791177de023574223eddf7288eb7c5a0721ac623 Mon Sep 17 00:00:00 2001 -From: Werner Koch -Date: Sun, 18 Mar 2018 17:39:43 +0100 -Subject: [PATCH] core: Fix regression on arm64 due to invalid use of va_list. - -* src/logging.c (_gpgrt_log_printhex): Provide a dummy arg instead of -NULL. --- - -Fix -Suggested-by: Jakub Wilk - -Signed-off-by: Werner Koch ---- - src/logging.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/src/logging.c b/src/logging.c -index 1a4f620..d01f974 100644 ---- a/src/logging.c -+++ b/src/logging.c -@@ -1090,9 +1090,10 @@ _gpgrt_log_flush (void) - - - /* Print a hexdump of (BUFFER,LENGTH). With FMT passed as NULL print -- * just the raw dump, with FMT being an empty string, print a trailing -- * linefeed, otherwise print an entire debug line with the expanded -- * FMT followed by a possible wrapped hexdump and a final LF. */ -+ * just the raw dump (in this case ARG_PTR is not used), with FMT -+ * being an empty string, print a trailing linefeed, otherwise print -+ * an entire debug line with the expanded FMT followed by a possible -+ * wrapped hexdump and a final LF. */ - void - _gpgrt_logv_printhex (const void *buffer, size_t length, - const char *fmt, va_list arg_ptr) -@@ -1150,7 +1151,16 @@ _gpgrt_log_printhex (const void *buffer, size_t length, - va_end (arg_ptr); - } - else -- _gpgrt_logv_printhex (buffer, length, NULL, NULL); -+ { -+ /* va_list is not necessary a pointer and thus we can't use NULL -+ * because that would conflict with platforms using a straight -+ * struct for it (e.g. arm64). We use a dummy variable instead; -+ * the static is a simple way zero it out so to not get -+ * complains about uninitialized use. */ -+ static va_list dummy_argptr; -+ -+ _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr); -+ } - } - - --- -2.8.0.rc3 - -- cgit v1.2.3 From b745e216e4e17272d2ccd8f92acd6a9065db9112 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 06:12:59 +0200 Subject: gnu: cups-minimal, cups: Update to 2.2.7. * gnu/packages/cups.scm (cups-minimal): Update to 2.2.7. [source]: Add patch to build without LINUX-PAM. * gnu/packages/patches/cups-fix-builds-without-PAM.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/cups.scm | 7 +- .../patches/cups-fix-builds-without-PAM.patch | 201 +++++++++++++++++++++ 3 files changed, 207 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/cups-fix-builds-without-PAM.patch diff --git a/gnu/local.mk b/gnu/local.mk index 74e86d97a0..4fa88e300d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -616,6 +616,7 @@ dist_patch_DATA = \ %D%/packages/patches/crossmap-allow-system-pysam.patch \ %D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/cube-nocheck.patch \ + %D%/packages/patches/cups-fix-builds-without-PAM.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-2017-12836.patch \ %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch \ diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index a9cc3acba0..4ff79bdecb 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -173,7 +173,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") (define-public cups-minimal (package (name "cups-minimal") - (version "2.2.6") + (version "2.2.7") (source (origin (method url-fetch) @@ -181,7 +181,10 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") version "/cups-" version "-source.tar.gz")) (sha256 (base32 - "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20")))) + "0spaqv943bzzq31gqdp73934jgyhhlbzdmgvrmf5cxvhfdxn6jrw")) + ;; “PAM will soon [in 2.3.x] be required for authentication, period.” + ;; + (patches (search-patches "cups-fix-builds-without-PAM.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/cups-fix-builds-without-PAM.patch b/gnu/packages/patches/cups-fix-builds-without-PAM.patch new file mode 100644 index 0000000000..cf51bfb0f7 --- /dev/null +++ b/gnu/packages/patches/cups-fix-builds-without-PAM.patch @@ -0,0 +1,201 @@ +From 570933a6a3597371bae1beeb754ee8711d6305ab Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Mon, 2 Apr 2018 20:05:13 -0400 +Subject: [PATCH] Fix builds without PAM (Issue #5283) + +--- + CHANGES.md | 8 +++- + scheduler/auth.c | 134 ++----------------------------------------------------- + 2 files changed, 11 insertions(+), 131 deletions(-) + +diff --git a/CHANGES.md b/CHANGES.md +index f568f35af..e8fc1fbdd 100644 +--- a/CHANGES.md ++++ b/CHANGES.md +@@ -1,7 +1,13 @@ +-CHANGES - 2.2.7 - 2018-03-22 ++CHANGES - 2.2.8 - 2018-04-02 + ============================ + + ++Changes in CUPS v2.2.8 ++---------------------- ++ ++- Fixed builds without PAM (Issue #5283) ++ ++ + Changes in CUPS v2.2.7 + ---------------------- + +diff --git a/scheduler/auth.c b/scheduler/auth.c +index 8b134b5d7..fa4e2715d 100644 +--- a/scheduler/auth.c ++++ b/scheduler/auth.c +@@ -1,8 +1,8 @@ + /* + * Authorization routines for the CUPS scheduler. + * +- * Copyright 2007-2016 by Apple Inc. +- * Copyright 1997-2007 by Easy Software Products, all rights reserved. ++ * Copyright © 2007-2018 by Apple Inc. ++ * Copyright © 1997-2007 by Easy Software Products, all rights reserved. + * + * This file contains Kerberos support code, copyright 2006 by + * Jelmer Vernooij. +@@ -71,9 +71,6 @@ static int check_authref(cupsd_client_t *con, const char *right); + static int compare_locations(cupsd_location_t *a, + cupsd_location_t *b); + static cupsd_authmask_t *copy_authmask(cupsd_authmask_t *am, void *data); +-#if !HAVE_LIBPAM +-static char *cups_crypt(const char *pw, const char *salt); +-#endif /* !HAVE_LIBPAM */ + static void free_authmask(cupsd_authmask_t *am, void *data); + #if HAVE_LIBPAM + static int pam_func(int, const struct pam_message **, +@@ -694,14 +691,14 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */ + * client... + */ + +- pass = cups_crypt(password, pw->pw_passwd); ++ pass = crypt(password, pw->pw_passwd); + + if (!pass || strcmp(pw->pw_passwd, pass)) + { + # ifdef HAVE_SHADOW_H + if (spw) + { +- pass = cups_crypt(password, spw->sp_pwdp); ++ pass = crypt(password, spw->sp_pwdp); + + if (pass == NULL || strcmp(spw->sp_pwdp, pass)) + { +@@ -1995,129 +1992,6 @@ copy_authmask(cupsd_authmask_t *mask, /* I - Existing auth mask */ + } + + +-#if !HAVE_LIBPAM +-/* +- * 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms, +- * as needed. +- */ +- +-static char * /* O - Encrypted password */ +-cups_crypt(const char *pw, /* I - Password string */ +- const char *salt) /* I - Salt (key) string */ +-{ +- if (!strncmp(salt, "$1$", 3)) +- { +- /* +- * Use MD5 passwords without the benefit of PAM; this is for +- * Slackware Linux, and the algorithm was taken from the +- * old shadow-19990827/lib/md5crypt.c source code... :( +- */ +- +- int i; /* Looping var */ +- unsigned long n; /* Output number */ +- int pwlen; /* Length of password string */ +- const char *salt_end; /* End of "salt" data for MD5 */ +- char *ptr; /* Pointer into result string */ +- _cups_md5_state_t state; /* Primary MD5 state info */ +- _cups_md5_state_t state2; /* Secondary MD5 state info */ +- unsigned char digest[16]; /* MD5 digest result */ +- static char result[120]; /* Final password string */ +- +- +- /* +- * Get the salt data between dollar signs, e.g. $1$saltdata$md5. +- * Get a maximum of 8 characters of salt data after $1$... +- */ +- +- for (salt_end = salt + 3; *salt_end && (salt_end - salt) < 11; salt_end ++) +- if (*salt_end == '$') +- break; +- +- /* +- * Compute the MD5 sum we need... +- */ +- +- pwlen = strlen(pw); +- +- _cupsMD5Init(&state); +- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); +- _cupsMD5Append(&state, (unsigned char *)salt, salt_end - salt); +- +- _cupsMD5Init(&state2); +- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); +- _cupsMD5Append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3); +- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); +- _cupsMD5Finish(&state2, digest); +- +- for (i = pwlen; i > 0; i -= 16) +- _cupsMD5Append(&state, digest, i > 16 ? 16 : i); +- +- for (i = pwlen; i > 0; i >>= 1) +- _cupsMD5Append(&state, (unsigned char *)((i & 1) ? "" : pw), 1); +- +- _cupsMD5Finish(&state, digest); +- +- for (i = 0; i < 1000; i ++) +- { +- _cupsMD5Init(&state); +- +- if (i & 1) +- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); +- else +- _cupsMD5Append(&state, digest, 16); +- +- if (i % 3) +- _cupsMD5Append(&state, (unsigned char *)salt + 3, salt_end - salt - 3); +- +- if (i % 7) +- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); +- +- if (i & 1) +- _cupsMD5Append(&state, digest, 16); +- else +- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); +- +- _cupsMD5Finish(&state, digest); +- } +- +- /* +- * Copy the final sum to the result string and return... +- */ +- +- memcpy(result, salt, (size_t)(salt_end - salt)); +- ptr = result + (salt_end - salt); +- *ptr++ = '$'; +- +- for (i = 0; i < 5; i ++, ptr += 4) +- { +- n = ((((unsigned)digest[i] << 8) | (unsigned)digest[i + 6]) << 8); +- +- if (i < 4) +- n |= (unsigned)digest[i + 12]; +- else +- n |= (unsigned)digest[5]; +- +- to64(ptr, n, 4); +- } +- +- to64(ptr, (unsigned)digest[11], 2); +- ptr += 2; +- *ptr = '\0'; +- +- return (result); +- } +- else +- { +- /* +- * Use the standard crypt() function... +- */ +- +- return (crypt(pw, salt)); +- } +-} +-#endif /* !HAVE_LIBPAM */ +- +- + /* + * 'free_authmask()' - Free function for auth masks. + */ -- cgit v1.2.3 From 4eef81d9ae5216829e74a803db1ab1a156a2aee0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 06:27:32 +0200 Subject: gnu: cups-filters: Update to 1.20.3. * gnu/packages/cups.scm (cups-filters): Update to 1.20.3. --- 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 4ff79bdecb..501cadddf5 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -50,7 +50,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.20.1") + (version "1.20.3") (source(origin (method url-fetch) (uri @@ -58,7 +58,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "0qix1whz5n4ijnl6d44f1v8nzkpv99wqjyrby8vx6xnpskw5hsxk")) + "1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output -- cgit v1.2.3 From ca2c342181771b83d46a94aec9786f8dd0e0a0b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 1 May 2018 06:39:40 +0200 Subject: gnu: boost: Update to 1.67.0. * gnu/packages/boost.scm (boost): Update to 1.67.0. --- gnu/packages/boost.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 6b17e30a8e..6f96e55710 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -43,7 +43,7 @@ (define-public boost (package (name "boost") - (version "1.66.0") + (version "1.67.0") (source (origin (method url-fetch) (uri (string-append @@ -52,7 +52,7 @@ ".tar.bz2")) (sha256 (base32 - "1aaw48cmimsskzgiclwn0iifp62a5iw9cbqrhfari876af1828ap")) + "1fmdlmkzsrd46wwk834jsi2ypxj68w2by0rfcg2pzrafk5rck116")) (patches (search-patches "boost-fix-icu-build.patch")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) -- cgit v1.2.3 From 3f649c79c1f2c9431b0aea1463b2759eacd24540 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 1 May 2018 01:39:55 +0200 Subject: gnu: dbus: Update to 1.12.8. * gnu/packages/glib.scm (dbus): Update to 1.12.8. --- 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 e68df128f0..7380f7d898 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -79,7 +79,7 @@ (define dbus (package (name "dbus") - (version "1.12.6") + (version "1.12.8") (source (origin (method url-fetch) (uri (string-append @@ -87,7 +87,7 @@ version ".tar.gz")) (sha256 (base32 - "05picaq8j60wlwyi84qvw5liw3nd0cws9va3krnc3pms0wm906v2")) + "1cvfi7jiby12h0f5gbysphhk99m6mch87ab3cqxkj0w36gkrkp72")) (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From a551ba9ba75ca8de136949b4e7ebe9f44d0c7d2e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 1 May 2018 14:59:20 +0200 Subject: gnu: python2: Update to 2.7.15. * gnu/packages/python.scm (python-2.7): Update to 2.7.15. --- 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 37434c4758..3c07cfe4be 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -142,7 +142,7 @@ (define-public python-2.7 (package (name "python2") - (version "2.7.14") + (version "2.7.15") (source (origin (method url-fetch) @@ -150,7 +150,7 @@ version "/Python-" version ".tar.xz")) (sha256 (base32 - "0rka541ys16jwzcnnvjp2v12m4cwgd2jp6wj4kj511p715pb5zvi")) + "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92")) (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 3cc9a8a1324b865fa70d61647c5a41de1e439522 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 7 May 2018 00:11:19 +0200 Subject: gnu: libsigsegv: Install the shared library. Suggested by Weldon Goree . * gnu/packages/libsigsegv.scm (libsigsegv)[arguments]: Add #:configure-flags. --- gnu/packages/libsigsegv.scm | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/gnu/packages/libsigsegv.scm b/gnu/packages/libsigsegv.scm index 7f63bb26c4..927a12f4cf 100644 --- a/gnu/packages/libsigsegv.scm +++ b/gnu/packages/libsigsegv.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Ludovic Courtès +;;; Copyright © 2012, 2013, 2018 Ludovic Courtès ;;; Copyright © 2017 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -38,20 +38,23 @@ (home-page "https://www.gnu.org/software/libsigsegv/") (synopsis "Library for handling page faults") (arguments - ;; On MIPS, work around this error: - ;; - ;; In file included from fault-linux-mips-old.h:18:0, - ;; [...] - ;; linux-libre-headers-cross-mips64el-linux-gnu-3.3.8/include/asm/sigcontext.h:57:8: error: redefinition of 'struct sigcontext' - (if (string-contains (or (%current-target-system) (%current-system)) - "mips64el") - `(#:phases (modify-phases %standard-phases - (add-before 'configure 'patch-mips-old-h - (lambda _ - (substitute* "src/fault-linux-mips-old.h" - (("#include ") "")) - #t)))) - '())) + `(;; The shared library isn't built by default but some packages need it. + #:configure-flags '("--enable-shared") + + ;; On MIPS, work around this error: + ;; + ;; In file included from fault-linux-mips-old.h:18:0, + ;; [...] + ;; linux-libre-headers-cross-mips64el-linux-gnu-3.3.8/include/asm/sigcontext.h:57:8: error: redefinition of 'struct sigcontext' + ,@(if (string-contains (or (%current-target-system) (%current-system)) + "mips64el") + `(#:phases (modify-phases %standard-phases + (add-before 'configure 'patch-mips-old-h + (lambda _ + (substitute* "src/fault-linux-mips-old.h" + (("#include ") "")) + #t)))) + '()))) (description "GNU libsigsegv is a library to handle page faults, which occur when a program tries to access an unavailable region of memory, in user mode. By -- cgit v1.2.3 From ad4835fe018a4a0c1955385c819fed7ec4a841d5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 17 Apr 2018 12:32:56 +0200 Subject: gremlin: Preserve offset info for dynamic entries. * guix/build/gremlin.scm (): New record type. (raw-dynamic-entries): Return a list of . (dynamic-entries): Adjust accordingly and return a list of . (elf-dynamic-info)[matching-entry]: New procedure. Use it. --- guix/build/gremlin.scm | 86 +++++++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 36 deletions(-) diff --git a/guix/build/gremlin.scm b/guix/build/gremlin.scm index bb019967e5..78d1333117 100644 --- a/guix/build/gremlin.scm +++ b/guix/build/gremlin.scm @@ -99,10 +99,16 @@ dynamic linking information." ;; } d_un; ;; } Elf64_Dyn; +(define-record-type + (dynamic-entry type value offset) + dynamic-entry? + (type dynamic-entry-type) ;DT_* + (value dynamic-entry-value) ;string | number | ... + (offset dynamic-entry-offset)) ;integer + (define (raw-dynamic-entries elf segment) - "Return as a list of type/value pairs all the dynamic entries found in -SEGMENT, the 'PT_DYNAMIC' segment of ELF. In the result, each car is a DT_ -value, and the interpretation of the cdr depends on the type." + "Return as a list of for the dynamic entries found in +SEGMENT, the 'PT_DYNAMIC' segment of ELF." (define start (elf-segment-offset segment)) (define bytes @@ -123,7 +129,9 @@ value, and the interpretation of the cdr depends on the type." (if (= type DT_NULL) ;finished? (reverse result) (loop (+ offset (* 2 word-size)) - (alist-cons type value result))))))) + (cons (dynamic-entry type value + (+ start offset word-size)) + result))))))) (define (vma->offset elf vma) "Convert VMA, a virtual memory address, to an offset within ELF. @@ -148,35 +156,33 @@ offset." (define (dynamic-entries elf segment) "Return all the dynamic entries found in SEGMENT, the 'PT_DYNAMIC' segment -of ELF, as a list of type/value pairs. The type is a DT_ value, and the value -may be a string or an integer depending on the entry type (for instance, the -value of DT_NEEDED entries is a string.)" +of ELF, as a list of . The value of each entry may be a string +or an integer depending on the entry type (for instance, the value of +DT_NEEDED entries is a string.) Likewise the offset is the offset within the +string table if the type is a string." (define entries (raw-dynamic-entries elf segment)) (define string-table-offset - (any (match-lambda - ((type . value) - (and (= type DT_STRTAB) value)) - (_ #f)) + (any (lambda (entry) + (and (= (dynamic-entry-type entry) DT_STRTAB) + (dynamic-entry-value entry))) entries)) - (define (interpret-dynamic-entry type value) - (cond ((memv type (list DT_NEEDED DT_SONAME DT_RPATH DT_RUNPATH)) - (if string-table-offset - (pointer->string - (bytevector->pointer (elf-bytes elf) - (vma->offset - elf - (+ string-table-offset value)))) - value)) - (else - value))) - - (map (match-lambda - ((type . value) - (cons type (interpret-dynamic-entry type value)))) - entries)) + (define (interpret-dynamic-entry entry) + (let ((type (dynamic-entry-type entry)) + (value (dynamic-entry-value entry))) + (cond ((memv type (list DT_NEEDED DT_SONAME DT_RPATH DT_RUNPATH)) + (if string-table-offset + (let* ((offset (vma->offset elf (+ string-table-offset value))) + (value (pointer->string + (bytevector->pointer (elf-bytes elf) offset)))) + (dynamic-entry type value offset)) + (dynamic-entry type value (dynamic-entry-offset entry)))) + (else + (dynamic-entry type value (dynamic-entry-offset entry)))))) + + (map interpret-dynamic-entry entries)) ;;; @@ -200,21 +206,29 @@ value of DT_NEEDED entries is a string.)" (define (elf-dynamic-info elf) "Return dynamic-link information for ELF as an object, or #f if ELF lacks dynamic-link information." + (define (matching-entry type) + (lambda (entry) + (= type (dynamic-entry-type entry)))) + (match (dynamic-link-segment elf) (#f #f) ((? elf-segment? dynamic) (let ((entries (dynamic-entries elf dynamic))) - (%elf-dynamic-info (assv-ref entries DT_SONAME) - (filter-map (match-lambda - ((type . value) - (and (= type DT_NEEDED) value)) - (_ #f)) + (%elf-dynamic-info (find (matching-entry DT_SONAME) entries) + (filter-map (lambda (entry) + (and (= (dynamic-entry-type entry) + DT_NEEDED) + (dynamic-entry-value entry))) entries) - (or (and=> (assv-ref entries DT_RPATH) - search-path->list) + (or (and=> (find (matching-entry DT_RPATH) + entries) + (compose search-path->list + dynamic-entry-value)) '()) - (or (and=> (assv-ref entries DT_RUNPATH) - search-path->list) + (or (and=> (find (matching-entry DT_RUNPATH) + entries) + (compose search-path->list + dynamic-entry-value)) '())))))) (define %libc-libraries -- cgit v1.2.3 From b178fc236908ad2da86734ea8e01abd3ff8981da Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 17 Apr 2018 13:38:12 +0200 Subject: gremlin: Add 'strip-runpath'. * guix/build/gremlin.scm (strip-runpath): New procedure. * tests/gremlin.scm (c-compiler): New variable. ("strip-runpath"): New test. --- guix/build/gremlin.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++- tests/gremlin.scm | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/guix/build/gremlin.scm b/guix/build/gremlin.scm index 78d1333117..e8ea66dfb3 100644 --- a/guix/build/gremlin.scm +++ b/guix/build/gremlin.scm @@ -41,7 +41,8 @@ elf-dynamic-info-runpath expand-origin - validate-needed-in-runpath)) + validate-needed-in-runpath + strip-runpath)) ;;; Commentary: ;;; @@ -320,4 +321,47 @@ be found in RUNPATH ~s~%" ;; (format (current-error-port) "~a is OK~%" file)) (null? not-found)))))) +(define (strip-runpath file) + "Remove from the DT_RUNPATH of FILE any entries that are not necessary +according to DT_NEEDED." + (define (minimal-runpath needed runpath) + (filter (lambda (directory) + (and (string-prefix? "/" directory) + (any (lambda (lib) + (file-exists? (string-append directory "/" lib))) + needed))) + runpath)) + + (define port + (open-file file "r+b")) + + (catch #t + (lambda () + (let* ((elf (parse-elf (get-bytevector-all port))) + (entries (dynamic-entries elf (dynamic-link-segment elf))) + (needed (filter-map (lambda (entry) + (and (= (dynamic-entry-type entry) + DT_NEEDED) + (dynamic-entry-value entry))) + entries)) + (runpath (find (lambda (entry) + (= DT_RUNPATH (dynamic-entry-type entry))) + entries)) + (old (search-path->list + (dynamic-entry-value runpath))) + (new (minimal-runpath needed old))) + (unless (equal? old new) + (format (current-error-port) + "~a: stripping RUNPATH to ~s (removed ~s)~%" + file new + (lset-difference string=? old new)) + (seek port (dynamic-entry-offset runpath) SEEK_SET) + (put-bytevector port (string->utf8 (string-join new ":"))) + (put-u8 port 0)) + (close-port port) + new)) + (lambda (key . args) + (false-if-exception (close-port port)) + (apply throw key args)))) + ;;; gremlin.scm ends here diff --git a/tests/gremlin.scm b/tests/gremlin.scm index 2885554967..1b47d5c384 100644 --- a/tests/gremlin.scm +++ b/tests/gremlin.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Ludovic Courtès +;;; Copyright © 2015, 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,12 +18,14 @@ (define-module (test-gremlin) #:use-module (guix elf) + #:use-module ((guix utils) #:select (call-with-temporary-directory)) #:use-module (guix build utils) #:use-module (guix build gremlin) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-64) #:use-module (rnrs io ports) + #:use-module (ice-9 popen) #:use-module (ice-9 match)) (define %guile-executable @@ -37,6 +39,9 @@ (define read-elf (compose parse-elf get-bytevector-all)) +(define c-compiler + (or (which "gcc") (which "cc") (which "g++"))) + (test-begin "gremlin") @@ -63,4 +68,32 @@ "../${ORIGIN}/bar/$ORIGIN/baz" "ORIGIN/foo"))) +(unless c-compiler + (test-skip 1)) +(test-equal "strip-runpath" + "hello\n" + (call-with-temporary-directory + (lambda (directory) + (with-directory-excursion directory + (call-with-output-file "t.c" + (lambda (port) + (display "int main () { puts(\"hello\"); }" port))) + (invoke c-compiler "t.c" + "-Wl,-rpath=/foo" "-Wl,-rpath=/bar") + (let* ((dyninfo (elf-dynamic-info + (parse-elf (call-with-input-file "a.out" + get-bytevector-all)))) + (old (elf-dynamic-info-runpath dyninfo)) + (new (strip-runpath "a.out")) + (new* (strip-runpath "a.out"))) + (validate-needed-in-runpath "a.out") + (and (member "/foo" old) (member "/bar" old) + (not (member "/foo" new)) + (not (member "/bar" new)) + (equal? new* new) + (let* ((pipe (open-input-pipe "./a.out")) + (str (get-string-all pipe))) + (close-pipe pipe) + str))))))) + (test-end "gremlin") -- cgit v1.2.3 From 8005640201fbc9b113f4f76fc7e55fe3f9a72738 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 18 Apr 2018 18:31:28 +0200 Subject: build-system/meson: Use 'strip-runpath' instead of PatchELF. * guix/build/meson-build-system.scm (fix-runpath): Call 'strip-runpath' instead of invoking 'patchelf'. --- guix/build/meson-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index e7690a4c37..7efd433d6c 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -135,7 +135,7 @@ for example libraries only needed for the tests." (find-files dir elf-pred)) existing-elf-dirs)))) (for-each (lambda (elf-file) - (system* "patchelf" "--shrink-rpath" elf-file) + (strip-runpath elf-file) (handle-file elf-file elf-list)) elf-list))))) (for-each handle-output outputs) -- cgit v1.2.3 From 475c11b1a7699e63467c0182da3602fbe6222378 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 9 May 2018 15:37:16 +0200 Subject: gnu: jemalloc: Update to 5.1.0. * gnu/packages/jemalloc.scm (jemalloc): Update to 5.1.0. [source](patches): Remove. * gnu/packages/patches/jemalloc-arm-address-bits.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/jemalloc.scm | 5 ++- .../patches/jemalloc-arm-address-bits.patch | 39 ---------------------- 3 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 gnu/packages/patches/jemalloc-arm-address-bits.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4fa88e300d..72de5f20b0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -802,7 +802,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/jemalloc-arm-address-bits.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ %D%/packages/patches/json-glib-fix-tests-32bit.patch \ %D%/packages/patches/jq-CVE-2015-8863.patch \ diff --git a/gnu/packages/jemalloc.scm b/gnu/packages/jemalloc.scm index 5086df7a1b..cb870208e4 100644 --- a/gnu/packages/jemalloc.scm +++ b/gnu/packages/jemalloc.scm @@ -32,7 +32,7 @@ (define-public jemalloc (package (name "jemalloc") - (version "5.0.1") + (version "5.1.0") (source (origin (method url-fetch) (uri (string-append @@ -40,8 +40,7 @@ version "/jemalloc-" version ".tar.bz2")) (sha256 (base32 - "1sf3lzgb0y8nnyzmp4zrca3sngdxw3kfh20sna9z03jv74fph528")) - (patches (search-patches "jemalloc-arm-address-bits.patch")))) + "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/jemalloc-arm-address-bits.patch b/gnu/packages/patches/jemalloc-arm-address-bits.patch deleted file mode 100644 index f2ef24c25a..0000000000 --- a/gnu/packages/patches/jemalloc-arm-address-bits.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8cfc9dec37b312a2686f602bbcdd102ca07cca99 Mon Sep 17 00:00:00 2001 -From: David Goldblatt -Date: Fri, 29 Sep 2017 13:54:08 -0700 -Subject: [PATCH] ARM: Don't extend bit LG_VADDR to compute high address bits. - -In userspace ARM on Linux, zero-ing the high bits is the correct way to do this. -This doesn't fix the fact that we currently set LG_VADDR to 48 on ARM, when in -fact larger virtual address sizes are coming soon. We'll cross that bridge when -we come to it. ---- - include/jemalloc/internal/rtree.h | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/include/jemalloc/internal/rtree.h b/include/jemalloc/internal/rtree.h -index b5d4db39..4563db23 100644 ---- a/include/jemalloc/internal/rtree.h -+++ b/include/jemalloc/internal/rtree.h -@@ -178,9 +178,21 @@ rtree_leaf_elm_bits_read(tsdn_t *tsdn, rtree_t *rtree, rtree_leaf_elm_t *elm, - - JEMALLOC_ALWAYS_INLINE extent_t * - rtree_leaf_elm_bits_extent_get(uintptr_t bits) { -+# ifdef __aarch64__ -+ /* -+ * aarch64 doesn't sign extend the highest virtual address bit to set -+ * the higher ones. Instead, the high bits gets zeroed. -+ */ -+ uintptr_t high_bit_mask = ((uintptr_t)1 << LG_VADDR) - 1; -+ /* Mask off the slab bit. */ -+ uintptr_t low_bit_mask = ~(uintptr_t)1; -+ uintptr_t mask = high_bit_mask & low_bit_mask; -+ return (extent_t *)(bits & mask); -+# else - /* Restore sign-extended high bits, mask slab bit. */ - return (extent_t *)((uintptr_t)((intptr_t)(bits << RTREE_NHIB) >> - RTREE_NHIB) & ~((uintptr_t)0x1)); -+# endif - } - - JEMALLOC_ALWAYS_INLINE szind_t -- cgit v1.2.3 From ffd526e61ab1b45c6c913ab4e139193e4d5bee9b Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 22 May 2018 07:41:45 +0300 Subject: gnu: cmake: Delete Emacs library. * gnu/packages/cmake.scm (cmake)[arguments]: Delete Emacs library. --- gnu/packages/cmake.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 42391158c6..e43707389b 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -85,6 +85,13 @@ " --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-before 'configure 'patch-bin-sh (lambda _ ;; Replace "/bin/sh" by the right path in... a lot of -- cgit v1.2.3 From 5e6bd3ebdcfad2bdb5c65427b5ebfe44a9e436d8 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Thu, 31 May 2018 14:05:01 +0200 Subject: gnu: libuv: Update to 1.20.3. * gnu/packages/libevent.scm (libuv): Update to 1.20.3. --- 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 f80b205726..3e4768b401 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -121,14 +121,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.20.2") + (version "1.20.3") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "08h39zhg75lmfmk4lx17hpxqrr5yjgnc9b5rpchcankc3lcsqxbb")))) + "0yc569q47gidqsdsbx30l6i60lwh97pavdnwac0gv9f72vcsmdrv")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 4dd91dff477b9717b3fa494b23976e4d69ab7dfc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 6 Jun 2018 23:30:30 +0200 Subject: build-system/r: Fix type error. Reported-by: Mark H Weaver * guix/build/r-build-system.scm (pipe-to-r): Pass a list to the condition's "arguments" field. --- guix/build/r-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/r-build-system.scm b/guix/build/r-build-system.scm index 4d8ac5b479..2c0b322da9 100644 --- a/guix/build/r-build-system.scm +++ b/guix/build/r-build-system.scm @@ -44,7 +44,7 @@ (unless (zero? code) (raise (condition ((@@ (guix build utils) &invoke-error) (program "R") - (arguments (string-append params " " command)) + (arguments (cons command params)) (exit-status (status:exit-val code)) (term-signal (status:term-sig code)) (stop-signal (status:stop-sig code))))))))) -- cgit v1.2.3 From 52630ca08487f8b65fe316aebc5ad9d8c050d731 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jun 2018 17:26:10 +0200 Subject: gnu: fribidi: Update to 1.0.4. * gnu/packages/fribidi.scm (fribidi): Update to 1.0.4. --- 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 0368779240..10920aa200 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -27,7 +27,7 @@ (define-public fribidi (package (name "fribidi") - (version "1.0.2") + (version "1.0.4") (source (origin (method url-fetch) @@ -36,7 +36,7 @@ "/download/v" version "/fribidi-" version ".tar.bz2")) (sha256 - (base32 "0aw3i1g96axbr96flw4543dvhb8zlgb0w8314ks6cq2g1i9invdx")))) + (base32 "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From d577e00f969dbee50930b9aabf096ce9b277ac81 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 02:27:43 +0200 Subject: gnu: shared-mime-info: Update to 1.9. * gnu/packages/gnome.scm (shared-mime-info): Update to 1.9. --- 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 de212bfb44..6c7b4ebdce 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -937,14 +937,14 @@ guidelines.") (define-public shared-mime-info (package (name "shared-mime-info") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/~hadess/" "shared-mime-info-" version ".tar.xz")) (sha256 (base32 - "1sc96lv9dp1lkvs8dh3ngm3hbjb274d363dl9avhb61il3qmxx9a")))) + "10ywzhzg8v1xmb9sz5xbqaci90id38knswigynyl33i29vn360aw")))) (build-system gnu-build-system) (arguments ;; The build system appears not to be parallel-safe. -- cgit v1.2.3 From f68f5e28ed9ff02cac7c569b35bccc0d8df091ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 13:27:47 +0200 Subject: gnu: cups, cups-minimal: Update to 2.2.8. * gnu/packages/cups.scm (cups-minimal): Update to 2.2.8. [source]: Remove patch... * gnu/packages/patches/cups-fix-builds-without-PAM.patch: ...delete... * gnu/local.mk (dist_patch_DATA): ..and remove it. --- gnu/local.mk | 1 - gnu/packages/cups.scm | 7 +- .../patches/cups-fix-builds-without-PAM.patch | 201 --------------------- 3 files changed, 2 insertions(+), 207 deletions(-) delete mode 100644 gnu/packages/patches/cups-fix-builds-without-PAM.patch diff --git a/gnu/local.mk b/gnu/local.mk index a4c27f6417..f901f21b55 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -621,7 +621,6 @@ dist_patch_DATA = \ %D%/packages/patches/crossmap-allow-system-pysam.patch \ %D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/cube-nocheck.patch \ - %D%/packages/patches/cups-fix-builds-without-PAM.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-2017-12836.patch \ %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch \ diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 501cadddf5..201c180013 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -173,7 +173,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") (define-public cups-minimal (package (name "cups-minimal") - (version "2.2.7") + (version "2.2.8") (source (origin (method url-fetch) @@ -181,10 +181,7 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") version "/cups-" version "-source.tar.gz")) (sha256 (base32 - "0spaqv943bzzq31gqdp73934jgyhhlbzdmgvrmf5cxvhfdxn6jrw")) - ;; “PAM will soon [in 2.3.x] be required for authentication, period.” - ;; - (patches (search-patches "cups-fix-builds-without-PAM.patch")))) + "1r7r7b3nqpzc1a9dczqpj2mr8rkcwf01676v11sp4j7w4qfzqs1r")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/cups-fix-builds-without-PAM.patch b/gnu/packages/patches/cups-fix-builds-without-PAM.patch deleted file mode 100644 index cf51bfb0f7..0000000000 --- a/gnu/packages/patches/cups-fix-builds-without-PAM.patch +++ /dev/null @@ -1,201 +0,0 @@ -From 570933a6a3597371bae1beeb754ee8711d6305ab Mon Sep 17 00:00:00 2001 -From: Michael R Sweet -Date: Mon, 2 Apr 2018 20:05:13 -0400 -Subject: [PATCH] Fix builds without PAM (Issue #5283) - ---- - CHANGES.md | 8 +++- - scheduler/auth.c | 134 ++----------------------------------------------------- - 2 files changed, 11 insertions(+), 131 deletions(-) - -diff --git a/CHANGES.md b/CHANGES.md -index f568f35af..e8fc1fbdd 100644 ---- a/CHANGES.md -+++ b/CHANGES.md -@@ -1,7 +1,13 @@ --CHANGES - 2.2.7 - 2018-03-22 -+CHANGES - 2.2.8 - 2018-04-02 - ============================ - - -+Changes in CUPS v2.2.8 -+---------------------- -+ -+- Fixed builds without PAM (Issue #5283) -+ -+ - Changes in CUPS v2.2.7 - ---------------------- - -diff --git a/scheduler/auth.c b/scheduler/auth.c -index 8b134b5d7..fa4e2715d 100644 ---- a/scheduler/auth.c -+++ b/scheduler/auth.c -@@ -1,8 +1,8 @@ - /* - * Authorization routines for the CUPS scheduler. - * -- * Copyright 2007-2016 by Apple Inc. -- * Copyright 1997-2007 by Easy Software Products, all rights reserved. -+ * Copyright © 2007-2018 by Apple Inc. -+ * Copyright © 1997-2007 by Easy Software Products, all rights reserved. - * - * This file contains Kerberos support code, copyright 2006 by - * Jelmer Vernooij. -@@ -71,9 +71,6 @@ static int check_authref(cupsd_client_t *con, const char *right); - static int compare_locations(cupsd_location_t *a, - cupsd_location_t *b); - static cupsd_authmask_t *copy_authmask(cupsd_authmask_t *am, void *data); --#if !HAVE_LIBPAM --static char *cups_crypt(const char *pw, const char *salt); --#endif /* !HAVE_LIBPAM */ - static void free_authmask(cupsd_authmask_t *am, void *data); - #if HAVE_LIBPAM - static int pam_func(int, const struct pam_message **, -@@ -694,14 +691,14 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */ - * client... - */ - -- pass = cups_crypt(password, pw->pw_passwd); -+ pass = crypt(password, pw->pw_passwd); - - if (!pass || strcmp(pw->pw_passwd, pass)) - { - # ifdef HAVE_SHADOW_H - if (spw) - { -- pass = cups_crypt(password, spw->sp_pwdp); -+ pass = crypt(password, spw->sp_pwdp); - - if (pass == NULL || strcmp(spw->sp_pwdp, pass)) - { -@@ -1995,129 +1992,6 @@ copy_authmask(cupsd_authmask_t *mask, /* I - Existing auth mask */ - } - - --#if !HAVE_LIBPAM --/* -- * 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms, -- * as needed. -- */ -- --static char * /* O - Encrypted password */ --cups_crypt(const char *pw, /* I - Password string */ -- const char *salt) /* I - Salt (key) string */ --{ -- if (!strncmp(salt, "$1$", 3)) -- { -- /* -- * Use MD5 passwords without the benefit of PAM; this is for -- * Slackware Linux, and the algorithm was taken from the -- * old shadow-19990827/lib/md5crypt.c source code... :( -- */ -- -- int i; /* Looping var */ -- unsigned long n; /* Output number */ -- int pwlen; /* Length of password string */ -- const char *salt_end; /* End of "salt" data for MD5 */ -- char *ptr; /* Pointer into result string */ -- _cups_md5_state_t state; /* Primary MD5 state info */ -- _cups_md5_state_t state2; /* Secondary MD5 state info */ -- unsigned char digest[16]; /* MD5 digest result */ -- static char result[120]; /* Final password string */ -- -- -- /* -- * Get the salt data between dollar signs, e.g. $1$saltdata$md5. -- * Get a maximum of 8 characters of salt data after $1$... -- */ -- -- for (salt_end = salt + 3; *salt_end && (salt_end - salt) < 11; salt_end ++) -- if (*salt_end == '$') -- break; -- -- /* -- * Compute the MD5 sum we need... -- */ -- -- pwlen = strlen(pw); -- -- _cupsMD5Init(&state); -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- _cupsMD5Append(&state, (unsigned char *)salt, salt_end - salt); -- -- _cupsMD5Init(&state2); -- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); -- _cupsMD5Append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3); -- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); -- _cupsMD5Finish(&state2, digest); -- -- for (i = pwlen; i > 0; i -= 16) -- _cupsMD5Append(&state, digest, i > 16 ? 16 : i); -- -- for (i = pwlen; i > 0; i >>= 1) -- _cupsMD5Append(&state, (unsigned char *)((i & 1) ? "" : pw), 1); -- -- _cupsMD5Finish(&state, digest); -- -- for (i = 0; i < 1000; i ++) -- { -- _cupsMD5Init(&state); -- -- if (i & 1) -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- else -- _cupsMD5Append(&state, digest, 16); -- -- if (i % 3) -- _cupsMD5Append(&state, (unsigned char *)salt + 3, salt_end - salt - 3); -- -- if (i % 7) -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- -- if (i & 1) -- _cupsMD5Append(&state, digest, 16); -- else -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- -- _cupsMD5Finish(&state, digest); -- } -- -- /* -- * Copy the final sum to the result string and return... -- */ -- -- memcpy(result, salt, (size_t)(salt_end - salt)); -- ptr = result + (salt_end - salt); -- *ptr++ = '$'; -- -- for (i = 0; i < 5; i ++, ptr += 4) -- { -- n = ((((unsigned)digest[i] << 8) | (unsigned)digest[i + 6]) << 8); -- -- if (i < 4) -- n |= (unsigned)digest[i + 12]; -- else -- n |= (unsigned)digest[5]; -- -- to64(ptr, n, 4); -- } -- -- to64(ptr, (unsigned)digest[11], 2); -- ptr += 2; -- *ptr = '\0'; -- -- return (result); -- } -- else -- { -- /* -- * Use the standard crypt() function... -- */ -- -- return (crypt(pw, salt)); -- } --} --#endif /* !HAVE_LIBPAM */ -- -- - /* - * 'free_authmask()' - Free function for auth masks. - */ -- cgit v1.2.3 From 5ccd6e2b53758ff770826820091df34f8a1fb087 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jun 2018 19:04:30 +0200 Subject: gnu: mit-krb5: Update to 1.16.1. * gnu/packages/kerberos.scm (mit-krb5): Update to 1.16.1. --- gnu/packages/kerberos.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 6877f5b873..7b16da781e 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2012, 2013 Nikita Karetnikov ;;; Copyright © 2012, 2017 Ludovic Courtès ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,7 +47,7 @@ (define-public mit-krb5 (package (name "mit-krb5") - (version "1.16") + (version "1.16.1") (source (origin (method url-fetch) (uri (list @@ -58,7 +59,7 @@ "/krb5-" version ".tar.gz"))) (sha256 (base32 - "024yjr15ij0qdnay0bcqfpclgfri0qa8iw4r5zdlryxhhdgi5szs")))) + "05qis9l93hhxaknbp0a2v5cr24fsy52fqx20aqqcgl1s9qwzwkr1")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) -- cgit v1.2.3 From 5b5a8d6b21ec01b8d0d3ba4d5c9b9e81577072ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 02:35:27 +0200 Subject: gnu: isl: Update to 0.19. * gnu/packages/gcc.scm (isl): Update to 0.19. --- 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 5012d9a913..2ab70c107c 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -816,7 +816,7 @@ as the 'native-search-paths' field." (define-public isl (package (name "isl") - (version "0.18") + (version "0.19") (source (origin (method url-fetch) (uri (list (string-append @@ -827,7 +827,7 @@ as the 'native-search-paths' field." name "-" version ".tar.gz"))) (sha256 (base32 - "06ybml6llhi4i56q90jnimbcgk1lpcdwhy9nxdxra2hxz3bhz2vb")))) + "1n4yz9rj24mv226hqbpw210ifvqkn8dgvpnkzf0s0lkq9zrjd5ym")))) (build-system gnu-build-system) (inputs `(("gmp" ,gmp))) (home-page "http://isl.gforge.inria.fr/") -- cgit v1.2.3 From ac98b7a96bcd29948bd54a76cf304e3d2d90b6c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jun 2018 20:22:08 +0200 Subject: gnu: bison: Update to 3.0.5. * gnu/packages/bison.scm (bison): Update to 3.0.5. --- gnu/packages/bison.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 09c6481a16..3e47a2a1b2 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,7 +30,7 @@ (define-public bison (package (name "bison") - (version "3.0.4") + (version "3.0.5") (source (origin (method url-fetch) @@ -37,10 +38,10 @@ version ".tar.xz")) (sha256 (base32 - "1qbgf6q1n2z17k8g33444m0q68kf3fbiq65q7jlrzpvvj73jh957")))) + "0f7kjygrckkx8vas2nm673592jif0a9mw5g8207f6hj6h4pfyp07")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) - ;; m4 is not present in PATH when cross-building + ;; m4 is not present in PATH when cross-building. ("m4" ,m4))) (inputs `(("flex" ,flex))) (propagated-inputs `(("m4" ,m4))) -- cgit v1.2.3 From eb5d2792a0c32dd4e087359920c0375fb7486509 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 13:35:26 +0200 Subject: gnu: freetype: Update to 2.9.1. * gnu/packages/fontutils.scm (freetype): Update to 2.9.1. [source]: Remove patch... * gnu/packages/patches/freetype-CVE-2018-6942.patch: ...delete... * gnu/local.mk (dist_patch_DATA): ...and remove it. --- gnu/local.mk | 1 - gnu/packages/fontutils.scm | 5 ++-- gnu/packages/patches/freetype-CVE-2018-6942.patch | 31 ----------------------- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 gnu/packages/patches/freetype-CVE-2018-6942.patch diff --git a/gnu/local.mk b/gnu/local.mk index f901f21b55..5b6fe71d1c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -678,7 +678,6 @@ dist_patch_DATA = \ %D%/packages/patches/freeimage-CVE-2016-5684.patch \ %D%/packages/patches/freeimage-fix-build-with-gcc-5.patch \ %D%/packages/patches/freeimage-unbundle.patch \ - %D%/packages/patches/freetype-CVE-2018-6942.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/gawk-shell.patch \ %D%/packages/patches/gcc-arm-bug-71399.patch \ diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index f7dc2e7634..cf18b55aae 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -54,14 +54,13 @@ (define-public freetype (package (name "freetype") - (version "2.9") + (version "2.9.1") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/freetype/freetype-" version ".tar.bz2")) (sha256 (base32 - "12jcdz1in20yaa55izxalg3hm1pf7nydfrzps5bzb4zgihybmzz6")) - (patches (search-patches "freetype-CVE-2018-6942.patch")))) + "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/freetype-CVE-2018-6942.patch b/gnu/packages/patches/freetype-CVE-2018-6942.patch deleted file mode 100644 index 680f357765..0000000000 --- a/gnu/packages/patches/freetype-CVE-2018-6942.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix CVE-2018-6942: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6942 -https://people.canonical.com/~ubuntu-security/cve/2018/CVE-2018-6942.html - -Copied from upstream (ChangeLog section removed): -https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=29c759284e305ec428703c9a5831d0b1fc3497ef - -diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c -index d855aaa..551f14a 100644 ---- a/src/truetype/ttinterp.c -+++ b/src/truetype/ttinterp.c -@@ -7532,8 +7532,16 @@ - return; - } - -- for ( i = 0; i < num_axes; i++ ) -- args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */ -+ if ( coords ) -+ { -+ for ( i = 0; i < num_axes; i++ ) -+ args[i] = coords[i] >> 2; /* convert 16.16 to 2.14 format */ -+ } -+ else -+ { -+ for ( i = 0; i < num_axes; i++ ) -+ args[i] = 0; -+ } - } - - -- cgit v1.2.3 From 2008bc6b8f23c1425cb48dea431009e71d487d3a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 13:48:53 +0200 Subject: gnu: libdrm: Update to 2.4.92. * gnu/packages/xdisorg.scm (libdrm): Update to 2.4.92. --- gnu/packages/xdisorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index be082eef73..1c6e23e264 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -318,7 +318,7 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.91") + (version "2.4.92") (source (origin (method url-fetch) @@ -328,7 +328,7 @@ rasterisation.") ".tar.bz2")) (sha256 (base32 - "0068dn47c478vm1lyyhy02gilrpsma0xmcblhvs0dzqyrk80wjk3")) + "1yirzx8hmlvv6r0l7lb3zxmgy5la2mri9al0k16xqfg19pdqzr79")) (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 605f0621f3dfaa06d54cc81502f813ba43542b77 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Jun 2018 20:22:23 +0200 Subject: gnu: libunistring: Update to 0.9.10. * gnu/packages/libunistring.scm (libunistring): Update to 0.9.10. [source]: Remove now-unnecessary snippet. --- gnu/packages/libunistring.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm index 6a3afd4f05..b6656904eb 100644 --- a/gnu/packages/libunistring.scm +++ b/gnu/packages/libunistring.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Eric Bavier +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +33,7 @@ (define-public libunistring (package (name "libunistring") - (version "0.9.9") + (version "0.9.10") (source (origin (method url-fetch) (uri (string-append @@ -40,17 +41,7 @@ version ".tar.xz")) (sha256 (base32 - "0cx8v6862w7vvacbkcvg49kfx731ckdgaybmzw1zav71zkn97nd4")) - (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)))) + "1mq57h06622m6qc5cv347fc3qk5mj840axw3c0vd7qmnwk1v53zb")))) (propagated-inputs (libiconv-if-needed)) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 1a1d055903155fbfb05c7f72d9c0ab73a189465f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 14:59:04 +0200 Subject: gnu: wayland-protocols: Update to 1.14. * gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.14. --- 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 a6b79f41b0..ea48afcb20 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -473,7 +473,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (define-public wayland-protocols (package (name "wayland-protocols") - (version "1.13") + (version "1.14") (source (origin (method url-fetch) (uri (string-append @@ -481,7 +481,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") "wayland-protocols-" version ".tar.xz")) (sha256 (base32 - "0f4gqvmz53q9d8h0ilhf4z773nb4vskzx11a3d1jycym120bqn07")))) + "1xknjcfhqvdi1s4iq4kk1q61fg2rar3g8q4vlqarpd324imqjj4n")))) (build-system gnu-build-system) (inputs `(("wayland" ,wayland))) -- cgit v1.2.3 From f9bb942adf919360f0f70e3a83a126d5c1a82c6b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 15:32:52 +0200 Subject: gnu: libidn: Update to 1.35. * gnu/packages/libidn.scm (libidn): Update to 1.35. [source]: Remove now-unnecessary snippet. --- gnu/packages/libidn.scm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index 249c3f8458..07fed8081b 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Mark H Weaver ;;; Copyright © 2017 Eric Bavier +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,26 +33,16 @@ (define-public libidn (package (name "libidn") - (version "1.34") + (version "1.35") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libidn/libidn-" version ".tar.gz")) (sha256 (base32 - "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p")) - (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* "lib/gltests/Makefile.in" - (("test-lock\\$\\(EXEEXT\\) ") "")) - #t)))) + "07pyy0afqikfq51z5kbzbj9ldbd12mri0zvx0mfv3ds6bc0g26pi")))) (build-system gnu-build-system) -;; FIXME: No Java and C# libraries are currently built. + ;; FIXME: No Java and C# libraries are currently built. (synopsis "Internationalized string processing library") (description "libidn is a library implementing of the Stringprep, Punycode and IDNA -- cgit v1.2.3 From 86c19ed94a4b1fea3de82ea6049dd94271449ce8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 16:47:15 +0200 Subject: gnu: jansson: Update to 2.11. * gnu/packages/web.scm (jansson): Update to 2.11. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7819a87479..cfc27cd118 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -503,7 +503,7 @@ libraries for working with JNLP applets.") (define-public jansson (package (name "jansson") - (version "2.10") + (version "2.11") (source (origin (method url-fetch) (uri @@ -511,7 +511,7 @@ libraries for working with JNLP applets.") version ".tar.gz")) (sha256 (base32 - "0iv4rxsnamqm3ldpg7dyhjq0x9cp023nc7ac820jdd3pwb8ml8bq")))) + "1x5jllzzqamq6kahx9d9a5mrarm9m3f30vfxvcqpi6p4mcnz91bf")))) (build-system gnu-build-system) (home-page "http://www.digip.org/jansson/") (synopsis "JSON C library") -- cgit v1.2.3 From 314dcec1c0833efdc02c78e54aec1c7d34f31904 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 17:06:55 +0200 Subject: gnu: nghttp2: Update to 1.32.0. * gnu/packages/web.scm (nghttp2): Update to 1.32.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cfc27cd118..fcfc9b0b90 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6341,7 +6341,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.31.1") + (version "1.32.0") (source (origin (method url-fetch) @@ -6350,7 +6350,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") name "-" version ".tar.xz")) (sha256 (base32 - "00z1687m4wi2gbgkijbv099l9hs1sjlyzbhh8jhn0xssx4xcifb5")))) + "0zbgp8f80h2zlfn8cd2ldrmgl81jzcdh1141n71aqmfckzaqj2kh")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 -- cgit v1.2.3 From eca24b2f3de369477b268d902dfad6daed85433a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 17:09:29 +0200 Subject: gnu: linux-pam: Update to 1.3.1. * gnu/packages/linux.scm (linux-pam): Update to 1.3.1. [source]: Update upstream URI. --- gnu/packages/linux.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e6e849ecbd..cc1ee48792 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -467,17 +467,17 @@ It has been modified to remove all non-free binary blobs.") (define-public linux-pam (package (name "linux-pam") - (version "1.3.0") + (version "1.3.1") (source (origin - (method url-fetch) - (uri (string-append - "http://www.linux-pam.org/library/" - "Linux-PAM-" version ".tar.bz2")) - (sha256 - (base32 - "1fyi04d5nsh8ivd0rn2y0z83ylgc0licz7kifbb6xxi2ylgfs6i4")) - (patches (search-patches "linux-pam-no-setfsuid.patch")))) + (method url-fetch) + (uri (string-append + "https://github.com/linux-pam/linux-pam/releases/download/v" + version "/Linux-PAM-" version ".tar.xz")) + (sha256 + (base32 + "1nyh9kdi3knhxcbv5v4snya0g3gff0m671lnvqcbygw3rm77mx7g")) + (patches (search-patches "linux-pam-no-setfsuid.patch")))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From 4f3958dacb13713842ec5d1aaf7150d5b3716ef8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 19:22:30 +0200 Subject: gnu: cmake: Update to 3.11.3. * gnu/packages/cmake.scm (cmake): Update to 3.11.3. --- gnu/packages/cmake.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index cc2d90712d..00ddc625f1 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,7 +44,7 @@ (define-public cmake (package (name "cmake") - (version "3.11.1") + (version "3.11.3") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -51,7 +52,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "033x45q0lyaqr32pv92pv87pw20nja6i9794hmijrm6ilinbrgjp")) + "16n310smy3h4q3i7l1hcv0hlrwdvh082f1r7s36c3zxppsv3aw98")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From f1799efb31be3e9d655efb9e30c391ff9f6cd58f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 Jun 2018 21:01:45 +0200 Subject: gnu: perl: Ungraft version 5.26.2. * gnu/packages/perl.scm (perl): Update to 5.26.2. [replacement]: Ungraft. (perl-5.26.2, perl/fixed): Remove variables. --- gnu/packages/perl.scm | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 2d2bb62a78..cfc73c5b3c 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -44,7 +44,6 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) - #:use-module (guix utils) ;substitute-keyword-arguments for perl-5.26.2 #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) @@ -61,15 +60,14 @@ ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package (name "perl") - (version "5.26.1") - (replacement perl/fixed) + (version "5.26.2") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/src/5.0/perl-" version ".tar.gz")) (sha256 (base32 - "1p81wwvr5jb81m41d07kfywk5gvbk0axdrnvhc2aghcdbr4alqz7")) + "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp")) (patches (search-patches "perl-file-path-CVE-2017-6512.patch" "perl-no-sys-dirs.patch" @@ -160,39 +158,6 @@ (home-page "http://www.perl.org/") (license gpl1+))) ; or "Artistic" -;; Fixes CVE-2018-6797, CVE-2018-6798, and CVE-2018-6913. -;; See . -(define perl-5.26.2 - (package - (inherit perl) - (version "5.26.2") - (source (origin - (inherit (package-source perl)) - (uri (string-append "mirror://cpan/src/5.0/perl-" - version ".tar.gz")) - (sha256 - (base32 - "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp")))))) - -;; When grafting perl, complications arise when the replacement perl has a -;; different version number than the original. So, here we create a version -;; of perl-5.26.2 that thinks it is version 5.26.1. See -;; and . -(define perl/fixed - (package - (inherit perl-5.26.2) - (version "5.26.1") - (arguments - (substitute-keyword-arguments (package-arguments perl-5.26.2) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'revert-perl-subversion - (lambda _ - (substitute* "patchlevel.h" - (("^#define PERL_SUBVERSION 2") - "#define PERL_SUBVERSION 1")) - #t)))))))) - (define-public perl-algorithm-c3 (package (name "perl-algorithm-c3") -- cgit v1.2.3 From d30e9e61098a4fc1b0e5764a77ca15d2d63d8ae4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Jun 2018 13:06:38 +0200 Subject: gnu: sqlite: Update to 3.24.0. * gnu/packages/databases.scm (sqlite): Update to 3.24.0. --- 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 94eb68486b..7690a85f1b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1008,7 +1008,7 @@ for example from a shell script.") (define-public sqlite (package (name "sqlite") - (version "3.23.1") + (version "3.24.0") (source (origin (method url-fetch) (uri (let ((numeric-version @@ -1024,7 +1024,7 @@ for example from a shell script.") numeric-version ".tar.gz"))) (sha256 (base32 - "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j")))) + "0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments -- cgit v1.2.3 From 551a2f9e696c598dbaf91a12039fee839a1524e0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Jun 2018 18:09:32 +0200 Subject: gnu: libidn2: Update to 2.0.5. * gnu/packages/libidn.scm (libidn2): Update to 2.0.5. --- 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 07fed8081b..7cf061768e 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -57,14 +57,14 @@ Java libraries.") (define-public libidn2 (package (name "libidn2") - (version "2.0.4") + (version "2.0.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libidn/" name "-" version ".tar.lz")) (sha256 (base32 - "00f2fyw5kwr9is3cdn5h9arzxp0lnvg0z9bb9zyfs0dq81gaqim4")))) + "0s4nkazy1xbs6bbq4farby1xhmhzk5bdclbil5gqdwyzxsgabxqg")))) (native-inputs `(("lzip" ,lzip))) (inputs -- cgit v1.2.3 From 7391a938d0b897fd5c456e785f2dbf5a8fb8c8d4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Jun 2018 18:22:06 +0200 Subject: gnu: harfbuzz: Update to 1.8.0. * gnu/packages/gtk.scm (harfbuzz): Update to 1.8.0. --- 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 40e16d2475..6e09681ae0 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -177,7 +177,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "1.7.6") + (version "1.8.0") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -185,7 +185,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.bz2")) (sha256 (base32 - "16rf7qwgy1gza74v2ws79zdwwb1lpvgz2abwwm8ws9j82cwysyys")))) + "18wnbq919k5h8pfm1pfy38gs1qzj1hnfr1wq989bix1n2jiii1d1")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From 53411dfcd6e696fc4aea11c70d411db5300ac5e2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 12 Jun 2018 18:28:40 +0200 Subject: gnu: libbsd: Update to 0.9.1. * gnu/packages/libbsd.scm (libbsd): Update to 0.9.1. --- 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 58b0be872c..a616de70bd 100644 --- a/gnu/packages/libbsd.scm +++ b/gnu/packages/libbsd.scm @@ -25,14 +25,14 @@ (define-public libbsd (package (name "libbsd") - (version "0.8.7") + (version "0.9.1") (source (origin (method url-fetch) (uri (string-append "https://libbsd.freedesktop.org/releases/" "libbsd-" version ".tar.xz")) (sha256 (base32 - "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m")))) + "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n")))) (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 243ea8673f783d5a85df94b09d4ffd4bc6cc97ce Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 13 Jun 2018 23:02:31 +0200 Subject: gnu: gcc: Fix 'gcc-strmov-store-file-names.patch'. Fixes . Previously GCC would crash when encountering a 'static const' element without an initializer, as in: #define _GNU_SOURCE #include void foo (char *x) { static const char buf[12]; memcpy (x, buf, 12); } * gnu/packages/patches/gcc-strmov-store-file-names.patch: Return false when DECL_INITIAL returns NULL_TREE. --- gnu/packages/patches/gcc-strmov-store-file-names.patch | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/patches/gcc-strmov-store-file-names.patch b/gnu/packages/patches/gcc-strmov-store-file-names.patch index 9f9162855d..7358de3326 100644 --- a/gnu/packages/patches/gcc-strmov-store-file-names.patch +++ b/gnu/packages/patches/gcc-strmov-store-file-names.patch @@ -15,7 +15,7 @@ and . --- gcc-5.3.0/gcc/builtins.c 2016-10-18 10:50:46.080616285 +0200 +++ gcc-5.3.0/gcc/builtins.c 2016-11-09 15:26:43.693042737 +0100 -@@ -3192,6 +3192,54 @@ determine_block_size (tree len, rtx len_ +@@ -3192,6 +3192,58 @@ determine_block_size (tree len, rtx len_ GET_MODE_MASK (GET_MODE (len_rtx))); } @@ -35,9 +35,13 @@ and . + if (TREE_CODE (str) == VAR_DECL + && TREE_STATIC (str) + && TREE_READONLY (str)) -+ /* STR may be a 'static const' variable whose initial value -+ is a string constant. See . */ -+ str = DECL_INITIAL (str); ++ { ++ /* STR may be a 'static const' variable whose initial value ++ is a string constant. See . */ ++ str = DECL_INITIAL (str); ++ if (str == NULL_TREE) ++ return false; ++ } + + if (TREE_CODE (str) != STRING_CST) + return false; -- cgit v1.2.3 From dbe1bd5dd9ca7a8a52e679f573b409340a2632d6 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 22 Jun 2018 23:34:04 +0200 Subject: gnu: doxygen: Update to 1.8.14. * gnu/packages/documentation.scm (doxygen): Update to 1.8.14. --- gnu/packages/documentation.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index e36200bbab..9425df707c 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -123,14 +123,14 @@ markup) can be customized and extended by the user.") (define-public doxygen (package (name "doxygen") - (version "1.8.13") + (version "1.8.14") (source (origin (method url-fetch) (uri (string-append "http://ftp.stack.nl/pub/users/dimitri/" name "-" version ".src.tar.gz")) (sha256 (base32 - "0srzawqn3apzrg8hwycwrawdylmmjrndij4spw6xr1vspn3phrmg")) + "0kcxymbam9jwiyjwyvwdjj0h74lbb6c467szsipzbxjyfl17wxfi")) (patches (search-patches "doxygen-test.patch")))) (build-system cmake-build-system) (native-inputs -- cgit v1.2.3 From 8839b6beb163b4bbe11018990d16f927f68e9196 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 28 Jun 2018 10:35:43 +0200 Subject: gnu: vala: Update to 0.40.7. * gnu/packages/gnome.scm (vala): Update to 0.40.7. [native-inputs]: Add grep and sed. [inputs]: Add graphviz. [arguments]: Fix PKG_CONFIG_PATH before building tests; remove obsolete configure flag. --- gnu/packages/gnome.scm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6c7b4ebdce..01df6f15e7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -121,6 +121,7 @@ #:use-module (gnu packages ssh) #:use-module (gnu packages xml) #:use-module (gnu packages gl) + #:use-module (gnu packages graphviz) #:use-module (gnu packages compression) #:use-module (gnu packages spice) #:use-module (gnu packages tex) @@ -2033,7 +2034,7 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.36.3") + (version "0.40.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2041,7 +2042,7 @@ passwords in the GNOME keyring.") name "-" version ".tar.xz")) (sha256 (base32 - "0706izk9prxqclm7gv4f63diwnlc1llvfl5sc9ghqbgn076lx2mc")))) + "1v0ak68lrnbb5lyd48j6sxa35vfrii86zmhxdhkdb85k1bv65rmy")))) (build-system gnu-build-system) (arguments '(#:phases @@ -2049,20 +2050,25 @@ passwords in the GNOME keyring.") (add-before 'check 'pre-check (lambda _ (setenv "CC" "gcc") + (substitute* "valadoc/tests/testrunner.sh" + (("export PKG_CONFIG_PATH=" m) + (string-append m "$PKG_CONFIG_PATH:"))) ;; For missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") - #t))) - ;; Build the Vala API generator - #:configure-flags '("--enable-vapigen"))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("flex" ,flex) ("bison" ,bison) ("xsltproc" ,libxslt) + ("grep" ,grep) + ("sed" ,sed) ("dbus" ,dbus) ; for dbus tests ("gobject-introspection" ,gobject-introspection))) ; for gir tests + (inputs + `(("graphviz" ,graphviz))) (propagated-inputs - `(("glib" ,glib))) ; required by libvala-0.26.pc + `(("glib" ,glib))) ; required by libvala-0.40.pc (home-page "https://live.gnome.org/Vala/") (synopsis "Compiler for the GObject type system") (description -- cgit v1.2.3 From 695c501dbed1fdd974861ab36cc702aaccf33d24 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 09:11:03 +0200 Subject: gnu: freetype: Enable build of freetype-config. * gnu/packages/fontutils.scm (freetype)[arguments]: Add configure flag to enable freetype-config. --- gnu/packages/fontutils.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index cf18b55aae..de87f998ae 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,6 +63,10 @@ (sha256 (base32 "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv")))) (build-system gnu-build-system) + (arguments + ;; The use of "freetype-config" is deprecated, but other packages still + ;; depend on it. + `(#:configure-flags (list "--enable-freetype-config"))) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs -- cgit v1.2.3 From 3e1ebaab35e96f60bb2736af6c6cea244ae415c3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 16:47:41 +0200 Subject: gnu: texlive: Update to 20180414. * gnu/packages/tex.scm (texlive, texlive-bin, texlive-extra-src, texlive-texmf-src, texlive-texmf): Update to 20180414. (texlive-bin)[source]: Replace patch. [arguments]: Add build phase "use-code-for-new-poppler". --- gnu/packages/tex.scm | 120 +++++++++++++++++++++++++++------------------------ 1 file changed, 63 insertions(+), 57 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b6bc9dda62..6ce36f871d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016 Federico Beffa ;;; Copyright © 2016 Thomas Danckaert -;;; Copyright © 2016, 2017 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Tobias Geerinckx-Rice @@ -76,42 +76,41 @@ (define texlive-extra-src (origin (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2017/texlive-20170524-extra.tar.xz") + (uri "ftp://tug.org/historic/systems/texlive/2018/texlive-20180414-extra.tar.xz") (sha256 (base32 - "0zvd2zskk78ig114mfj24g15qys41hzqv59fmqpirdbgq9c9gr5g")))) + "0a83kymxc8zmlxjb0y1gf6mx7qnf0hxffwkivwh5yh138y2rfhsv")))) (define texlive-texmf-src (origin (method url-fetch) - (uri "ftp://tug.org/historic/systems/texlive/2017/texlive-20170524-texmf.tar.xz") + (uri "ftp://tug.org/historic/systems/texlive/2018/texlive-20180414-texmf.tar.xz") (sha256 (base32 - "1v69y3kgkbk24f7s4dfkknwd317mqmck5jgpyb35wqgqfy5p0qrz")))) + "1b8zigzg8raxkhhzphcmynf84rbdbj2ym2qkz24v8n0qx82zmqms")))) (define-public texlive-bin (package (name "texlive-bin") - (version "20170524") + (version "20180414") (source (origin - (method url-fetch) - (uri (string-append "ftp://tug.org/historic/systems/texlive/2017/" + (method url-fetch) + (uri (string-append "ftp://tug.org/historic/systems/texlive/2018/" "texlive-" version "-source.tar.xz")) + (sha256 + (base32 + "0khyi6h015r2zfqgg0a44a2j7vmr1cy42knw7jbss237yvakc07y")) (patches (list - ;; This is required for compatibility with Poppler >= 0.58. - ;; See - ;; and for some discussion. + ;; This is required for compatibility with Poppler 0.64.0 and to fix a + ;; segmentation fault in dvipdfm-x from XeTeX. (origin (method url-fetch) - (uri (string-append "https://git.archlinux.org/svntogit/packages.git/plain" - "/trunk/texlive-poppler-0.59.patch?h=packages/texlive-bin" - "&id=ba2de374e2b21ecc4b85cc9777f2f15c4d356c61")) + (uri (string-append "http://www.linuxfromscratch.org/patches/blfs/" + "svn/texlive-" version "-source-upstream_fixes-1.patch")) (file-name "texlive-poppler-compat.patch") (sha256 (base32 - "1c4ikq4kxw48bi3i33bzpabrjvbk01fwjr2lz20gkc9kv8l0bg3n"))))) - (sha256 (base32 - "1amjrxyasplv4alfwcxwnw4nrx7dz2ydmddkq16k6hg90i9njq81")))) + "0f8vhyj167y4xj0jx47vkybrcacfpxw0wdn1b777yq3xmhlahhlg"))))))) (build-system gnu-build-system) (inputs `(("texlive-extra-src" ,texlive-extra-src) @@ -175,44 +174,51 @@ (not (or (string-prefix? "aarch64" s) (string-prefix? "mips64" s)))) #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-unix-detection - ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows, - ;; and the "gs" ghostscript executable on Unix. It detects Unix by - ;; checking for the existence of the /usr/bin directory. Since - ;; GuixSD does not have /usr/bin, it is also detected as Windows. - (lambda _ - (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl" - (("gswin32c") "gs")) - #t)) - (add-after 'install 'postint - (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share")) - (texlive-extra (assoc-ref inputs "texlive-extra-src")) - (unpack (assoc-ref %standard-phases 'unpack)) - (patch-source-shebangs - (assoc-ref %standard-phases 'patch-source-shebangs))) - ;; Create symbolic links for the latex variants and their - ;; man pages. - (with-directory-excursion (string-append out "/bin/") - (for-each symlink - '("pdftex" "pdftex" "xetex" "luatex") - '("latex" "pdflatex" "xelatex" "lualatex"))) - (with-directory-excursion (string-append share "/man/man1/") - (symlink "luatex.1" "lualatex.1")) - ;; Unpack texlive-extra and install tlpkg. - (mkdir "texlive-extra") - (with-directory-excursion "texlive-extra" - (apply unpack (list #:source texlive-extra)) - (apply patch-source-shebangs (list #:source texlive-extra)) - (invoke "mv" "tlpkg" share)) - ;; texlua shebangs are not patched by the patch-source-shebangs - ;; phase because the texlua executable does not exist at that - ;; time. - (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin")) - (with-directory-excursion out - (patch-source-shebangs)))))))) + (modify-phases %standard-phases + (add-after 'unpack 'use-code-for-new-poppler + (lambda _ + (copy-file "texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc" + "texk/web2c/pdftexdir/pdftoepdf.cc") + (copy-file "texk/web2c/pdftexdir/pdftosrc-newpoppler.cc" + "texk/web2c/pdftexdir/pdftosrc.cc") + #t)) + (add-after 'unpack 'fix-unix-detection + ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows, + ;; and the "gs" ghostscript executable on Unix. It detects Unix by + ;; checking for the existence of the /usr/bin directory. Since + ;; GuixSD does not have /usr/bin, it is also detected as Windows. + (lambda _ + (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl" + (("gswin32c") "gs")) + #t)) + (add-after 'install 'postint + (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (texlive-extra (assoc-ref inputs "texlive-extra-src")) + (unpack (assoc-ref %standard-phases 'unpack)) + (patch-source-shebangs + (assoc-ref %standard-phases 'patch-source-shebangs))) + ;; Create symbolic links for the latex variants and their + ;; man pages. + (with-directory-excursion (string-append out "/bin/") + (for-each symlink + '("pdftex" "pdftex" "xetex" "luatex") + '("latex" "pdflatex" "xelatex" "lualatex"))) + (with-directory-excursion (string-append share "/man/man1/") + (symlink "luatex.1" "lualatex.1")) + ;; Unpack texlive-extra and install tlpkg. + (mkdir "texlive-extra") + (with-directory-excursion "texlive-extra" + (apply unpack (list #:source texlive-extra)) + (apply patch-source-shebangs (list #:source texlive-extra)) + (invoke "mv" "tlpkg" share)) + ;; texlua shebangs are not patched by the patch-source-shebangs + ;; phase because the texlua executable does not exist at that + ;; time. + (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin")) + (with-directory-excursion out + (patch-source-shebangs)))))))) (synopsis "TeX Live, a package of the TeX typesetting system") (description "TeX Live provides a comprehensive TeX document production system. @@ -3926,7 +3932,7 @@ directly generate PDF documents instead of DVI.") (define texlive-texmf (package (name "texlive-texmf") - (version "2017") + (version "20180414") (source texlive-texmf-src) (build-system gnu-build-system) (inputs @@ -3998,7 +4004,7 @@ This package contains the complete tree of texmf-dist data.") (define-public texlive (package (name "texlive") - (version "2017") + (version "20180414") (source #f) (build-system trivial-build-system) (inputs `(("bash" ,bash) ; for wrap-program -- cgit v1.2.3 From 698ec949079ae9930ff10c869ca1a90264c05210 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 17:01:24 +0200 Subject: gnu: pango: Propagate fribidi. * gnu/packages/gtk.scm (pango)[inputs]: Move fribidi from here... [propagated-inputs]: ...to here. --- gnu/packages/gtk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6e09681ae0..dfe982c803 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2015 David Hashe -;;; Coypright © 2015, 2016, 2017 Ricardo Wurmus +;;; Coypright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Fabian Harfert ;;; Copyright © 2016 Kei Kebreau @@ -229,13 +229,13 @@ affine transformation (scale, rotation, shear, etc.).") (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files. `(("cairo" ,cairo) + ("fribidi" ,fribidi) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("glib" ,glib) ("harfbuzz" ,harfbuzz))) (inputs - `(("fribidi" ,fribidi) - ("zlib" ,zlib) + `(("zlib" ,zlib) ;; Some packages, such as Openbox, expect Pango to be built with the ;; optional libxft support. -- cgit v1.2.3 From 9ca381f0f1f5fe34f34bb8dc87f7d1739880bca1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 21:02:50 +0200 Subject: gnu: gnome-backgrounds: Update to 3.28.0. * gnu/packages/gnome.scm (gnome-backgrounds): Update to 3.28.0. [build-system]: Use meson-build-system. --- 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 01df6f15e7..794fb17471 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5882,7 +5882,7 @@ is complete it provides a graphical representation of each selected folder.") (define-public gnome-backgrounds (package (name "gnome-backgrounds") - (version "3.26.2") + (version "3.28.0") (source (origin (method url-fetch) @@ -5891,8 +5891,8 @@ is complete it provides a graphical representation of each selected folder.") name "-" version ".tar.xz")) (sha256 (base32 - "0kzrh5h0cfby3rhsy31d1w1c0rr3wcc845kv6zibqw1x8v9si2rs")))) - (build-system glib-or-gtk-build-system) + "1qgim0yhzjgcq172y4vp5hqz4rh1ak38a7pgi6s7dq0wklyrcnxj")))) + (build-system meson-build-system) (native-inputs `(("intltool" ,intltool))) (home-page "https://git.gnome.org/browse/gnome-backgrounds") -- cgit v1.2.3 From cda7f4bc8ecf331d623c7d37b01931a46830c648 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 29 Jun 2018 22:09:36 +0200 Subject: gnu: inkscape: Fix build with poppler. * gnu/packages/inkscape.scm (inkscape)[source]: Add upstream patch to fix incompatibility with latest version of poppler. --- gnu/packages/inkscape.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index de9940df1c..8471cf2392 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2014, 2016 Mark H Weaver -;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; @@ -54,7 +54,16 @@ "inkscape-" version ".tar.bz2")) (sha256 (base32 - "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6")))) + "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6")) + (patches + (list (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/inkscape/inkscape/commit/" + "a600c6438fef2f4c06f9a4a7d933d99fb054a973.diff")) + (file-name "inkscape-poppler-compat.patch") + (sha256 + (base32 + "19dam5vsy571xszgjddl5g0958dmcsv0wvgxidp4bhj2lban222i"))))))) (build-system cmake-build-system) (inputs `(("aspell" ,aspell) -- cgit v1.2.3 From 302213b9be577bf6e120405ef4316520403fbee3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 30 Jun 2018 18:06:20 +0200 Subject: build-system/meson: Use invoke. * guix/build/meson-build-system.scm (configure, build, check, install): Use "invoke" and unconditionally return #t. --- guix/build/meson-build-system.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index 7efd433d6c..6dac007a6d 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Peter Mikkelsen +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -58,15 +59,17 @@ (mkdir build-dir) (chdir build-dir) - (zero? (apply system* "meson" args)))) + (apply invoke "meson" args) + #t)) (define* (build #:key parallel-build? #:allow-other-keys) "Build a given meson package." - (zero? (apply system* "ninja" - (if parallel-build? - `("-j" ,(number->string (parallel-job-count))) - '("-j" "1"))))) + (apply invoke "ninja" + (if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '("-j" "1"))) + #t) (define* (check #:key test-target parallel-tests? tests? #:allow-other-keys) @@ -75,13 +78,13 @@ (number->string (parallel-job-count)) "1")) (if tests? - (zero? (system* "ninja" test-target)) - (begin - (format #t "test suite not run~%") - #t))) + (invoke "ninja" test-target) + (format #t "test suite not run~%")) + #t) (define* (install #:rest args) - (zero? (system* "ninja" "install"))) + (invoke "ninja" "install") + #t) (define* (fix-runpath #:key (elf-directories '("lib" "lib64" "libexec" "bin" "sbin")) -- cgit v1.2.3 From cb9a84bd89f9d38f1177afd86e8a04080709588b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Jul 2018 10:41:02 +0300 Subject: gnu: gdbm: Update to 1.16. * gnu/packages/databases.scm (gdbm): Update to 1.16. --- 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 9cbdf616c0..bb70005064 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -163,14 +163,14 @@ either single machines or networked clusters.") (define-public gdbm (package (name "gdbm") - (version "1.14.1") + (version "1.16") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdbm/gdbm-" version ".tar.gz")) (sha256 (base32 - "0pxwz3jlwvglq2mrbxvrjgr8pa0aj73p3v9sxmdlj570zw0gzknd")))) + "0bsimfb0h9vkxh6hzz66hrpxrzcqla58y0gvzvpc784x4p38p8f8")))) (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) (build-system gnu-build-system) (home-page "http://www.gnu.org.ua/software/gdbm") -- cgit v1.2.3 From 1aa5c246e91c0c9f926783c110322c4953249349 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 3 Jul 2018 10:41:57 +0300 Subject: gnu: bash: Update to patch level 23. * gnu/packages/bash.scm (%patch-series-4.4): Add patches 20 through 23. --- gnu/packages/bash.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 64f7782f58..46cb13048d 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2015, 2017 Leo Famulari -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -79,7 +79,11 @@ (16 "1cgi1y6mifm8hsgv4avj5ih76535js3qba1sqwbfvp7si76927sh") (17 "0w6jpj2giakji1ir83rpkx1y7n7xqppah3j748m6dm38hywr0gvp") (18 "1k58h4wxbsg7r4rwhrvzx5hfbapba2nxjysbhh6qp6ki5ys99i2v") - (19 "07n1i5610lbs672x1s8g82qn3qfj06s0ip3z80sri0g8vxp0s5r7"))) + (19 "07n1i5610lbs672x1s8g82qn3qfj06s0ip3z80sri0g8vxp0s5r7") + (20 "0b2jk5n1af1vh590qfc52hv65mafb4vl1xv26s8j5a3byb5y4h0q") + (21 "1hblcd2xmqqlp0idnavw66570n7m0yv5rbbr873c2gkn982mk3xx") + (22 "0yfbjzr79vzjs2hyi5m8iy2b38fq7vikdfa4zqdvjsp36q4iycs5") + (23 "1dlism6qdx60nvzj0v7ndr7lfahl4a8zmzckp13hqgdx7xpj7v2g"))) (define (download-patches store count) "Download COUNT Bash patches into store. Return a list of -- cgit v1.2.3 From 38a978154effb371c2e845e4e16cc59f32cc7176 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Jun 2018 21:19:51 +0200 Subject: gnu: cmake: Update to 3.11.4. * gnu/packages/cmake.scm (cmake): Update to 3.11.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 00ddc625f1..4146e55a12 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -44,7 +44,7 @@ (define-public cmake (package (name "cmake") - (version "3.11.3") + (version "3.11.4") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -52,7 +52,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "16n310smy3h4q3i7l1hcv0hlrwdvh082f1r7s36c3zxppsv3aw98")) + "1xc7zwmyfa7hdarwb4hmfhhs7i5bv9q6499y93hy6zcig2glx1lg")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 9dfbf405864e988359461408d75b6938c97aef33 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 12 Jul 2018 10:59:58 -0400 Subject: gnu: libgcrypt: Ungraft. * gnu/packages/gnupg.scm (libgcrypt): Update to 1.8.3. [replacement]: Remove field. (libgcrypt/fixed): Remove variable. --- gnu/packages/gnupg.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 9564afbb90..5365c2b528 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -107,16 +107,15 @@ Daemon and possibly more in the future.") (define-public libgcrypt (package - (replacement libgcrypt/fixed) (name "libgcrypt") - (version "1.8.2") + (version "1.8.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" version ".tar.bz2")) (sha256 (base32 - "01sca9m8hm6b5v8hmqsfdjhyz013869p1f0fxw9ln52qfnp4q1n8")))) + "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36")))) (build-system gnu-build-system) (propagated-inputs `(("libgpg-error-host" ,libgpg-error))) @@ -142,19 +141,6 @@ generation.") (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/libgcrypt"))))) -(define libgcrypt/fixed - (package - (inherit libgcrypt) - (name "libgcrypt") - (version "1.8.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-" - version ".tar.bz2")) - (sha256 - (base32 - "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36")))))) - (define-public libassuan (package (name "libassuan") -- cgit v1.2.3 From 7de44023a2d357ee634cd015d685a334a8eedcbf Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 12 Jul 2018 11:09:20 -0400 Subject: gnu: libgpg-error: Update to 1.31. * gnu/packages/gnupg.scm (libgpg-error): Update to 1.31. (libgpg-error-1.31): Remove variable. (gpgme)[propagated-inputs]: Replace libgpg-error-1.31 with libgpg-error. --- gnu/packages/gnupg.scm | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 5365c2b528..47fb904f77 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -70,7 +70,7 @@ (define-public libgpg-error (package (name "libgpg-error") - (version "1.29") + (version "1.31") (source (origin (method url-fetch) @@ -78,7 +78,7 @@ version ".tar.bz2")) (sha256 (base32 - "1smihcrhkfy58kazjaigmfbagy52rw98fqfsv1x7ml8razx2dsgc")))) + "1vx4nw6rxh2biy3h8n96fyr86q29h8gjl6837437i51jr4isil20")))) (build-system gnu-build-system) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") @@ -91,20 +91,6 @@ Daemon and possibly more in the future.") (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/libgpg-error"))))) -;; Some packages (e.g. GPGME) require a newer libgpg-error to deal with -;; error codes from recent GnuPG. Remove this in the next rebuild cycle. -(define-public libgpg-error-1.31 - (package - (inherit libgpg-error) - (version "1.31") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-" - version ".tar.bz2")) - (sha256 - (base32 - "1vx4nw6rxh2biy3h8n96fyr86q29h8gjl6837437i51jr4isil20")))))) - (define-public libgcrypt (package (name "libgcrypt") @@ -389,7 +375,7 @@ libskba (working with X.509 certificates and CMS data).") `(("gnupg" ,gnupg))) (propagated-inputs ;; Needs to be propagated because gpgme.h includes gpg-error.h. - `(("libgpg-error" ,libgpg-error-1.31))) + `(("libgpg-error" ,libgpg-error))) (inputs `(("libassuan" ,libassuan))) (home-page "https://www.gnupg.org/related_software/gpgme/") -- cgit v1.2.3 From 9bb98f6425f2d9bd45a7dd432b2480e5a8cb7306 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Jul 2018 11:21:47 +0300 Subject: gnu: lcms: Use libjpeg. * gnu/packages/ghostscript.scm (lcms)[inputs]: Replace libpjeg@8 with libjpeg. --- gnu/packages/ghostscript.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 0a6043ba65..49e035f0b4 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2013, 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2017 Alex Vong -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; @@ -52,7 +52,7 @@ (sha256 (base32 "083xisy6z01zhm7p7rgk4bx9d6zlr8l20qkfv1g29ylnhgwzvij8")))) (build-system gnu-build-system) - (inputs `(("libjpeg-8" ,libjpeg-8) + (inputs `(("libjpeg" ,libjpeg) ("libtiff" ,libtiff) ("zlib" ,zlib))) (synopsis "Little CMS, a small-footprint colour management engine") -- cgit v1.2.3 From 49b92a24144b207170703fd09036e893d933997f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Jul 2018 22:39:06 +0300 Subject: gnu: tk: Add symlink for 'wish' binary. * gnu/packages/tcl.scm (tk)[arguments]: Add custom phase to create a symlink from 'wish' to 'wish8.6'. [home-page]: Use https. --- gnu/packages/tcl.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 97e1427bec..06f4f9bb58 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2014 Eric Bavier -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -25,6 +25,7 @@ (define-module (gnu packages tcl) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) #:use-module (gnu packages) @@ -145,12 +146,21 @@ X11 GUIs.") (patches (search-patches "tk-find-library.patch")))) (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 'create-wish-symlink + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (symlink (string-append out "/bin/wish" + ,(version-major+minor + (package-version tk))) + (string-append out "/bin/wish"))) + #t)) (add-after 'install 'add-fontconfig-flag (lambda* (#:key inputs outputs #:allow-other-keys) @@ -179,7 +189,7 @@ X11 GUIs.") (propagated-inputs `(("libx11" ,libx11) ("libxext" ,libxext))) - (home-page "http://www.tcl.tk/") + (home-page "https://www.tcl.tk/") (synopsis "Graphical user interface toolkit for Tcl") (description "Tk is a graphical toolkit for building graphical user -- cgit v1.2.3 From 5212c52ce524ebfd78fae5bc68a0499148f3bf80 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Jul 2018 22:11:45 +0200 Subject: gnu: bzip2: Simplify phase. * gnu/packages/compression.scm (bzip2)[arguments]: Use SCANDIR instead of FIND-FILES when locating the shared library. --- gnu/packages/compression.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index d9d15a710d..7453b07eaf 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -246,6 +246,7 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) + (ice-9 ftw) (srfi srfi-1)) #:phases (modify-phases %standard-phases @@ -274,19 +275,18 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in ;; it create all the (un)versioned symlinks, so we handle it here. (let* ((out (assoc-ref outputs "out")) (libdir (string-append out "/lib")) - ;; Find the actual library (e.g. "libbz2.so.1.0.6"). - (lib (string-drop - (car (find-files - "." - (lambda (file stat) - (and (string-prefix? "./libbz2.so" file) - (eq? 'regular (stat:type stat)))))) - 2)) - (soversion (string-drop lib (string-length "libbz2.so.")))) + (soname "libbz2.so") + ;; Locate the built library (e.g. "libbz2.so.1.0.6"). + (lib (car (scandir "." + (lambda (file) + (and (string-prefix? soname file) + (eq? 'regular + (stat:type (lstat file)))))))) + (soversion (string-drop lib (+ 1 (string-length soname))))) (install-file lib libdir) (with-directory-excursion libdir ;; Create symlinks libbz2.so.1 -> libbz2.so.1.0, etc. - (let loop ((base "libbz2.so") + (let loop ((base soname) (numbers (string-split soversion #\.))) (unless (null? numbers) (let ((so-file (string-append base "." (car numbers)))) -- cgit v1.2.3 From 45719c1dfb7bdce3c91086e5bed26643dccf8191 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 14 Jul 2018 22:39:01 +0200 Subject: gnu: bzip2: Add static output. * gnu/packages/compression.scm (bzip2)[arguments]: Add phase for moving static library. [outputs]: New field. --- gnu/packages/compression.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 7453b07eaf..c82edcc2ad 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -293,6 +293,14 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in (symlink so-file base) (loop so-file (cdr numbers)))))) #t))) + (add-after 'install-shared-lib 'move-static-lib + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (with-directory-excursion (string-append out "/lib") + (install-file "libbz2.a" (string-append static "/lib")) + (delete-file "libbz2.a") + #t)))) (add-after 'install-shared-lib 'patch-scripts (lambda* (#:key outputs inputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))) @@ -307,6 +315,7 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in ,@(if (%current-target-system) '(#:tests? #f) '()))) + (outputs '("out" "static")) (synopsis "High-quality data compression program") (description "bzip2 is a freely available, patent free (see below), high-quality data -- cgit v1.2.3 From 6c4709889c665f194822677dc7a1fcd513e46708 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jul 2018 13:46:20 +0200 Subject: gnu: binutils: Update to 2.31.1. * gnu/packages/base.scm (binutils): Update to 2.31.1. (binutils/fixed): Remove variable * gnu/packages/linux.scm (make-linux-libre): Remove AArch64 workaround. * gnu/packages/patches/binutils-aarch64-symbol-relocation.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/base.scm | 15 ++------- gnu/packages/linux.scm | 6 ---- .../binutils-aarch64-symbol-relocation.patch | 36 ---------------------- 4 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/binutils-aarch64-symbol-relocation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1f09260a4a..80e2a43868 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -585,7 +585,6 @@ dist_patch_DATA = \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/bind-CVE-2018-5738.patch \ - %D%/packages/patches/binutils-aarch64-symbol-relocation.patch \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blast+-fix-makefile.patch \ %D%/packages/patches/boost-fix-icu-build.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index fef6002b3c..c95ab379af 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -435,14 +435,14 @@ change. GNU make offers many powerful extensions over the standard utility.") (define-public binutils (package (name "binutils") - (version "2.30") + (version "2.31.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/binutils/binutils-" version ".tar.bz2")) (sha256 (base32 - "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg")) + "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z")) (patches (search-patches "binutils-loongson-workaround.patch")))) (build-system gnu-build-system) @@ -480,17 +480,6 @@ included.") (license gpl3+) (home-page "https://www.gnu.org/software/binutils/"))) -(define-public binutils/fixed - ;; TODO: Incorporate this in binutils during the next rebuild cycle. - (hidden-package - (package - (inherit binutils) - (source (origin - (inherit (package-source binutils)) - (patches (append (origin-patches (package-source binutils)) - (search-patches - "binutils-aarch64-symbol-relocation.patch")))))))) - (define* (make-ld-wrapper name #:key (target (const #f)) binutils diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ff3024d574..76c67f4588 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -296,12 +296,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (or (%current-target-system) (%current-system))) ((or "x86_64" "i386") `(("gcc" ,gcc-7))) - ("arm64" - ;; Work around a binutils 2.30 bug where some kernel symbols would - ;; be incorrectly marked as relocatable: - ;; . - `(("ld-wrapper" ,(make-ld-wrapper "ld-wrapper" - #:binutils binutils/fixed)))) (_ '())) ,@(match (and configuration-file diff --git a/gnu/packages/patches/binutils-aarch64-symbol-relocation.patch b/gnu/packages/patches/binutils-aarch64-symbol-relocation.patch deleted file mode 100644 index fbd596862b..0000000000 --- a/gnu/packages/patches/binutils-aarch64-symbol-relocation.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix a regression in Binutils 2.30 where some symbols are incorrectly assumed -to be addresses: - -https://sourceware.org/bugzilla/show_bug.cgi?id=22764 - -Patch taken from upstream (with ChangeLog entries and tests omitted): - -https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=279b2f94168ee91e02ccd070d27c983fc001fe12 - -diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c -index af448f9..2737773 100644 ---- a/bfd/elfnn-aarch64.c -+++ b/bfd/elfnn-aarch64.c -@@ -7189,10 +7189,19 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, - #if ARCH_SIZE == 64 - case BFD_RELOC_AARCH64_32: - #endif -- if (bfd_link_pic (info) -- && (sec->flags & SEC_ALLOC) != 0 -- && (sec->flags & SEC_READONLY) != 0) -+ if (bfd_link_pic (info) && (sec->flags & SEC_ALLOC) != 0) - { -+ if (h != NULL -+ /* This is an absolute symbol. It represents a value instead -+ of an address. */ -+ && ((h->root.type == bfd_link_hash_defined -+ && bfd_is_abs_section (h->root.u.def.section)) -+ /* This is an undefined symbol. */ -+ || h->root.type == bfd_link_hash_undefined)) -+ break; -+ -+ /* For local symbols, defined global symbols in a non-ABS section, -+ it is assumed that the value is an address. */ - int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START; - _bfd_error_handler - /* xgettext:c-format */ -- cgit v1.2.3 From 50849734e986a5824bcca20fe64b2886f8f1a42b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Jul 2018 21:14:59 +0200 Subject: gnu: pcre: Install static libraries to separate output. * gnu/packages/pcre.scm (pcre)[outputs]: Add "static". [arguments]: Add 'move-static-libs' phase. --- gnu/packages/pcre.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 5719b7bb45..21752e9cfd 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -50,7 +50,8 @@ (build-system gnu-build-system) (outputs '("out" ;library & headers "bin" ;depends on Readline (adds 20MiB to the closure) - "doc")) ;1.8 MiB of HTML + "doc" ;1.8 MiB of HTML + "static")) ;1.8 MiB static libraries (inputs `(("bzip2" ,bzip2) ("readline" ,readline) ("zlib" ,zlib))) @@ -63,7 +64,19 @@ "--enable-unicode-properties" "--enable-pcre16" "--enable-pcre32" - "--enable-jit"))) + "--enable-jit") + #:phases (modify-phases %standard-phases + (add-after 'install 'move-static-libs + (lambda* (#:key outputs #:allow-other-keys) + (let ((source (string-append (assoc-ref outputs "out") "/lib")) + (static (string-append (assoc-ref outputs "static") "/lib"))) + (mkdir-p static) + (for-each (lambda (lib) + (link lib (string-append static "/" + (basename lib))) + (delete-file lib)) + (find-files source "\\.a$")) + #t)))))) (synopsis "Perl Compatible Regular Expressions") (description "The PCRE library is a set of functions that implement regular expression -- cgit v1.2.3 From ebd551705c99db0d82c875001d0ad44c7408883e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jul 2018 14:05:46 +0200 Subject: gnu: fftw: Update to 3.3.8. * gnu/packages/algebra.scm (fftw): Update to 3.3.8. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 45d15d6fd5..045daef96a 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -523,14 +523,14 @@ a C program.") (define-public fftw (package (name "fftw") - (version "3.3.7") + (version "3.3.8") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.fftw.org/pub/fftw/fftw-" version".tar.gz")) (sha256 (base32 - "0wsms8narnbhfsa8chdflv2j9hzspvflblnqdn7hw8x5xdzrnq1v")))) + "00z3k8fq561wq2khssqg0kallk0504dzlx989x3vvicjdqpjc4v1")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 1d3de9796778f5a11dc91c666ec2f19e8dd56969 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 18 Jul 2018 14:37:08 +0200 Subject: gnu: libgc: Update to 7.6.6. * gnu/packages/bdw-gc.scm (libgc): Update to 7.6.6. [source](uri): Change to the new download location, as noted on the home page. --- gnu/packages/bdw-gc.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index eba30217da..42ec61e324 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -30,14 +30,14 @@ (define-public libgc (package (name "libgc") - (version "7.6.4") + (version "7.6.6") (source (origin (method url-fetch) - (uri (string-append "http://www.hboehm.info/gc/gc_source/gc-" - version ".tar.gz")) + (uri (string-append "https://github.com/ivmai/bdwgc/releases" + "/download/v" version "/gc-" version ".tar.gz")) (sha256 (base32 - "076dzsqqyxd3nlzs0z277vvhqjp8nv5dqi763s0m90zr6ljiyk5r")))) + "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From f94a8654d686b7ec36fdb28b6f0e8b0f48b14447 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 00:21:02 +0200 Subject: gnu: perl: Update to 5.28.0. * gnu/packages/patches/perl-deterministic-ordering.patch: Adjust path. * gnu/packages/patches/perl-archive-tar-CVE-2018-12015.patch, gnu/packages/patches/perl-file-path-CVE-2017-6512.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. * gnu/packages/perl.scm (perl): Update to 5.28.0. [source](patches): Remove obsolete. --- gnu/local.mk | 2 - .../patches/perl-archive-tar-CVE-2018-12015.patch | 36 ----- .../patches/perl-deterministic-ordering.patch | 6 +- .../patches/perl-file-path-CVE-2017-6512.patch | 173 --------------------- gnu/packages/perl.scm | 6 +- 5 files changed, 5 insertions(+), 218 deletions(-) delete mode 100644 gnu/packages/patches/perl-archive-tar-CVE-2018-12015.patch delete mode 100644 gnu/packages/patches/perl-file-path-CVE-2017-6512.patch diff --git a/gnu/local.mk b/gnu/local.mk index 80e2a43868..41a10f5916 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1001,8 +1001,6 @@ dist_patch_DATA = \ %D%/packages/patches/patchutils-xfail-gendiff-tests.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/perf-gcc-ice.patch \ - %D%/packages/patches/perl-archive-tar-CVE-2018-12015.patch \ - %D%/packages/patches/perl-file-path-CVE-2017-6512.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-dbd-mysql-CVE-2017-10788.patch \ %D%/packages/patches/perl-deterministic-ordering.patch \ diff --git a/gnu/packages/patches/perl-archive-tar-CVE-2018-12015.patch b/gnu/packages/patches/perl-archive-tar-CVE-2018-12015.patch deleted file mode 100644 index 6460cf5855..0000000000 --- a/gnu/packages/patches/perl-archive-tar-CVE-2018-12015.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix CVE-2018-12015: - -https://security-tracker.debian.org/tracker/CVE-2018-12015 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-12015 -https://rt.cpan.org/Ticket/Display.html?id=125523 - -Patch taken from this upstream commit and adapted to apply to -the bundled copy in the Perl distribution: - -https://github.com/jib/archive-tar-new/commit/ae65651eab053fc6dc4590dbb863a268215c1fc5 - -diff --git a/cpan/Archive-Tar/lib/Archive/Tar.pm b/cpan/Archive-Tar/lib/Archive/Tar.pm -index 6244369..a83975f 100644 ---- a/cpan/Archive-Tar/lib/Archive/Tar.pm -+++ b/cpan/Archive-Tar/lib/Archive/Tar.pm -@@ -845,6 +845,20 @@ sub _extract_file { - return; - } - -+ ### If a file system already contains a block device with the same name as -+ ### the being extracted regular file, we would write the file's content -+ ### to the block device. So remove the existing file (block device) now. -+ ### If an archive contains multiple same-named entries, the last one -+ ### should replace the previous ones. So remove the old file now. -+ ### If the old entry is a symlink to a file outside of the CWD, the new -+ ### entry would create a file there. This is CVE-2018-12015 -+ ### . -+ if (-l $full || -e _) { -+ if (!unlink $full) { -+ $self->_error( qq[Could not remove old file '$full': $!] ); -+ return; -+ } -+ } - if( length $entry->type && $entry->is_file ) { - my $fh = IO::File->new; - $fh->open( $full, '>' ) or ( diff --git a/gnu/packages/patches/perl-deterministic-ordering.patch b/gnu/packages/patches/perl-deterministic-ordering.patch index 92e33ef135..be63d5cde3 100644 --- a/gnu/packages/patches/perl-deterministic-ordering.patch +++ b/gnu/packages/patches/perl-deterministic-ordering.patch @@ -12,10 +12,10 @@ reproducibility. cpan/Devel-PPPort/PPPort_xs.PL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/cpan/Devel-PPPort/PPPort_xs.PL b/cpan/Devel-PPPort/PPPort_xs.PL +diff --git a/dist/Devel-PPPort/PPPort_xs.PL b/dist/Devel-PPPort/PPPort_xs.PL index 5f18940..149f2fe 100644 ---- a/cpan/Devel-PPPort/PPPort_xs.PL -+++ b/cpan/Devel-PPPort/PPPort_xs.PL +--- a/dist/Devel-PPPort/PPPort_xs.PL ++++ b/dist/Devel-PPPort/PPPort_xs.PL @@ -38,7 +38,7 @@ END my $file; my $sec; diff --git a/gnu/packages/patches/perl-file-path-CVE-2017-6512.patch b/gnu/packages/patches/perl-file-path-CVE-2017-6512.patch deleted file mode 100644 index 28ab067599..0000000000 --- a/gnu/packages/patches/perl-file-path-CVE-2017-6512.patch +++ /dev/null @@ -1,173 +0,0 @@ -Fix CVE-2017-6512: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-6512 -https://rt.cpan.org/Public/Bug/Display.html?id=121951 - -Patch copied from Debian, adapted to apply to the copy of File::Path in Perl -5.24.0. - -https://github.com/jkeenan/File-Path/commit/e5ef95276ee8ad471c66ee574a5d42552b3a6af2 -https://anonscm.debian.org/cgit/perl/perl.git/diff/debian/patches/fixes/file_path_chmod_race.diff?id=e7b50f8fb6413f8ddfbbfda2d531615fb029e2d3 - -From d760748be0efca7c05454440e24f3df77bf7cf5d Mon Sep 17 00:00:00 2001 -From: John Lightsey -Date: Tue, 2 May 2017 12:03:52 -0500 -Subject: Prevent directory chmod race attack. - -CVE-2017-6512 is a race condition attack where the chmod() of directories -that cannot be entered is misused to change the permissions on other -files or directories on the system. This has been corrected by limiting -the directory-permission loosening logic to systems where fchmod() is -supported. - -[Backported (whitespace adjustments) to File-Path 2.12 / perl 5.24 by -Dominic Hargreaves for Debian.] - -Bug: https://rt.cpan.org/Public/Bug/Display.html?id=121951 -Bug-Debian: https://bugs.debian.org/863870 -Patch-Name: fixes/file_path_chmod_race.diff ---- - cpan/File-Path/lib/File/Path.pm | 39 +++++++++++++++++++++++++-------------- - cpan/File-Path/t/Path.t | 40 ++++++++++++++++++++++++++-------------- - 2 files changed, 51 insertions(+), 28 deletions(-) - -diff --git a/cpan/File-Path/lib/File/Path.pm b/cpan/File-Path/lib/File/Path.pm -index 034da1e..a824cc8 100644 ---- a/cpan/File-Path/lib/File/Path.pm -+++ b/cpan/File-Path/lib/File/Path.pm -@@ -354,21 +354,32 @@ sub _rmtree { - - # see if we can escalate privileges to get in - # (e.g. funny protection mask such as -w- instead of rwx) -- $perm &= oct '7777'; -- my $nperm = $perm | oct '700'; -- if ( -- !( -- $arg->{safe} -- or $nperm == $perm -- or chmod( $nperm, $root ) -- ) -- ) -- { -- _error( $arg, -- "cannot make child directory read-write-exec", $canon ); -- next ROOT_DIR; -+ # This uses fchmod to avoid traversing outside of the proper -+ # location (CVE-2017-6512) -+ my $root_fh; -+ if (open($root_fh, '<', $root)) { -+ my ($fh_dev, $fh_inode) = (stat $root_fh )[0,1]; -+ $perm &= oct '7777'; -+ my $nperm = $perm | oct '700'; -+ local $@; -+ if ( -+ !( -+ $arg->{safe} -+ or $nperm == $perm -+ or !-d _ -+ or $fh_dev ne $ldev -+ or $fh_inode ne $lino -+ or eval { chmod( $nperm, $root_fh ) } -+ ) -+ ) -+ { -+ _error( $arg, -+ "cannot make child directory read-write-exec", $canon ); -+ next ROOT_DIR; -+ } -+ close $root_fh; - } -- elsif ( !chdir($root) ) { -+ if ( !chdir($root) ) { - _error( $arg, "cannot chdir to child", $canon ); - next ROOT_DIR; - } -diff --git a/cpan/File-Path/t/Path.t b/cpan/File-Path/t/Path.t -index ff52fd6..956ca09 100644 ---- a/cpan/File-Path/t/Path.t -+++ b/cpan/File-Path/t/Path.t -@@ -3,7 +3,7 @@ - - use strict; - --use Test::More tests => 127; -+use Test::More tests => 126; - use Config; - use Fcntl ':mode'; - use lib 't/'; -@@ -18,6 +18,13 @@ BEGIN { - - my $Is_VMS = $^O eq 'VMS'; - -+my $fchmod_supported = 0; -+if (open my $fh, curdir()) { -+ my ($perm) = (stat($fh))[2]; -+ $perm &= 07777; -+ eval { $fchmod_supported = chmod( $perm, $fh); }; -+} -+ - # first check for stupid permissions second for full, so we clean up - # behind ourselves - for my $perm (0111,0777) { -@@ -299,16 +306,19 @@ is($created[0], $dir, "created directory (old style 3 mode undef) cross-check"); - - is(rmtree($dir, 0, undef), 1, "removed directory 3 verbose undef"); - --$dir = catdir($tmp_base,'G'); --$dir = VMS::Filespec::unixify($dir) if $Is_VMS; -+SKIP: { -+ skip "fchmod of directories not supported on this platform", 3 unless $fchmod_supported; -+ $dir = catdir($tmp_base,'G'); -+ $dir = VMS::Filespec::unixify($dir) if $Is_VMS; - --@created = mkpath($dir, undef, 0200); -+ @created = mkpath($dir, undef, 0400); - --is(scalar(@created), 1, "created write-only dir"); -+ is(scalar(@created), 1, "created read-only dir"); - --is($created[0], $dir, "created write-only directory cross-check"); -+ is($created[0], $dir, "created read-only directory cross-check"); - --is(rmtree($dir), 1, "removed write-only dir"); -+ is(rmtree($dir), 1, "removed read-only dir"); -+} - - # borderline new-style heuristics - if (chdir $tmp_base) { -@@ -450,26 +460,28 @@ SKIP: { - } - - SKIP : { -- my $skip_count = 19; -+ my $skip_count = 18; - # this test will fail on Windows, as per: - # http://perldoc.perl.org/perlport.html#chmod - - skip "Windows chmod test skipped", $skip_count - if $^O eq 'MSWin32'; -+ skip "fchmod() on directories is not supported on this platform", $skip_count -+ unless $fchmod_supported; - my $mode; - my $octal_mode; - my @inputs = ( -- 0777, 0700, 0070, 0007, -- 0333, 0300, 0030, 0003, -- 0111, 0100, 0010, 0001, -- 0731, 0713, 0317, 0371, 0173, 0137, -- 00 ); -+ 0777, 0700, 0470, 0407, -+ 0433, 0400, 0430, 0403, -+ 0111, 0100, 0110, 0101, -+ 0731, 0713, 0317, 0371, -+ 0173, 0137); - my $input; - my $octal_input; -- $dir = catdir($tmp_base, 'chmod_test'); - - foreach (@inputs) { - $input = $_; -+ $dir = catdir($tmp_base, sprintf("chmod_test%04o", $input)); - # We can skip from here because 0 is last in the list. - skip "Mode of 0 means assume user defaults on VMS", 1 - if ($input == 0 && $Is_VMS); diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 27b49e6652..3eb5b1eacf 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -61,18 +61,16 @@ ;; Yeah, Perl... It is required early in the bootstrap process by Linux. (package (name "perl") - (version "5.26.2") + (version "5.28.0") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/src/5.0/perl-" version ".tar.gz")) (sha256 (base32 - "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp")) + "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky")) (patches (search-patches - "perl-file-path-CVE-2017-6512.patch" "perl-no-sys-dirs.patch" - "perl-archive-tar-CVE-2018-12015.patch" "perl-autosplit-default-time.patch" "perl-deterministic-ordering.patch" "perl-reproducible-build-date.patch")))) -- cgit v1.2.3 From 463ad503b1a0e107e2b6b8317745acc13f49ad2f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 01:03:12 +0200 Subject: gnu: readline: Update to 7.0.5. * gnu/packages/readline.scm (%patch-series-7.0): Add patch 4 and 5. --- gnu/packages/readline.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 4695e9fc71..59fa8af8af 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -48,7 +48,9 @@ (patch-series (1 "0xm3sxvwmss7ddyfb11n6pgcqd1aglnpy15g143vzcf75snb7hcs") (2 "0n1dxmqsbjgrfxb1hgk5c6lsraw4ncbnzxlsx7m35nym6lncjiw7") - (3 "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy"))) + (3 "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy") + (4 "0r3bbaf12iz8m02z6p3fzww2m365fhn71xmzab2p62gj54s6h9gr") + (5 "0lxpa4f72y2nsgj6fgrhjk2nmmxvccys6aciwfxwchb5f21rq5fa"))) (define-public readline (package -- cgit v1.2.3 From 78a9a2501d121c370684a86ffe105ffdc8ca7d70 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 23:15:12 +0200 Subject: gnu: texinfo: Fix FTBFS with Perl 5.28. * gnu/packages/patches/texinfo-perl-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/texinfo.scm (texinfo)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/patches/texinfo-perl-compat.patch | 51 ++++++++++++++++++++++++++ gnu/packages/texinfo.scm | 1 + 3 files changed, 53 insertions(+) create mode 100644 gnu/packages/patches/texinfo-perl-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 41a10f5916..45a7f06032 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1137,6 +1137,7 @@ dist_patch_DATA = \ %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-perl-compat.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/patches/texinfo-perl-compat.patch b/gnu/packages/patches/texinfo-perl-compat.patch new file mode 100644 index 0000000000..a7348fde0d --- /dev/null +++ b/gnu/packages/patches/texinfo-perl-compat.patch @@ -0,0 +1,51 @@ +Fix compatibility with newer Perls. + +The first patch is taken from upstream: +https://svn.savannah.gnu.org/viewvc/texinfo?view=revision&revision=8008 + +The second gets rid of a deprecation warning that breaks some tests. +Taken from Fedora: . + +--- trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2017/04/30 14:57:26 7765 ++++ trunk/tp/Texinfo/Convert/XSParagraph/xspara.c 2018/07/13 15:39:29 8008 +@@ -248,6 +248,11 @@ + + dTHX; + ++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) ++ /* needed due to thread-safe locale handling in newer perls */ ++ switch_to_global_locale(); ++#endif ++ + if (setlocale (LC_CTYPE, "en_US.UTF-8") + || setlocale (LC_CTYPE, "en_US.utf8")) + goto success; +@@ -320,6 +325,10 @@ + { + success: ; + free (utf8_locale); ++#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8) ++ /* needed due to thread-safe locale handling in newer perls */ ++ sync_locale(); ++#endif + /* + fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n"); + fprintf (stderr, "character encoding is: %s\n", + +diff -up texinfo-6.5/tp/Texinfo/Parser.pm.orig texinfo-6.5/tp/Texinfo/Parser.pm +--- texinfo-6.5/tp/Texinfo/Parser.pm.orig 2018-06-12 13:40:29.356030136 +0200 ++++ texinfo-6.5/tp/Texinfo/Parser.pm 2018-06-12 13:41:28.357725639 +0200 +@@ -5478,11 +5478,11 @@ sub _parse_special_misc_command($$$$) + } + } elsif ($command eq 'clickstyle') { + # REMACRO +- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { ++ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*/) { + $args = ['@'.$1]; + $self->{'clickstyle'} = $1; + $remaining = $line; +- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; ++ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*(\@(c|comment)((\@|\s+).*)?)?//; + $has_comment = 1 if (defined($4)); + } else { + $self->line_error (sprintf($self->__( diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 109a24bf62..5fe7f1ec9c 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -37,6 +37,7 @@ (method url-fetch) (uri (string-append "mirror://gnu/texinfo/texinfo-" version ".tar.xz")) + (patches (search-patches "texinfo-perl-compat.patch")) (sha256 (base32 "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp")))) -- cgit v1.2.3 From 56cd03d68673484d70841cd23a48c2324cbd021b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:40:55 +0200 Subject: gnu: libuv: Update to 1.22.0. * gnu/packages/libevent.scm (libuv): Update to 1.22.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 3e4768b401..bd7ea6f33e 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -121,14 +121,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.20.3") + (version "1.22.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "0yc569q47gidqsdsbx30l6i60lwh97pavdnwac0gv9f72vcsmdrv")))) + "1009m5paidnl4y8x0fzmsfcq7i5234jy50hsfqhspkqg59zs6zpb")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From d64edd2c81499cc2b5013d31f570463ee6a00752 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:44:10 +0200 Subject: gnu: libuv: Drop redundant 'autogen' phase. * gnu/packages/libevent.scm (libuv)[arguments]: Remove #:phases. --- gnu/packages/libevent.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index bd7ea6f33e..18e443be80 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -131,14 +131,7 @@ limited support for fork events.") "1009m5paidnl4y8x0fzmsfcq7i5234jy50hsfqhspkqg59zs6zpb")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - ;; Fashionable people don't run 'make dist' these days, so - ;; we need to do that ourselves. - (invoke "sh" "autogen.sh")))) - - ;; XXX: Some tests want /dev/tty, attempt to make connections, etc. + '(;; 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 f2ca4fa5c34ba719fae8a2fd86cacc10c6096481 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:48:42 +0200 Subject: gnu: cmake: Update to 3.12.0. * gnu/packages/cmake.scm (cmake): Update to 3.12.0. --- 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 4146e55a12..e113048690 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -44,7 +44,7 @@ (define-public cmake (package (name "cmake") - (version "3.11.4") + (version "3.12.0") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -52,7 +52,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "1xc7zwmyfa7hdarwb4hmfhhs7i5bv9q6499y93hy6zcig2glx1lg")) + "0scxdgdrkrri0f5fm7cb969vcl4k1wanmhaa22fh9ffdys81ly6h")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From c9566534136b32519b200878c846a0017409d603 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:54:34 +0200 Subject: gnu: harfbuzz: Update to 1.8.4. * gnu/packages/gtk.scm (harfbuzz): Update to 1.8.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 76346f6bb2..6aa79bb779 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -177,7 +177,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "1.8.0") + (version "1.8.4") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -185,7 +185,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.bz2")) (sha256 (base32 - "18wnbq919k5h8pfm1pfy38gs1qzj1hnfr1wq989bix1n2jiii1d1")))) + "1za5lmzz4j2plh6a12llnwxyy7dnspsykjlq1qp9x9hdza32yn9w")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From 7da8ba2eaeb17382ef3c26051e244bc94ef4ae51 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 14:56:27 +0200 Subject: gnu: pango: Update to 1.42.2. * gnu/packages/gtk.scm (pango): Update to 1.42.2. --- 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 6aa79bb779..ff2f9827b4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -216,7 +216,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public pango (package (name "pango") - (version "1.42.1") + (version "1.42.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -224,7 +224,7 @@ affine transformation (scale, rotation, shear, etc.).") name "-" version ".tar.xz")) (sha256 (base32 - "0cnfgcya3wbs9m8g44cl5ww6wbp6qbw96qvsgkr8ymwqn9b6fnli")))) + "1qm17k7r4299jbvqifk469q4hs5qj9j19kr4h9nfy5h4sjs1dr5i")))) (build-system gnu-build-system) (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files. -- cgit v1.2.3 From 0d517c073d5f6b7f4cddc57013d75c7fb19a9c75 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Jul 2018 15:00:43 +0200 Subject: gnu: util-linux: Update to 2.32.1. * gnu/packages/linux.scm (util-linux): Update to 2.32.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 76c67f4588..32ae759659 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -560,7 +560,7 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (version "2.32") + (version "2.32.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/" @@ -568,7 +568,7 @@ providing the system administrator with some help in common tasks.") name "-" version ".tar.xz")) (sha256 (base32 - "0d2758kjll5xqm5fpp3sww1h66aahx161sf2b60jxqv4qymrfwvc")) + "1ck7d8srw5szpjq7v0gpmjahnjs6wgqzm311ki4gazww6xx71rl6")) (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From 08b87ab0dfa4bae0eb57f3d8915f655bf20d94fc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 22 Jul 2018 17:54:54 +0200 Subject: gnu: pcre: Update to 8.42. * gnu/packages/pcre.scm (pcre): Update to 8.42. --- 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 21752e9cfd..564a23d012 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -35,7 +35,7 @@ (define-public pcre (package (name "pcre") - (version "8.41") + (version "8.42") (source (origin (method url-fetch) (uri (list @@ -46,7 +46,7 @@ version "/pcre-" version ".tar.bz2"))) (sha256 (base32 - "0c5m469p5pd7jip621ipq6hbgh7128lzh7xndllfgh77ban7wb76")))) + "00ckpzlgyr16bnqx8fawa3afjgqxw5yxgs2l081vw23qi1y4pl1c")))) (build-system gnu-build-system) (outputs '("out" ;library & headers "bin" ;depends on Readline (adds 20MiB to the closure) -- cgit v1.2.3 From 3e95125e9bd0676d4a9add9105217ad3eaef3ff0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 22 Jul 2018 17:58:16 +0200 Subject: Revert "packages: Enable threaded compression of source tarballs." Threaded compression makes tarballs non-deterministic: the result depends on the number of threads used for compressing. See . This reverts commit c8a3dea847bb9f87fa1876d0c6c3356d6226f121. --- guix/packages.scm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index c762fa7c39..cc1f11ace2 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -629,11 +629,6 @@ specifies modules in scope when evaluating SNIPPET." (apply invoke (string-append #+tar "/bin/tar") "cvf" #$output - ;; The bootstrap xz does not support - ;; threaded compression (introduced in - ;; 5.2.0), but it ignores the extra flag. - (string-append "--use-compress-program=" - #+xz "/bin/xz --threads=0") ;; avoid non-determinism in the archive "--mtime=@0" "--owner=root:0" -- cgit v1.2.3 From 5a0b3c34088d36ac03e705dea573f62f84d96f11 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:42:40 +0200 Subject: gnu: openssl: Incorporate grafted changes. * gnu/packages/tls.scm (openssl)[replacement]: Remove field. [source](patches): Add 'openssl-1.0.2-CVE-2018-0495.patch' and 'openssl-1.0.2-CVE-2018-0732.patch'. (openssl/fixed): Remove variable. --- gnu/packages/tls.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f1dca66552..e99b7a83ba 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -260,7 +260,6 @@ required structures.") (define-public openssl (package (name "openssl") - (replacement openssl/fixed) (version "1.0.2o") (source (origin (method url-fetch) @@ -275,6 +274,8 @@ required structures.") (base32 "0kcy13l701054nhpbd901mz32v1kn4g311z0nifd83xs2jbmqgzc")) (patches (search-patches "openssl-runpath.patch" + "openssl-1.0.2-CVE-2018-0495.patch" + "openssl-1.0.2-CVE-2018-0732.patch" "openssl-c-rehash-in.patch")))) (build-system gnu-build-system) (outputs '("out" @@ -397,15 +398,6 @@ required structures.") (license license:openssl) (home-page "https://www.openssl.org/"))) -(define openssl/fixed - (package - (inherit openssl) - (source (origin - (inherit (package-source openssl)) - (patches (append (origin-patches (package-source openssl)) - (search-patches "openssl-1.0.2-CVE-2018-0495.patch" - "openssl-1.0.2-CVE-2018-0732.patch"))))))) - (define-public openssl-next (package (inherit openssl) -- cgit v1.2.3 From 99cfdfb10c7bf42911f2ff59ef3489761ebc063d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:42:48 +0200 Subject: gnu: ghostscript: Incorporate grafted changes. * gnu/packages/ghostscript.scm (ghostscript)[replacement]: Remove field. (source)[patches]: Add 'ghostscript-CVE-2018-10194.patch'. (ghostscript/fixed): Remove variable. --- gnu/packages/ghostscript.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index bc14fd0be0..cd7cd604fd 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -132,7 +132,6 @@ printing, and psresize, for adjusting page sizes.") (define-public ghostscript (package (name "ghostscript") - (replacement ghostscript/fixed) (version "9.23") (source (origin @@ -145,6 +144,7 @@ printing, and psresize, for adjusting page sizes.") (base32 "1ng8d9fm5lza7k1f7ybc791275c07z5hcmpkrl2i226nshkxrkhz")) (patches (search-patches "ghostscript-runpath.patch" + "ghostscript-CVE-2018-10194.patch" "ghostscript-no-header-creationdate.patch" "ghostscript-no-header-id.patch" "ghostscript-no-header-uuid.patch")) @@ -251,16 +251,6 @@ output file formats and printers.") (home-page "https://www.ghostscript.com/") (license license:agpl3+))) -(define-public ghostscript/fixed - (hidden-package - (package - (inherit ghostscript) - (source - (origin - (inherit (package-source ghostscript)) - (patches (append (origin-patches (package-source ghostscript)) - (search-patches "ghostscript-CVE-2018-10194.patch")))))))) - (define-public ghostscript/x (package/inherit ghostscript (name (string-append (package-name ghostscript) "-with-x")) -- cgit v1.2.3 From 41e2e58a2afce2ad55f1f90374d9f92af27f3d6c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:44:40 +0200 Subject: gnu: libtiff: Incorporate grafted changes. * gnu/packages/image.scm (libtiff)[replacement]: Remove field. [source](patches): Add 'libtiff-CVE-2018-8905.patch' and 'libtiff-CVE-2018-10963.patch'. (libtiff/fixed): Remove variable. --- gnu/packages/image.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index a330a31599..1c3a2b7d2b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -394,7 +394,6 @@ extracting icontainer icon files.") (define-public libtiff (package (name "libtiff") - (replacement libtiff/fixed) (version "4.0.9") (source (origin @@ -405,7 +404,9 @@ extracting icontainer icon files.") (base32 "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf")) (patches (search-patches "libtiff-CVE-2017-9935.patch" - "libtiff-CVE-2017-18013.patch")))) + "libtiff-CVE-2017-18013.patch" + "libtiff-CVE-2018-8905.patch" + "libtiff-CVE-2018-10963.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.3 MiB of HTML documentation @@ -427,17 +428,6 @@ collection of tools for doing simple manipulations of TIFF images.") "See COPYRIGHT in the distribution.")) (home-page "http://www.simplesystems.org/libtiff/"))) -(define libtiff/fixed - (package - (inherit libtiff) - (source - (origin - (inherit (package-source libtiff)) - (patches - (append (origin-patches (package-source libtiff)) - (search-patches "libtiff-CVE-2018-8905.patch" - "libtiff-CVE-2018-10963.patch"))))))) - (define-public leptonica (package (name "leptonica") -- cgit v1.2.3 From dcf105da63993abd25e76ae8b152deb09baf5cf9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:46:41 +0200 Subject: gnu: curl: Remove graft for 7.61.0. * gnu/packages/curl.scm (curl): Update to 7.61.0. [replacement]: Remove field. (curl-7.61.0): Remove variable. --- gnu/packages/curl.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index e724fd147b..8bed48fd87 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,15 +50,14 @@ (define-public curl (package (name "curl") - (version "7.59.0") - (replacement curl-7.61.0) + (version "7.61.0") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1z310hrjm2vmbcpkyp81dcmj9rk127zkjyawpy2pah0nz6yslkp4")))) + "080p9r2kln8cbfj0rqfn6wqp5kdn9k5wp720nirkcw845lcmavpg")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -141,19 +140,6 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.61.0 - (package - (inherit curl) - (version "7.61.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.xz")) - (sha256 - (base32 - "080p9r2kln8cbfj0rqfn6wqp5kdn9k5wp720nirkcw845lcmavpg")))))) - (define-public kurly (package (name "kurly") -- cgit v1.2.3 From fa258af20c29ad7e0c300553eb5cde2bb7ef15f6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 20:52:22 +0200 Subject: gnu: libgpg-error: Update to 1.32. * gnu/packages/gnupg.scm (libgpg-error): Update to 1.32. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index cb0954f5a8..54b44996ef 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -70,7 +70,7 @@ (define-public libgpg-error (package (name "libgpg-error") - (version "1.31") + (version "1.32") (source (origin (method url-fetch) @@ -78,7 +78,7 @@ version ".tar.bz2")) (sha256 (base32 - "1vx4nw6rxh2biy3h8n96fyr86q29h8gjl6837437i51jr4isil20")))) + "1jj08ns4sh1hmafqp1giskvdicdz18la516va26jycy27kkwaif3")))) (build-system gnu-build-system) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") -- cgit v1.2.3 From 52f1687dc7bbe0928f801ab2f1a9e3716930e150 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 01:04:07 +0200 Subject: gnu: docbook-xsl: Delete bundled jars. * gnu/packages/docbook.scm (docbook-xsl)[source](modules, snippet): New fields. --- gnu/packages/docbook.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 1c00e56d6d..1e5379b020 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -138,11 +138,15 @@ by no means limited to these applications.) This package provides XML DTDs.") (method url-fetch) (uri (string-append "mirror://sourceforge/docbook/docbook-xsl/" version "/docbook-xsl-" version ".tar.bz2")) - ;; Note: If removing all patches, the XZ dependency is no longer needed. (patches (search-patches "docbook-xsl-nonrecursive-string-subst.patch")) (sha256 (base32 - "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj")))) + "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file (find-files "." "\\.jar$")) + #t)))) (build-system trivial-build-system) (arguments `(#:builder (let ((name-version (string-append ,name "-" ,version))) @@ -168,7 +172,7 @@ by no means limited to these applications.) This package provides XML DTDs.") #t)) #:modules ((guix build utils)))) (native-inputs `(("bzip2" ,bzip2) - ("xz" ,xz) + ("xz" ,xz) ;needed for repacked tarballs ("tar" ,tar))) (home-page "http://docbook.org") (synopsis "DocBook XSL style sheets for document authoring") -- cgit v1.2.3 From 95bbab76cdaa1d203cfeafe63d436c8d222c69de Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 15:36:46 +0200 Subject: gnu: fribidi: Update to 1.0.5. * gnu/packages/fribidi.scm (fribidi): Update to 1.0.5. [arguments]: Remove. --- gnu/packages/fribidi.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index 10920aa200..dfd2a77c20 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -27,7 +27,7 @@ (define-public fribidi (package (name "fribidi") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) @@ -36,11 +36,8 @@ "/download/v" version "/fribidi-" version ".tar.bz2")) (sha256 - (base32 "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl")))) + (base32 "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a")))) (build-system gnu-build-system) - (arguments - `(#:configure-flags - (list "--disable-docs"))) ; TODO: enable; requires c2man (synopsis "Implementation of the Unicode bidirectional algorithm") (description "GNU FriBidi is an implementation of the Unicode Bidirectional -- cgit v1.2.3 From 3b92441bc16f335b0a8fb2b3f6c660ec7e16df4f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 15:43:35 +0200 Subject: gnu: icu4c: Update to 62.1. * gnu/packages/icu4c.scm (icu4c): Update to 62.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 c4d3703794..61333a3e75 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -32,7 +32,7 @@ (define-public icu4c (package (name "icu4c") - (version "61.1") + (version "62.1") (source (origin (method url-fetch) (uri (string-append @@ -42,7 +42,7 @@ (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) "-src.tgz")) (sha256 - (base32 "1vxgkx0cyvdy00a9yd5khkx14r5kcndkax2wa99klm52x2dgh1yh")))) + (base32 "18ssgnwzzpm1g1fvbm9h1fvryiwxvvn5wc3fdakdsl33cs6qdn9x")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) -- cgit v1.2.3 From 28c4905b123e7de85e5d2b654f4d15289625f2c0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 26 Jul 2018 22:58:30 +0200 Subject: packages: 'patch-and-repack' compresses tarballs again. * guix/packages.scm (patch-and-repack): Add missing "a" in "tar cvfa". Fixes a regression introduced in 3e95125e9bd0676d4a9add9105217ad3eaef3ff0 whereby we'd always create uncompressed tarballs. --- guix/packages.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/packages.scm b/guix/packages.scm index 3d9f281b74..01045ded07 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -628,7 +628,7 @@ specifies modules in scope when evaluating SNIPPET." #:fail-on-error? #t))))) (apply invoke (string-append #+tar "/bin/tar") - "cvf" #$output + "cvfa" #$output ;; avoid non-determinism in the archive "--mtime=@0" "--owner=root:0" -- cgit v1.2.3 From 8c7bebd6ea99f0ee4fb46a48ecb1883754c8cdde Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 26 Jul 2018 22:59:49 +0200 Subject: gexp: Remove backward compatibility hack for 'imported-files'. * guix/gexp.scm (gexp->derivation): Remove #:import-creates-derivation?. (imported-files): Remove #:derivation? and adjust callers. (imported-modules), compiled-modules): Likewise. * guix/packages.scm (patch-and-repack): Adjust 'gexp->derivation' call. --- guix/gexp.scm | 28 ++++------------------------ guix/packages.scm | 3 --- tests/gexp.scm | 6 +++--- 3 files changed, 7 insertions(+), 30 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index ffc976d61b..f358102782 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -601,12 +601,6 @@ names and file names suitable for the #:allowed-references argument to allowed-references disallowed-references leaked-env-vars local-build? (substitutable? #t) - - ;; TODO: This parameter is transitional; it's here - ;; to avoid a full rebuild. Remove it on the next - ;; rebuild cycle. - import-creates-derivation? - deprecation-warnings (script-name (string-append name "-builder"))) "Return a derivation NAME that runs EXP (a gexp) with GUILE-FOR-BUILD (a @@ -701,8 +695,6 @@ The other arguments are as for 'derivation'." extensions)) (modules (if (pair? %modules) (imported-modules %modules - #:derivation? - import-creates-derivation? #:system system #:module-path module-path #:guile guile-for-build @@ -711,8 +703,6 @@ The other arguments are as for 'derivation'." (return #f))) (compiled (if (pair? %modules) (compiled-modules %modules - #:derivation? - import-creates-derivation? #:system system #:module-path module-path #:extensions extensions @@ -1141,11 +1131,6 @@ to the source files instead of copying them." (define* (imported-files files #:key (name "file-import") - - ;; TODO: Remove this parameter on the next rebuild - ;; cycle. - (derivation? #f) - ;; The following parameters make sense when creating ;; an actual derivation. (system (%current-system)) @@ -1157,11 +1142,10 @@ file-like objects and not local file names.) FILES must be a list of (FINAL-PATH . FILE) pairs. Each FILE is mapped to FINAL-PATH in the resulting store path. FILE can be either a file name, or a file-like object, as returned by 'local-file' for example." - (if (or derivation? - (any (match-lambda - ((_ . (? struct? source)) #t) - (_ #f)) - files)) + (if (any (match-lambda + ((_ . (? struct? source)) #t) + (_ #f)) + files) (imported-files/derivation files #:name name #:symlink? derivation? #:system system #:guile guile @@ -1171,7 +1155,6 @@ as returned by 'local-file' for example." (define* (imported-modules modules #:key (name "module-import") - (derivation? #f) ;TODO: remove on next rebuild (system (%current-system)) (guile (%guile-for-build)) (module-path %load-path) @@ -1196,14 +1179,12 @@ last one is created from the given object." (cons f (search-path* module-path f))))) modules))) (imported-files files #:name name - #:derivation? derivation? #:system system #:guile guile #:deprecation-warnings deprecation-warnings))) (define* (compiled-modules modules #:key (name "module-import-compiled") - (derivation? #f) ;TODO: remove on next rebuild (system (%current-system)) (guile (%guile-for-build)) (module-path %load-path) @@ -1223,7 +1204,6 @@ they can refer to each other." (not (equal? module-path %load-path)))) (mlet %store-monad ((modules (imported-modules modules - #:derivation? derivation? #:system system #:guile guile #:module-path diff --git a/guix/packages.scm b/guix/packages.scm index 01045ded07..eab0b3404c 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -641,9 +641,6 @@ specifies modules in scope when evaluating SNIPPET." (let ((name (tarxz-name original-file-name))) (gexp->derivation name build - ;; TODO: Remove this on the next rebuild cycle. - #:import-creates-derivation? #t - #:graft? #f #:system system #:deprecation-warnings #t ;to avoid a rebuild diff --git a/tests/gexp.scm b/tests/gexp.scm index b22e635805..a0ed34aa6d 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -654,11 +654,11 @@ (drv (imported-files files))) (define (file=? file1 file2) ;; Assume deduplication is in place. - (= (stat:ino (lstat file1)) - (stat:ino (lstat file2)))) + (= (stat:ino (stat file1)) + (stat:ino (stat file2)))) (mbegin %store-monad - (built-derivations (list drv)) + (built-derivations (list (pk 'drv drv))) (mlet %store-monad ((dir -> (derivation->output-path drv)) (plain* (text-file "foo" "bar!")) (q-scm* (interned-file q-scm "c"))) -- cgit v1.2.3 From 4a42abc52c3303ae50c4ca79a00dabbea05b5fa9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 27 Jul 2018 00:02:00 +0200 Subject: gexp: Inline bug-fix in 'compiled-modules'. This is a followup to 5d669883ecc104403c5d3ba7d172e9c02234577c. * guix/gexp.scm (compiled-modules)[build-utils-hack?]: Remove. Inline everything as if BUILD-UTILS-HACK? is true. --- guix/gexp.scm | 66 +++++++++++++++++++++-------------------------------------- 1 file changed, 23 insertions(+), 43 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index f358102782..c1070ba436 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1195,14 +1195,6 @@ corresponding to MODULES. All the MODULES are built in a context where they can refer to each other." (define total (length modules)) - (define build-utils-hack? - ;; To avoid a full rebuild, we limit the fix below to the case where - ;; MODULE-PATH is different from %LOAD-PATH. This happens when building - ;; modules for 'compute-guix-derivation' upon 'guix pull'. TODO: Make - ;; this unconditional on the next rebuild cycle. - (and (member '(guix build utils) modules) - (not (equal? module-path %load-path)))) - (mlet %store-monad ((modules (imported-modules modules #:system system #:guile guile @@ -1248,46 +1240,34 @@ they can refer to each other." (setvbuf (current-output-port) (cond-expand (guile-2.2 'line) (else _IOLBF))) - (ungexp-splicing - (if build-utils-hack? - (gexp ((define mkdir-p - ;; Capture 'mkdir-p'. - (@ (guix build utils) mkdir-p)))) - '())) + (define mkdir-p + ;; Capture 'mkdir-p'. + (@ (guix build utils) mkdir-p)) ;; Add EXTENSIONS to the search path. - ;; TODO: Remove the outer 'ungexp-splicing' on the next rebuild cycle. - (ungexp-splicing - (if (null? extensions) - '() - (gexp ((set! %load-path - (append (map (lambda (extension) - (string-append extension - "/share/guile/site/" - (effective-version))) - '((ungexp-native-splicing extensions))) - %load-path)) - (set! %load-compiled-path - (append (map (lambda (extension) - (string-append extension "/lib/guile/" - (effective-version) - "/site-ccache")) - '((ungexp-native-splicing extensions))) - %load-compiled-path)))))) + (set! %load-path + (append (map (lambda (extension) + (string-append extension + "/share/guile/site/" + (effective-version))) + '((ungexp-native-splicing extensions))) + %load-path)) + (set! %load-compiled-path + (append (map (lambda (extension) + (string-append extension "/lib/guile/" + (effective-version) + "/site-ccache")) + '((ungexp-native-splicing extensions))) + %load-compiled-path)) (set! %load-path (cons (ungexp modules) %load-path)) - (ungexp-splicing - (if build-utils-hack? - ;; Above we loaded our own (guix build utils) but now we may - ;; need to load a compile a different one. Thus, force a - ;; reload. - (gexp ((let ((utils (ungexp - (file-append modules - "/guix/build/utils.scm")))) - (when (file-exists? utils) - (load utils))))) - '())) + ;; Above we loaded our own (guix build utils) but now we may need to + ;; load a compile a different one. Thus, force a reload. + (let ((utils (string-append (ungexp modules) + "/guix/build/utils.scm"))) + (when (file-exists? utils) + (load utils))) (mkdir (ungexp output)) (chdir (ungexp modules)) -- cgit v1.2.3 From 8afa18d6e7f7aad7965af7e82e5afc975d19caea Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 27 Jul 2018 00:09:52 +0200 Subject: gexp: Remove #:deprecation-warnings from 'imported-files'. This is a followup to 30d722c392960373bb45c3248d318ef6e248fb67. * guix/gexp.scm (imported-files/derivation): Remove #:deprecation-warnings. Pass "GUILE_WARN_DEPRECATED=no" unconditionally to #:env-vars of 'gexp->derivation'. Adjust caller. (imported-files): Remove #:deprecation-warnings and adjust callers. (imported-modules): Likewise. (compiled-modules, gexp->derivation): Adjust accordingly. --- guix/gexp.scm | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index c1070ba436..3a600c3830 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -697,9 +697,7 @@ The other arguments are as for 'derivation'." (imported-modules %modules #:system system #:module-path module-path - #:guile guile-for-build - #:deprecation-warnings - deprecation-warnings) + #:guile guile-for-build) (return #f))) (compiled (if (pair? %modules) (compiled-modules %modules @@ -1070,15 +1068,7 @@ to a tree suitable for 'interned-file-tree'." #:key (name "file-import") (symlink? #f) (system (%current-system)) - (guile (%guile-for-build)) - - ;; XXX: The only reason we have - ;; #:deprecation-warnings is because (guix - ;; build utils), which we use here, relies - ;; on _IO*, which is deprecated in 2.2. On - ;; the next full-rebuild cycle, we should - ;; disable such warnings unconditionally. - (deprecation-warnings #f)) + (guile (%guile-for-build))) "Return a derivation that imports FILES into STORE. FILES must be a list of (FINAL-PATH . FILE) pairs. Each FILE is mapped to FINAL-PATH in the resulting store path. FILE can be either a file name, or a file-like object, @@ -1118,24 +1108,17 @@ to the source files instead of copying them." #:guile-for-build guile #:local-build? #t - ;; TODO: On the next rebuild cycle, set to "no" - ;; unconditionally. + ;; Avoid deprecation warnings about the use of the _IO* + ;; constants in (guix build utils). #:env-vars - (case deprecation-warnings - ((#f) - '(("GUILE_WARN_DEPRECATED" . "no"))) - ((detailed) - '(("GUILE_WARN_DEPRECATED" . "detailed"))) - (else - '()))))) + '(("GUILE_WARN_DEPRECATED" . "no"))))) (define* (imported-files files #:key (name "file-import") ;; The following parameters make sense when creating ;; an actual derivation. (system (%current-system)) - (guile (%guile-for-build)) - (deprecation-warnings #f)) + (guile (%guile-for-build))) "Import FILES into the store and return the resulting derivation or store file name (a derivation is created if and only if some elements of FILES are file-like objects and not local file names.) FILES must be a list @@ -1148,8 +1131,7 @@ as returned by 'local-file' for example." files) (imported-files/derivation files #:name name #:symlink? derivation? - #:system system #:guile guile - #:deprecation-warnings deprecation-warnings) + #:system system #:guile guile) (interned-file-tree `(,name directory ,@(file-mapping->tree files))))) @@ -1157,8 +1139,7 @@ as returned by 'local-file' for example." #:key (name "module-import") (system (%current-system)) (guile (%guile-for-build)) - (module-path %load-path) - (deprecation-warnings #f)) + (module-path %load-path)) "Return a derivation that contains the source files of MODULES, a list of module names such as `(ice-9 q)'. All of MODULES must be either names of modules to be found in the MODULE-PATH search path, or a module name followed @@ -1180,8 +1161,7 @@ last one is created from the given object." modules))) (imported-files files #:name name #:system system - #:guile guile - #:deprecation-warnings deprecation-warnings))) + #:guile guile))) (define* (compiled-modules modules #:key (name "module-import-compiled") @@ -1199,9 +1179,7 @@ they can refer to each other." #:system system #:guile guile #:module-path - module-path - #:deprecation-warnings - deprecation-warnings))) + module-path))) (define build (gexp (begin -- cgit v1.2.3 From 2abd76e8afe64ef4f4041ff02e9b22debb9f0483 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 27 Jul 2018 11:20:09 +0200 Subject: gnu: guile: Update to 2.2.4. * gnu/packages/guile.scm (guile-2.2): Update to 2.2.4. (guile-2.2.4): Remove. * gnu/packages/package-management.scm (guix)[inputs]: Switch to GUILE-2.2. * guix/self.scm (guile-for-build): Likewise. --- gnu/packages/guile.scm | 18 ++---------------- gnu/packages/package-management.scm | 4 +--- guix/self.scm | 4 +--- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f179f293ea..59f09375ad 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -228,7 +228,7 @@ without requiring the source code to be rewritten.") (define-public guile-2.2 (package (inherit guile-2.0) (name "guile") - (version "2.2.3") + (version "2.2.4") (source (origin (method url-fetch) @@ -238,7 +238,7 @@ without requiring the source code to be rewritten.") ".tar.xz")) (sha256 (base32 - "11j01agvnci2cx32wwpqs9078856yxmvs15gcsz7ganpkj2ahlw3")) + "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")) (modules '((guix build utils))) ;; Remove the pre-built object files. Instead, build everything @@ -302,20 +302,6 @@ without requiring the source code to be rewritten.") (base32 "1azm25zcmxif0skxfrp11d2wc89nrzpjaann9yxdw6pvjxhs948w")))))) -(define-public guile-2.2.4 - ;; This version contains important bug fixes, in particular wrt. to crashes - ;; of multi-threaded code as used by 'guix pull' and grafting. - (package - (inherit guile-2.2) - (version "2.2.4") - (source (origin - (inherit (package-source guile-2.2)) - (uri (string-append "mirror://gnu/guile/guile-" version - ".tar.xz")) - (sha256 - (base32 - "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")))))) - (define-public guile-next (deprecated-package "guile-next" guile-2.2)) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b7e3b320f6..58b8ca235c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -264,9 +264,7 @@ ("sqlite" ,sqlite) ("libgcrypt" ,libgcrypt) - ;; Use 2.2.4 to avoid various thread-safety issues while building - ;; code in parallel. - ("guile" ,guile-2.2.4) + ("guile" ,guile-2.2) ;; Many tests rely on the 'guile-bootstrap' package, which is why we ;; have it here. diff --git a/guix/self.scm b/guix/self.scm index 5ad644b1df..21b85eb253 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -896,10 +896,8 @@ running Guile." (module-ref (resolve-interface '(gnu packages guile)) 'guile-2.2.2)) ("2.2" - ;; Use the latest version, which has fixes for - ;; and VM stack-marking issues. (canonical-package (module-ref (resolve-interface '(gnu packages guile)) - 'guile-2.2.4))) + 'guile-2.2))) ("2.0" (module-ref (resolve-interface '(gnu packages guile)) 'guile-2.0)))) -- cgit v1.2.3 From 8bece84022752b635b28dba0b051d215bcc19fab Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 27 Jul 2018 11:26:02 +0200 Subject: gnu: guile: Remove version 2.2.2. * gnu/packages/guile.scm (guile-2.2.2): Remove. * guix/self.scm (guile-for-build): Remove special case for "2.2.2". (guix-derivation): Likewise. * build-aux/build-self.scm (build): Likewise. --- build-aux/build-self.scm | 4 +--- gnu/packages/guile.scm | 15 --------------- guix/self.scm | 9 +-------- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 3ecdc931a5..d8f3ff9bb0 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -297,9 +297,7 @@ person's version identifier." ;; The procedure below is our return value. (define* (build source #:key verbose? (version (date-version-string)) system - (guile-version (match ((@ (guile) version)) - ("2.2.2" "2.2.2") - (_ (effective-version)))) + (guile-version (effective-version)) (pull-version 0) #:allow-other-keys #:rest rest) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 59f09375ad..a6de4467d3 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -287,21 +287,6 @@ without requiring the source code to be rewritten.") (max-silent-time . 36000))))) ;10 hours (needed on ARM ; when heavily loaded) -(define-public guile-2.2.2 - ;; Keep it so that, when 'guix' runs on 2.2.2, 'guix pull' compiles objects - ;; with 2.2.2, thereby avoiding the ABI incompatibility issues described in - ;; . - (package - (inherit guile-2.2) - (version "2.2.2") - (source (origin - (inherit (package-source guile-2.2)) - (uri (string-append "mirror://gnu/guile/guile-" version - ".tar.xz")) - (sha256 - (base32 - "1azm25zcmxif0skxfrp11d2wc89nrzpjaann9yxdw6pvjxhs948w")))))) - (define-public guile-next (deprecated-package "guile-next" guile-2.2)) diff --git a/guix/self.scm b/guix/self.scm index 21b85eb253..c800c452e6 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -890,11 +890,6 @@ running Guile." 'canonical-package)) (match version - ("2.2.2" - ;; Gross hack to avoid ABI incompatibilities (see - ;; .) - (module-ref (resolve-interface '(gnu packages guile)) - 'guile-2.2.2)) ("2.2" (canonical-package (module-ref (resolve-interface '(gnu packages guile)) 'guile-2.2))) @@ -925,9 +920,7 @@ is not supported." #:name (string-append "guix-" (shorten version)) #:pull-version pull-version - #:guile-version (match guile-version - ("2.2.2" "2.2") - (version version)) + #:guile-version guile-version #:guile-for-build guile))) (if guix (lower-object guix) -- cgit v1.2.3 From 1428bce348b1beff97676fce9350f6d87a2ca8a4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 27 Jul 2018 11:32:59 +0200 Subject: build-self: Default to Guile 2.2 when building a standalone Guix. * build-aux/build-self.scm (build): Change #:guile-version to default to "2.2" when PULL-VERSION is greater than 0. --- build-aux/build-self.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index d8f3ff9bb0..edb7f5d9c5 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -297,8 +297,15 @@ person's version identifier." ;; The procedure below is our return value. (define* (build source #:key verbose? (version (date-version-string)) system - (guile-version (effective-version)) (pull-version 0) + + ;; For the standalone Guix, default to Guile 2.2. 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" + (effective-version))) + #:allow-other-keys #:rest rest) "Return a derivation that unpacks SOURCE into STORE and compiles Scheme -- cgit v1.2.3 From b148506df74e48006194448a089eb16d4fcffc59 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Jul 2018 01:57:46 +0200 Subject: gnu: openldap: Don't build static libraries. * gnu/packages/openldap.scm (openldap)[arguments]: Add "--disable-static" to #:configure-flags. Remove phase 'provide-libtool'. --- gnu/packages/openldap.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index d952f412e2..ac81026e28 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -70,11 +70,9 @@ (native-inputs `(("libtool" ,libtool))) (arguments `(#:tests? #f + #:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases - (add-after 'configure 'provide-libtool - (lambda _ (copy-file (which "libtool") "libtool") - #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 fbd2b8da5d7e6edb16ba7128324f6bc48ac68569 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 25 Jul 2018 04:36:02 +0200 Subject: gnu: icu4c: Don't keep a reference to coreutils. * gnu/packages/icu4c.scm (icu4c)[arguments]: Add phase 'avoid-coreutils-reference'. --- gnu/packages/icu4c.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 61333a3e75..cbba9aa42a 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -58,7 +58,15 @@ #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-to-source - (lambda _ (chdir "source") #t))))) + (lambda _ (chdir "source") #t)) + (add-after 'install 'avoid-coreutils-reference + ;; Don't keep a reference to the build tools. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* (find-files (string-append out "/lib/icu") + "\\.inc$") + (("INSTALL_CMD=.*/bin/install") "INSTALL_CMD=install")) + #t)))))) (synopsis "International Components for Unicode") (description "ICU is a set of C/C++ and Java libraries providing Unicode and -- cgit v1.2.3 From 5f8642ea6ae675d0fb5b06e616064458433087d3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 15:40:21 +0200 Subject: gnu: libxml2: Move static library to separate output. * gnu/packages/xml.scm (libxml2)[outputs, arguments]: New fields. --- gnu/packages/xml.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 1bf99f2fe5..85fd553b40 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -129,6 +129,20 @@ hierarchical form with variable field lengths.") (base32 "0ci7is75bwqqw2p32vxvrk6ds51ik7qgx73m920rakv5jlayax0b")))) (build-system gnu-build-system) + (outputs '("out" "static")) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'install 'move-static-libs + (lambda* (#:key outputs #:allow-other-keys) + (let ((src (string-append (assoc-ref outputs "out") "/lib")) + (dst (string-append (assoc-ref outputs "static") + "/lib"))) + (mkdir-p dst) + (for-each (lambda (ar) + (rename-file ar (string-append dst "/" + (basename ar)))) + (find-files src "\\.a$")) + #t)))))) (home-page "http://www.xmlsoft.org/") (synopsis "C parser for XML") (propagated-inputs `(("zlib" ,zlib))) ; libxml2.la says '-lz'. -- cgit v1.2.3 From 7ba79d5d76327054f96f66625c314e365d5d9fd9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 15:47:24 +0200 Subject: gnu: libxml2: Add explicit dependency on XZ. * gnu/packages/xml.scm (libxml2)[inputs]: New field. --- gnu/packages/xml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 85fd553b40..644753ff53 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -145,6 +145,7 @@ hierarchical form with variable field lengths.") #t)))))) (home-page "http://www.xmlsoft.org/") (synopsis "C parser for XML") + (inputs `(("xz" ,xz))) (propagated-inputs `(("zlib" ,zlib))) ; libxml2.la says '-lz'. (native-inputs `(("perl" ,perl))) ;; $XML_CATALOG_FILES lists 'catalog.xml' files found in under the 'xml' -- cgit v1.2.3 From d66146073def03d1a3d61607bc6b77997284904b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 17:08:30 +0200 Subject: gnu: python: Remove outdated comment and phases. * gnu/packages/python.scm (python-2.7)[arguments]: Don't set SOURCE_DATE_EPOCH or make libraries writable, since those are handled by gnu-build-system. (python-3.6): Don't override :#tests?. --- gnu/packages/python.scm | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 097e80b606..cdeedfe73b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -178,23 +178,7 @@ "tk")) ;tkinter; adds 50 MiB to the closure (build-system gnu-build-system) (arguments - `(;; 356 tests OK. - ;; 6 tests failed: - ;; test_compileall test_distutils test_import test_shutil test_socket - ;; test_subprocess - ;; 39 tests skipped: - ;; test_aepack test_al test_applesingle test_bsddb test_bsddb185 - ;; test_bsddb3 test_cd test_cl test_codecmaps_cn test_codecmaps_hk - ;; test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_curses - ;; test_dl test_gdb test_gl test_imageop test_imgfile test_ioctl - ;; test_kqueue test_linuxaudiodev test_macos test_macostools - ;; test_msilib test_ossaudiodev test_scriptpackages test_smtpnet - ;; test_socketserver test_startfile test_sunaudiodev test_timeout - ;; test_tk test_ttk_guionly test_urllib2net test_urllibnet - ;; test_winreg test_winsound test_zipfile64 - ;; 4 skips unexpected on linux2: - ;; test_bsddb test_bsddb3 test_gdb test_ioctl - #:test-target "test" + `(#:test-target "test" #:configure-flags (list "--enable-shared" ;allow embedding "--with-system-ffi" ;build ctypes @@ -219,11 +203,6 @@ "Lib/test/support/__init__.py" "Lib/test/test_subprocess.py")) (("/bin/sh") (which "sh"))) - - ;; Use zero as the timestamp in .pyc files so that builds are - ;; deterministic. TODO: Remove it when this variable is set in - ;; gnu-build-system.scm. - (setenv "SOURCE_DATE_EPOCH" "1") #t)) (add-before 'configure 'do-not-record-configure-flags (lambda* (#:key configure-flags #:allow-other-keys) @@ -281,15 +260,6 @@ file)))))) (call-with-output-file "__init__.py" (const #t)) #t))))))) - (add-before 'strip 'make-libraries-writable - (lambda* (#:key outputs #:allow-other-keys) - ;; Make .so files writable so they can be stripped. - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (file) - (chmod file #o755)) - (find-files (string-append out "/lib") - "\\.so")) - #t))) (add-after 'install 'move-tk-inter (lambda* (#:key outputs #:allow-other-keys) ;; When Tkinter support is built move it to a separate output so @@ -377,7 +347,6 @@ data types.") #t)))) (arguments (substitute-keyword-arguments (package-arguments python-2) - ((#:tests? _) #t) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'patch-timestamp-for-pyc-files -- cgit v1.2.3 From a1454169e0080d834cbddf94f04c5bcb7c3703e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 17:14:15 +0200 Subject: gnu: python: Update to 3.7.0. * gnu/packages/python.scm (python-3.6): Rename to ... (python-3.7): ... this. Update to 3.7.0. [arguments]: Remove phase 'patch-timestamp-for-pyc-files' and related code. Add phases to unset SOURCE_DATE_EPOCH during the check phase. (python-3): Is now PYTHON-3.7. * guix/build/python-build-system.scm (enable-bytecode-determinism): Don't set DETERMINISTIC_BUILD. --- gnu/packages/python.scm | 61 ++++++++------------------------------ guix/build/python-build-system.scm | 2 -- 2 files changed, 13 insertions(+), 50 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index cdeedfe73b..e39460594b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -321,10 +321,10 @@ data types.") (name "python") (properties `((superseded . ,python-2))))) -(define-public python-3.6 +(define-public python-3.7 (package (inherit python-2) (name "python") - (version "3.6.5") + (version "3.7.0") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" @@ -337,7 +337,7 @@ data types.") (patch-flags '("-p0")) (sha256 (base32 - "19l7inxm056jjw33zz97z0m02hsi7jnnx5kyb76abj5ml4xhad7l")) + "0j9mic5c9lbd2b20wka7hily7szz740wy9ilfrczxap63rnrk0h3")) (snippet '(begin (for-each delete-file @@ -348,53 +348,18 @@ data types.") (arguments (substitute-keyword-arguments (package-arguments python-2) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'patch-timestamp-for-pyc-files - (lambda _ - ;; We set DETERMINISTIC_BUILD to only override the mtime when - ;; building with Guix, lest we break auto-compilation in - ;; environments. - (setenv "DETERMINISTIC_BUILD" "1") - (substitute* "Lib/py_compile.py" - (("source_stats\\['mtime'\\]") - "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])")) - - ;; Use deterministic hashes for strings, bytes, and datetime - ;; objects. - (setenv "PYTHONHASHSEED" "0") - - ;; Reset mtime when validating bytecode header. - (substitute* "Lib/importlib/_bootstrap_external.py" - (("source_mtime = int\\(source_stats\\['mtime'\\]\\)") - "source_mtime = 1")) - #t)) - ;; These tests fail because of our change to the bytecode - ;; validation. They fail because expected exceptions do not get - ;; thrown. This seems to be no problem. - (add-after 'unpack 'disable-broken-bytecode-tests - (lambda _ - (substitute* "Lib/test/test_importlib/source/test_file_loader.py" - (("test_bad_marshal") - "disable_test_bad_marshal") - (("test_no_marshal") - "disable_test_no_marshal") - (("test_non_code_marshal") - "disable_test_non_code_marshal")) - #t)) - ;; Unset DETERMINISTIC_BUILD to allow for tests that check that - ;; stale pyc files are rebuilt. - (add-before 'check 'allow-non-deterministic-compilation - (lambda _ (unsetenv "DETERMINISTIC_BUILD") #t)) - ;; We need to rebuild all pyc files for three different - ;; optimization levels to replace all files that were not built - ;; deterministically. - - ;; FIXME: Without this phase we have close to 2000 files that + `(modify-phases ,phases + ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it + ;; again afterwards. See . + (add-before 'check 'unset-SOURCE_DATE_EPOCH + (lambda _ (unsetenv "SOURCE_DATE_EPOCH") #t)) + (add-after 'check 'reset-SOURCE_DATE_EPOCH + (lambda _ (setenv "SOURCE_DATE_EPOCH" "1") #t)) + ;; FIXME: Without this phase we have close to 400 files that ;; differ across different builds of this package. With this phase - ;; there are about 500 files left that differ. + ;; there are 44 files left that differ. (add-after 'install 'rebuild-bytecode (lambda* (#:key outputs #:allow-other-keys) - (setenv "DETERMINISTIC_BUILD" "1") (let ((out (assoc-ref outputs "out"))) (for-each (lambda (opt) @@ -421,7 +386,7 @@ data types.") "/site-packages")))))))) ;; Current 3.x version. -(define-public python-3 python-3.6) +(define-public python-3 python-3.7) ;; Current major version. (define-public python python-3) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 376ea81f1a..5bb0ba49d5 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -246,8 +246,6 @@ installed with setuptools." (define* (enable-bytecode-determinism #:rest _) "Improve determinism of pyc files." - ;; Set DETERMINISTIC_BUILD to override the embedded mtime in pyc files. - (setenv "DETERMINISTIC_BUILD" "1") ;; Use deterministic hashes for strings, bytes, and datetime objects. (setenv "PYTHONHASHSEED" "0") #t) -- cgit v1.2.3 From 81d967075ebe0facc4cbaf6718b89405ea9195d8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 18:25:16 +0200 Subject: gnu: python: Rebuild bytecode after removing tests. * gnu/packages/python.scm (python-3.7)[arguments]: Run 'rebuild-bytecode' after 'remove-tests' to save CPU cycles. Adjust exclude regex. --- gnu/packages/python.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e39460594b..3d924f7476 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -358,7 +358,7 @@ data types.") ;; FIXME: Without this phase we have close to 400 files that ;; differ across different builds of this package. With this phase ;; there are 44 files left that differ. - (add-after 'install 'rebuild-bytecode + (add-after 'remove-tests 'rebuild-bytecode (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (for-each @@ -372,8 +372,7 @@ data types.") "-m" "compileall" "-f" ; force rebuild ;; Don't build lib2to3, because it's Python 2 code. - ;; Also don't build obviously broken test code. - "-x" "(lib2to3|test/bad.*)" + "-x" "lib2to3.*" ,file))) (find-files out "\\.py$"))) (list '() '("-O") '("-OO"))) -- cgit v1.2.3 From a422e2478e695bd1211fda827c767134de39fb2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 20:53:50 +0200 Subject: gnu: python: Build reproducibly. \o/ * gnu/packages/python.scm (python-3.7)[arguments]: Set PYTHONHASHSEED before rebuilding all bytecode. Adjust regex so that lib2to3_ex.py gets compiled. --- gnu/packages/python.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3d924f7476..6cab84715a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -361,6 +361,9 @@ data types.") (add-after 'remove-tests 'rebuild-bytecode (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) + ;; Disable hash randomization to ensure the generated .pycs + ;; are reproducible. + (setenv "PYTHONHASHSEED" "0") (for-each (lambda (opt) (format #t "Compiling with optimization level: ~a\n" @@ -372,7 +375,7 @@ data types.") "-m" "compileall" "-f" ; force rebuild ;; Don't build lib2to3, because it's Python 2 code. - "-x" "lib2to3.*" + "-x" "lib2to3/.*" ,file))) (find-files out "\\.py$"))) (list '() '("-O") '("-OO"))) -- cgit v1.2.3 From bc46a45ae7937c03c3cb1889ce1a461313a8e154 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 20:59:22 +0200 Subject: gnu: python-py: Add missing dependency on setuptools-scm. * gnu/packages/python.scm (python-py)[native-inputs]: Add PYTHON-SETUPTOOLS-SCM. --- gnu/packages/python.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6cab84715a..7a4d47a9d6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1725,6 +1725,8 @@ matching them against a list of media-ranges.") ;; Expected '/tmp/guix-build-python-py-1.4.31.drv-0/py-1.4.31/py'. ;; Is this module globally installed?" '(#:tests? #f)) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) (home-page "http://pylib.readthedocs.io/") (synopsis "Python library for parsing, I/O, instrospection, and logging") (description -- cgit v1.2.3 From a0d77eba72da7f589970a4da2723fbb869a10df7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:00:53 +0200 Subject: gnu: python-py: Update to 1.5.4. * gnu/packages/python.scm (python-py): Update to 1.5.4. --- 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 7a4d47a9d6..c4a2e8d685 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1710,14 +1710,14 @@ matching them against a list of media-ranges.") (define-public python-py (package (name "python-py") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) (uri (pypi-uri "py" version)) (sha256 (base32 - "10gq2lckvgwlk9w6yzijhzkarx44hsaknd0ypa08wlnpjnsgmj99")))) + "1xxvwfn82457djf55f5n2c94699rfqnk43br8fif2r2q8gvrmm9z")))) (build-system python-build-system) (arguments ;; FIXME: "ImportError: 'test' module incorrectly imported from -- cgit v1.2.3 From 3765c9c95b226228fdf9fe9bbfc777140ac38b6a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:02:21 +0200 Subject: gnu: python-py: Update home page. * gnu/packages/python.scm (python-py)[home-page]: Change to repository URL. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c4a2e8d685..b4cc934663 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1727,7 +1727,7 @@ matching them against a list of media-ranges.") '(#:tests? #f)) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) - (home-page "http://pylib.readthedocs.io/") + (home-page "https://github.com/pytest-dev/py") (synopsis "Python library for parsing, I/O, instrospection, and logging") (description "Py is a Python library for file name parsing, .ini file parsing, I/O, -- cgit v1.2.3 From e8e7cd12c744024005a3698d652bc274cdac0fff Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:06:17 +0200 Subject: gnu: python-pyflakes: Update to 2.0.0. * gnu/packages/python.scm (python-pyflakes): Update to 2.0.0. --- 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 b4cc934663..1b182139f5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5512,14 +5512,14 @@ PEP 8.") (define-public python-pyflakes (package (name "python-pyflakes") - (version "1.5.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (pypi-uri "pyflakes" version)) (sha256 (base32 - "1x1pcca4a24k4pw8x1c77sgi58cg1wl2k38mp8a25k608pzls3da")))) + "0jba28czyvimdc72llms3f17swp3i8jdcabf5w0j00adfbn64xls")))) (build-system python-build-system) (home-page "https://github.com/pyflakes/pyflakes") -- cgit v1.2.3 From 9e7d6e818cbea2049a2d2b2eb4c689d3b0d3efb8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:09:10 +0200 Subject: gnu: python-more-itertools: Update to 4.2.0. * gnu/packages/python.scm (python-more-itertools): Update to 4.2.0. --- 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 1b182139f5..37e19dad3c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13299,14 +13299,14 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "4.1.0") + (version "4.2.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "0i3ch700g5fyjp692gprlnzbysl8w0sa2vijbp3s40drvk67xkn9")))) + "1s6qhl7a7jy8gqw8p545rxfp7rwz1hmjr9p6prk93zbv6f9rhsrb")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six-bootstrap))) -- cgit v1.2.3 From fdf5344a23359ead55df86e7f1da9f0545bc2d97 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:21:55 +0200 Subject: gnu: python-pycodestyle: Update to 2.4.0. * gnu/packages/python.scm (python-pycodestyle): Update to 2.4.0. --- 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 37e19dad3c..b336649e11 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3806,14 +3806,14 @@ as the original project seems to have been abandoned circa 2007.") (define-public python-pycodestyle (package (name "python-pycodestyle") - (version "2.3.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (pypi-uri "pycodestyle" version)) (sha256 (base32 - "0rk78b66p57ala26mdldl9lafr48blv5s659sah9q50qnfjmc8k8")))) + "0fhy4vnlgpjq4qd1wdnl6pvdw7rah0ypmn8c9mkhz8clsndskz6b")))) (build-system python-build-system) (home-page "https://pycodestyle.readthedocs.io/") (synopsis "Python style guide checker") -- cgit v1.2.3 From d0205dfd92bf8e515a5efc2400543fcaba0bdd0c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:32:03 +0200 Subject: gnu: python-setuptools: Update to 40.0.0. * gnu/packages/python.scm (python-setuptools): Update to 40.0.0. [source](uri): Adjust to zipball archive. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b336649e11..444b9fd573 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -844,14 +844,14 @@ API for locking files.") (define-public python-setuptools (package (name "python-setuptools") - (version "31.0.0") + (version "40.0.0") (source (origin (method url-fetch) - (uri (pypi-uri "setuptools" version)) + (uri (pypi-uri "setuptools" version ".zip")) (sha256 (base32 - "0ypybh4hx3bv4vhg2dc74xpj1g56ggnaffm87k4abhwjwq6wq608")) + "0pq116lr14gnc62v76nk0npkm6krb2mpp7p9ab369zgv4n7dnah1")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From fb4c6115f5aa1fb940e6501388f9fd25b738bc8a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 21:59:01 +0200 Subject: gnu: python-pytest-runner: Update to 4.2. * gnu/packages/check.scm (python-pytest-runner): Update to 4.2. [arguments]: Remove. --- gnu/packages/check.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 42b90bc2b2..3239bf895e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -729,26 +729,15 @@ supports coverage of subprocesses.") (define-public python-pytest-runner (package (name "python-pytest-runner") - (version "2.11.1") + (version "4.2") (source (origin (method url-fetch) (uri (pypi-uri "pytest-runner" version)) (sha256 (base32 - "1cw978kqqcq916b9gfns1qjqvg33c5ail5jhw9054dsynkm32flq")))) + "1gkpyphawxz38ni1gdq1fmwyqcg02m7ypzqvv46z06crwdxi2gyj")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; The fancy way of setting the version with setuptools_scm does not - ;; seem to work here. - (add-after 'unpack 'set-version - (lambda _ - (substitute* "docs/conf.py" - (("version = setuptools_scm\\.get_version\\(root='\\.\\.')") - (string-append "version = \"" ,version "\""))) - #t))))) (native-inputs `(("python-pytest" ,python-pytest-bootstrap) ("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From 153812ee0d2fb643b6db3a6c918fced512198d4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 22:09:03 +0200 Subject: gnu: python-flake8: Update to 3.5.0. * gnu/packages/python.scm (python-flake8): Update to 3.5.0. --- 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 444b9fd573..130769800f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5617,14 +5617,14 @@ complexity of Python source code.") (define-public python-flake8 (package (name "python-flake8") - (version "3.4.1") + (version "3.5.0") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "1n0i38592vy3q0x2a9bf8z6rhhn04i30wsn5i5zzcj7qkxvl8062")))) + "184b33grvvjmiwlv9kyd7yng9qv5ld24154j70z332xxg9gjclvj")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 85f1342f01ad0fe6e5b23cabd5a6365b6a8e22bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 22:17:43 +0200 Subject: gnu: python-hypothesis: Update to 3.66.6. * gnu/packages/check.scm (python-hypothesis): Update to 3.66.6. --- 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 3239bf895e..8ee7d97731 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1386,13 +1386,13 @@ normally the case.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "3.52.0") + (version "3.66.6") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "0g54cypfi5qj6cgxfr7l1nb41r1cqhhngx4qxn4ga9h720rcsbr8")))) + "0jlcbnirj5ndv4gvb3rmydligljn1alim9d4dk377188y09iwl5k")))) (build-system python-build-system) (native-inputs `(("python-flake8" ,python-flake8) -- cgit v1.2.3 From 9f585a528eb7dc9ae5e1c1d901f84189ef8063e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 23:47:41 +0200 Subject: gnu: python-pytest-cov: Update to 2.5.1. * gnu/packages/check.scm (python-pytest-cov): Update to 2.5.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 8ee7d97731..b2a0ecce48 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -693,14 +693,14 @@ and many external plugins.") (define-public python-pytest-cov (package (name "python-pytest-cov") - (version "2.4.0") + (version "2.5.1") (source (origin (method url-fetch) (uri (pypi-uri "pytest-cov" version)) (sha256 (base32 - "03c2qc42r4bczyw93gd7n0qi1h1jfhw7fnbhi33c3vp1hs81gm2k")))) + "0bbfpwdh9k3636bxc88vz9fa7vf4akchgn513ql1vd0xy4n7bah3")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 1166b9c795e3762ece2623143ae2fe0984b4a158 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Jul 2018 23:41:37 +0200 Subject: gnu: Add python-invoke. * gnu/packages/python.scm (python-invoke, python2-invoke): New public variables. --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 130769800f..60a41ea0cd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10767,6 +10767,32 @@ projects.") (define-public python2-incremental (package-with-python2 python-incremental)) +(define-public python-invoke + (package + (name "python-invoke") + (home-page "http://www.pyinvoke.org/") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "invoke" version)) + (sha256 + (base32 + "0aiy1xvk1f91246zxd1zqrm679vdvd10h843a2na41cqr3cflpi6")))) + (build-system python-build-system) + (arguments + ;; XXX: Requires many dependencies that are not yet in Guix. + `(#:tests? #f)) + (synopsis "Pythonic task execution") + (description + "Invoke is a Python task execution tool and library, drawing inspiration +from various sources to arrive at a powerful and clean feature set. It is +evolved from the Fabric project, but focuses on local and abstract concerns +instead of servers and network commands.") + (license license:bsd-3))) + +(define-public python2-invoke + (package-with-python2 python-invoke)) + (define-public python-automat (package (name "python-automat") -- cgit v1.2.3 From a9ae30b78ed591e8212a4b918024c771f0896a4f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 00:11:01 +0200 Subject: gnu: python-pytest: Update to 3.6.3. * gnu/packages/check.scm (python-pytest): Update to 3.6.3. [propagated-inputs]: Add PYTHON-ATOMICWRITES. [native-inputs]: Add PYTHON-INVOKE. --- gnu/packages/check.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index b2a0ecce48..134e640344 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -619,14 +619,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "3.5.0") + (version "3.6.3") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "1q832zd07zak2lyxbycxjydh0jp7y3hvawjqzlvra6aghz8r3r7s")))) + "0lnppwpz5i06sdhzv5b2j4x2f42mil38nx1l0kmnzvibdikwhlq4")))) (build-system python-build-system) (arguments `(#:phases @@ -644,7 +644,8 @@ standard library.") line))) #t))))) (propagated-inputs - `(("python-attrs" ,python-attrs-bootstrap) + `(("python-atomicwrites" ,python-atomicwrites) + ("python-attrs" ,python-attrs-bootstrap) ("python-more-itertools" ,python-more-itertools) ("python-pluggy" ,python-pluggy) ("python-py" ,python-py) @@ -653,6 +654,7 @@ standard library.") `(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`. ("bash" ,bash) ("python-hypothesis" ,python-hypothesis) + ("python-invoke" ,python-invoke) ;XXX: not needed for >3.6.3 ("python-nose" ,python-nose) ("python-mock" ,python-mock) ("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From 25ccb99347d7f8e54fecf0d8b397e21c3879d0fa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 00:12:14 +0200 Subject: gnu: python-pytest-mock: Update to 1.10.0. * gnu/packages/check.scm (python-pytest-mock): Update to 1.10.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 134e640344..9a53a7eb72 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -756,14 +756,14 @@ supports coverage of subprocesses.") (define-public python-pytest-mock (package (name "python-pytest-mock") - (version "1.6.3") + (version "1.10.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest-mock" version)) (sha256 (base32 - "075v7b2wm5f839r1a30n21wfk5rfqp3d05q7zb9jlb2wmxki23cj")))) + "1h6lgpmsvs9s8j2s80v06f9f3iaw1n1rc51mbrxk1f12sw4q56nq")))) (build-system python-build-system) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From fc8778e2934e623b4cfae253942a721cea42a43b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 01:09:39 +0200 Subject: gnu: gdb: Fix build with Python >= 3.7. * gnu/packages/patches/gdb-python-3.7.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gdb.scm (gdb)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/gdb.scm | 1 + gnu/packages/patches/gdb-python-3.7.patch | 52 +++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 gnu/packages/patches/gdb-python-3.7.patch diff --git a/gnu/local.mk b/gnu/local.mk index e2bdd4742d..b8189eb2c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -709,6 +709,7 @@ dist_patch_DATA = \ %D%/packages/patches/gd-CVE-2018-5711.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ + %D%/packages/patches/gdb-python-3.7.patch \ %D%/packages/patches/gemma-intel-compat.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 36ccb79d67..4c47cc5854 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -42,6 +42,7 @@ (method url-fetch) (uri (string-append "mirror://gnu/gdb/gdb-" version ".tar.xz")) + (patches (search-patches "gdb-python-3.7.patch")) (sha256 (base32 "0d2bpqk58fqlx21rbnk8mbcjlggzc9kb5sjirrfrrrjq70ka0qdg")))) diff --git a/gnu/packages/patches/gdb-python-3.7.patch b/gnu/packages/patches/gdb-python-3.7.patch new file mode 100644 index 0000000000..c51442c8b2 --- /dev/null +++ b/gnu/packages/patches/gdb-python-3.7.patch @@ -0,0 +1,52 @@ +Fix build failure with Python 3.7 and newer. + +Taken from this upstream commit, sans ChangeLog update: + +https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=aeab512851bf6ed623d1c6c4305b6ce05e51a10c + +diff --git a/gdb/python/python.c b/gdb/python/python.c +index 1805c90..20fc674 100644 +--- a/gdb/python/python.c ++++ b/gdb/python/python.c +@@ -1667,6 +1667,17 @@ finalize_python (void *ignore) + restore_active_ext_lang (previous_active); + } + ++#ifdef IS_PY3K ++/* This is called via the PyImport_AppendInittab mechanism called ++ during initialization, to make the built-in _gdb module known to ++ Python. */ ++PyMODINIT_FUNC ++init__gdb_module (void) ++{ ++ return PyModule_Create (&python_GdbModuleDef); ++} ++#endif ++ + static bool + do_start_initialization () + { +@@ -1707,6 +1718,9 @@ do_start_initialization () + remain alive for the duration of the program's execution, so + it is not freed after this call. */ + Py_SetProgramName (progname_copy); ++ ++ /* Define _gdb as a built-in module. */ ++ PyImport_AppendInittab ("_gdb", init__gdb_module); + #else + Py_SetProgramName (progname.release ()); + #endif +@@ -1716,9 +1730,7 @@ do_start_initialization () + PyEval_InitThreads (); + + #ifdef IS_PY3K +- gdb_module = PyModule_Create (&python_GdbModuleDef); +- /* Add _gdb module to the list of known built-in modules. */ +- _PyImport_FixupBuiltin (gdb_module, "_gdb"); ++ gdb_module = PyImport_ImportModule ("_gdb"); + #else + gdb_module = Py_InitModule ("_gdb", python_GdbMethods); + #endif +-- +2.9.3 + -- cgit v1.2.3 From 4696368108c2e1500a8f1d8a0d75b5f0aef1c37a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 02:31:30 +0200 Subject: gnu: python-fonttools: Update to 3.28.0. * gnu/packages/python.scm (python-fonttools): Update to 3.28.0. [arguments]: Remove. [native-inputs]: Add PYTHON-PYTEST and PYTHON-PYTEST-RUNNER. --- gnu/packages/python.scm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 60a41ea0cd..7e46a76109 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5894,28 +5894,18 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "3.15.1") + (version "3.28.0") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "1hhj97izwliy0vybmza72d90l5d4mcn50y8akq7kyccfl82vdx4d")))) + "0vsvjhidpb5kywpjgz1j3fywzkddxkb0afqai18qa3h6lqjyxwpb")))) (build-system python-build-system) - (arguments - '(#:test-target "check" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-setuppy - ;; Remove the undocumented "extra_path" argument, which adds an - ;; intervening directories between site-packages and the package - ;; directory. - (lambda _ - (substitute* "setup.py" - (("^[ \t]*extra_path *= *'FontTools',") "")) - #t))))) (native-inputs - `(("unzip" ,unzip))) + `(("unzip" ,unzip) + ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) (home-page "https://github.com/behdad/fonttools") (synopsis "Tools to manipulate font files") (description -- cgit v1.2.3 From a4b7a1cb4abc2614d898b8722c3ac779ce148fa0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Jul 2018 17:12:01 +0300 Subject: gnu: python-3.7: Update deleted tests. * gnu/packages/python.scm (python-3.7)[source]: Update the list of files to be deleted in the snippet. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7e46a76109..4033573a8b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -341,9 +341,9 @@ data types.") (snippet '(begin (for-each delete-file - '("Lib/ctypes/test/test_structures.py" ; fails on aarch64 - "Lib/ctypes/test/test_win32.py" ; fails on aarch64 - "Lib/test/test_fcntl.py")) ; fails on aarch64 + '("Lib/ctypes/test/test_win32.py" ; fails on aarch64 + "Lib/test/test_fcntl.py" ; fails on aarch64 + "Lib/test/test_posix.py")) ; fails on aarch64 #t)))) (arguments (substitute-keyword-arguments (package-arguments python-2) -- cgit v1.2.3 From 20b0aaf986be704c477c558de999bcd390959fc6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 23:37:52 +0200 Subject: gnu: python-fonttools: Update license. This is a follow-up to commit 4696368108c2e1500a8f1d8a0d75b5f0aef1c37a. * gnu/packages/python.scm (python-fonttools)[license]: Change to EXPAT (since 3.21). --- gnu/packages/python.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4033573a8b..6f60b75f32 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5914,9 +5914,7 @@ supports reading and writing of TrueType/OpenType fonts, reading and writing of AFM files, reading (and partially writing) of PS Type 1 fonts. The package also contains a tool called “TTX” which converts TrueType/OpenType fonts to and from an XML-based format.") - (license (license:non-copyleft - "file://LICENSE.txt" - "See LICENSE.txt in the distribution.")))) + (license license:expat))) (define-public python2-fonttools (package-with-python2 python-fonttools)) -- cgit v1.2.3 From d37d975b748f65a1ace4b2434d04e30ed558a7a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 23:39:00 +0200 Subject: gnu: python-pytest: Update to 3.6.4. * gnu/packages/check.scm (python-pytest): Update to 3.6.4. [native-inputs]: Remove PYTHON-INVOKE. --- gnu/packages/check.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 9a53a7eb72..5cb9c7ab2e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -619,14 +619,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "3.6.3") + (version "3.6.4") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "0lnppwpz5i06sdhzv5b2j4x2f42mil38nx1l0kmnzvibdikwhlq4")))) + "0h85kzdi5pfkz9v0z8xyrsj1rvnmyyjpng7cran28jmnc41w27il")))) (build-system python-build-system) (arguments `(#:phases @@ -654,7 +654,6 @@ standard library.") `(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`. ("bash" ,bash) ("python-hypothesis" ,python-hypothesis) - ("python-invoke" ,python-invoke) ;XXX: not needed for >3.6.3 ("python-nose" ,python-nose) ("python-mock" ,python-mock) ("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From b4052c96ee252bd65ede6b7f0983942cb653a36c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:22:04 +0200 Subject: gnu: nettle: Move static libraries to separate output. * gnu/packages/nettle.scm (nettle-2)[outputs]: Add "static". [arguments]: Add #:phases. --- gnu/packages/nettle.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm index 67a3062a5a..1212f32812 100644 --- a/gnu/packages/nettle.scm +++ b/gnu/packages/nettle.scm @@ -44,8 +44,22 @@ ;; $libdir, which is not the case by default. Work around it. '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") - "/lib")))) - (outputs '("out" "debug")) + "/lib")) + #:phases (modify-phases %standard-phases + (add-after 'install 'move-static-libraries + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (slib (string-append (assoc-ref outputs "static") + "/lib"))) + (mkdir-p slib) + (with-directory-excursion (string-append out "/lib") + (for-each (lambda (ar) + (rename-file ar (string-append + slib "/" + (basename ar)))) + (find-files "." "\\.a$"))) + #t)))))) + (outputs '("out" "debug" "static")) (native-inputs `(("m4" ,m4))) (propagated-inputs `(("gmp" ,gmp))) (home-page "https://www.lysator.liu.se/~nisse/nettle/") -- cgit v1.2.3 From d9f84612507423bb95bad91c6276c03e8cb934ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:33:50 +0200 Subject: gnu: libtasn1: Don't build static library. * gnu/packages/tls.scm (libtasn1)[arguments]: New field. --- gnu/packages/tls.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e99b7a83ba..f9c46c7bcb 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -80,6 +80,8 @@ (base32 "1jlc1iahj8k3haz28j55nzg7sgni5h41vqy461i1bpbx6668wlky")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static"))) (native-inputs `(("perl" ,perl))) (home-page "https://www.gnu.org/software/libtasn1/") (synopsis "ASN.1 library") -- cgit v1.2.3 From cd9ad095c73057bd1d60c5011e7122ab7ac9fecf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:35:35 +0200 Subject: gnu: libidn2: Don't build static library. * gnu/packages/libidn.scm (libidn2)[arguments]: New field. --- gnu/packages/libidn.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index 7cf061768e..765cefcfa4 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -70,6 +70,8 @@ Java libraries.") (inputs `(("libunistring" ,libunistring))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static"))) (synopsis "Internationalized domain name library for IDNA2008") (description "Libidn2 is an internationalized domain library implementing the IDNA2008 specifications. Libidn2 is believed to be a complete IDNA2008 -- cgit v1.2.3 From 1f2d64e4a86fbd77cfd7c773a9621a001516e1ce Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:42:59 +0200 Subject: gnu: libunistring: Don't install static library. * gnu/packages/libunistring.scm (libunistring)[arguments]: Add #:configure-flags. --- gnu/packages/libunistring.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm index b6656904eb..debf3cc7dd 100644 --- a/gnu/packages/libunistring.scm +++ b/gnu/packages/libunistring.scm @@ -48,7 +48,8 @@ ;; Work around parallel build issue whereby C files may be compiled before ;; config.h is built: see and ;; . - '(#:parallel-build? #f)) + '(#:parallel-build? #f + #:configure-flags '("--disable-static"))) (synopsis "C library for manipulating Unicode strings") (description "GNU libunistring is a library providing functions to manipulate -- cgit v1.2.3 From 85b44823083f94bfc2bd552fb0460f188bd765f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:58:56 +0200 Subject: gnu: libidn: Don't build static libraries. * gnu/packages/libidn.scm (libidn)[arguments]: New field. --- gnu/packages/libidn.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm index 765cefcfa4..719a0f0b4b 100644 --- a/gnu/packages/libidn.scm +++ b/gnu/packages/libidn.scm @@ -43,6 +43,8 @@ "07pyy0afqikfq51z5kbzbj9ldbd12mri0zvx0mfv3ds6bc0g26pi")))) (build-system gnu-build-system) ;; FIXME: No Java and C# libraries are currently built. + (arguments + `(#:configure-flags '("--disable-static"))) (synopsis "Internationalized string processing library") (description "libidn is a library implementing of the Stringprep, Punycode and IDNA -- cgit v1.2.3 From a44426ee01de3751c1016de570bfc82da0287f79 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 16:59:33 +0200 Subject: gnu: shishi: Don't build static library. * gnu/packages/kerberos.scm (shishi)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/kerberos.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index cb14f765e2..508f9c4bd2 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -117,7 +117,7 @@ cryptography.") '(;; This is required since we patch some of the build scripts. ;; Remove for the next Shishi release after 1.0.2 or when ;; removing 'shishi-fix-libgcrypt-detection.patch'. - #:configure-flags '("ac_cv_libgcrypt=yes"))) + #:configure-flags '("ac_cv_libgcrypt=yes" "--disable-static"))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("gnutls" ,gnutls) -- cgit v1.2.3 From 7b844100464633db5455a3931858bb57c9e529e6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 17:00:07 +0200 Subject: gnu: curl: Don't build static library. * gnu/packages/curl.scm (curl)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/curl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 8bed48fd87..08bbda12e0 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -84,7 +84,8 @@ (separator #f) ;single entry (files '("etc/ssl/certs/ca-certificates.crt"))))) (arguments - `(#:configure-flags '("--with-gnutls" "--with-gssapi") + `(#:configure-flags '("--with-gnutls" "--with-gssapi" + "--disable-static") ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl #:phases (modify-phases %standard-phases -- cgit v1.2.3 From b90289dadc8ee15848ce911a2bdcd3ae8302d58c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 17:09:07 +0200 Subject: gnu: zlib: Move static library to separate output. * gnu/packages/compression.scm (zlib)[outputs]: New field. [arguments]: Add phase 'move-static-library'. --- gnu/packages/compression.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index fdfa5ce39b..c206fd8664 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -85,6 +85,7 @@ (base32 "18dighcs333gsvajvvgqp8l4cx7h1x7yx9gd5xacnk80spyykrf3")))) (build-system gnu-build-system) + (outputs '("out" "static")) (arguments `(#:phases (modify-phases %standard-phases @@ -99,7 +100,15 @@ `((setenv "CHOST" ,(%current-target-system))) '()) (invoke "./configure" - (string-append "--prefix=" out)))))))) + (string-append "--prefix=" out))))) + (add-after 'install 'move-static-library + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (with-directory-excursion (string-append out "/lib") + (install-file "libz.a" (string-append static "/lib")) + (delete-file "libz.a") + #t))))))) (home-page "https://zlib.net/") (synopsis "Compression library") (description -- cgit v1.2.3 From e076d9392df69f6730318d337b0e96f99b5cff12 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Aug 2018 13:06:14 +0200 Subject: gnu: pango: Update to 1.42.3. * gnu/packages/gtk.scm (pango): Update to 1.42.3. --- 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 e351c6e96d..c4e00bc62a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -217,7 +217,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public pango (package (name "pango") - (version "1.42.2") + (version "1.42.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -225,7 +225,7 @@ affine transformation (scale, rotation, shear, etc.).") name "-" version ".tar.xz")) (sha256 (base32 - "1qm17k7r4299jbvqifk469q4hs5qj9j19kr4h9nfy5h4sjs1dr5i")))) + "0fnybmdrbx1d9g0rsxa4b31hvrh377n2ziz5rl13y56m0m9qfggv")))) (build-system gnu-build-system) (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files. -- cgit v1.2.3 From 07ca7165f90079948e7174468b47ecc7cd38531d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Aug 2018 15:02:36 +0200 Subject: gnu: poppler: Update to 0.67.0. * gnu/packages/pdf.scm (poppler): Update to 0.67.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 cb5442c433..f5f4f95b71 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -80,14 +80,14 @@ (define-public poppler (package (name "poppler") - (version "0.64.0") + (version "0.67.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "1cb4gz3h7cfqyphhx71qc9mp417bdphchbfghmvhcy4zm4ngj7dj")))) + "1yb6agmcxf0ixqm65d4aknl0hgmswf94x0k59ic0qqav1wd4yjm3")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no -- cgit v1.2.3 From 82230603ce06de7aa3e4aef2fa093a6dbf0ef8df Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 3 Aug 2018 23:12:33 -0400 Subject: build-system/gnu: If a phase returns #f, the build fails. Fixes . Introduced by commit d8a3b1b9e847d4a44d2695f95af77170d4d2788f. * guix/build/gnu-build-system.scm (gnu-build): Use 'every' instead of 'for-each'. --- guix/build/gnu-build-system.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index be5ad78b93..e5f3197b0a 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -792,26 +792,26 @@ in order. Return #t if all the PHASES succeeded, #f otherwise." ;; The trick is to #:allow-other-keys everywhere, so that each procedure in ;; PHASES can pick the keyword arguments it's interested in. - (for-each (match-lambda - ((name . proc) - (let ((start (current-time time-monotonic))) - (format #t "starting phase `~a'~%" name) - (let ((result (apply proc args)) - (end (current-time time-monotonic))) - (format #t "phase `~a' ~:[failed~;succeeded~] after ~,1f seconds~%" - name result - (elapsed-time end start)) - - ;; Issue a warning unless the result is #t. - (unless (eqv? result #t) - (format (current-error-port) "\ + (every (match-lambda + ((name . proc) + (let ((start (current-time time-monotonic))) + (format #t "starting phase `~a'~%" name) + (let ((result (apply proc args)) + (end (current-time time-monotonic))) + (format #t "phase `~a' ~:[failed~;succeeded~] after ~,1f seconds~%" + name result + (elapsed-time end start)) + + ;; Issue a warning unless the result is #t. + (unless (eqv? result #t) + (format (current-error-port) "\ ## WARNING: phase `~a' returned `~s'. Return values other than #t ## are deprecated. Please migrate this package so that its phase ## procedures report errors by raising an exception, and otherwise ## always return #t.~%" - name result)) + name result)) - ;; Dump the environment variables as a shell script, for handy debugging. - (system "export > $NIX_BUILD_TOP/environment-variables") - result)))) - phases)) + ;; Dump the environment variables as a shell script, for handy debugging. + (system "export > $NIX_BUILD_TOP/environment-variables") + result)))) + phases)) -- cgit v1.2.3 From d60869805e313f2a733aa7a69932f1c5d2224845 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 13:07:54 +0200 Subject: gnu: cups-filters: Update to 1.20.4. * gnu/packages/cups.scm (cups-filters): Update to 1.20.4. --- 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 5e852501ce..c2c1a01b73 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -53,7 +53,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.20.3") + (version "1.20.4") (source(origin (method url-fetch) (uri @@ -61,7 +61,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "1g18qkvl9zdxickiblgs2vvkip4b6p2jalw4d30zzz3hh8f1g6iv")) + "0sjkmclcb1r77015wllsyz26272br3s17v6b1q2xwb2nm2gnwx9k")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output -- cgit v1.2.3 From 4e8d9015e06ca3ea432da1b53f7518c767d32a11 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 14:18:10 +0200 Subject: gnu: e2fsprogs: Update to 1.44.3. * gnu/packages/linux.scm (e2fsprogs): Update to 1.44.3. * gnu/packages/patches/e2fsprogs-glibc-2.27.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/linux.scm | 5 +-- gnu/packages/patches/e2fsprogs-glibc-2.27.patch | 56 ------------------------- 3 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 gnu/packages/patches/e2fsprogs-glibc-2.27.patch diff --git a/gnu/local.mk b/gnu/local.mk index 44b275e95c..9eb6360375 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -644,7 +644,6 @@ dist_patch_DATA = \ %D%/packages/patches/doxygen-gcc-ice.patch \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ - %D%/packages/patches/e2fsprogs-glibc-2.27.patch \ %D%/packages/patches/eigen-arm-neon-fixes.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elogind-glibc-2.27.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3adc0d68e0..3665080218 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -732,7 +732,7 @@ slabtop, and skill.") (define-public e2fsprogs (package (name "e2fsprogs") - (version "1.43.6") + (version "1.44.3") (source (origin (method url-fetch) (uri (string-append @@ -741,8 +741,7 @@ slabtop, and skill.") name "-" version ".tar.xz")) (sha256 (base32 - "00ilv65dzcgiap435j89xk86shf7rrav3wsik7cahy789qijdcn9")) - (patches (search-patches "e2fsprogs-glibc-2.27.patch")))) + "1djb9qnid1j0vvna2bhq4jsz2ig1xckbx7h4d86cr0gl61yrz2ax")))) (build-system gnu-build-system) (inputs `(("util-linux" ,util-linux))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/patches/e2fsprogs-glibc-2.27.patch b/gnu/packages/patches/e2fsprogs-glibc-2.27.patch deleted file mode 100644 index f0bc7130c0..0000000000 --- a/gnu/packages/patches/e2fsprogs-glibc-2.27.patch +++ /dev/null @@ -1,56 +0,0 @@ -Copied from: -https://github.com/openwrt/openwrt/blob/58a95f0f8ff768b43d68eed2b6a786e0f40f723b/tools/e2fsprogs/patches/005-misc-rename-copy_file_range-to-copy_file_chunk.patch - -From 01551bdba16ab16512a01affe02ade32c41ede8a Mon Sep 17 00:00:00 2001 -From: Palmer Dabbelt -Date: Fri, 29 Dec 2017 10:19:51 -0800 -Subject: [PATCH] misc: rename copy_file_range to copy_file_chunk - -As of 2.27, glibc will have a copy_file_range library call to wrap the -new copy_file_range system call. This conflicts with the function in -misc/create_inode.c, which this patch renames _copy_file_range. - -Signed-off-by: Palmer Dabbelt -Signed-off-by: Theodore Ts'o ---- - misc/create_inode.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -392,7 +392,7 @@ static ssize_t my_pread(int fd, void *bu - } - #endif /* !defined HAVE_PREAD64 && !defined HAVE_PREAD */ - --static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file, -+static errcode_t copy_file_chunk(ext2_filsys fs, int fd, ext2_file_t e2_file, - off_t start, off_t end, char *buf, - char *zerobuf) - { -@@ -466,7 +466,7 @@ static errcode_t try_lseek_copy(ext2_fil - - data_blk = data & ~(fs->blocksize - 1); - hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1); -- err = copy_file_range(fs, fd, e2_file, data_blk, hole_blk, buf, -+ err = copy_file_chunk(fs, fd, e2_file, data_blk, hole_blk, buf, - zerobuf); - if (err) - return err; -@@ -516,7 +516,7 @@ static errcode_t try_fiemap_copy(ext2_fi - } - for (i = 0, ext = ext_buf; i < fiemap_buf->fm_mapped_extents; - i++, ext++) { -- err = copy_file_range(fs, fd, e2_file, ext->fe_logical, -+ err = copy_file_chunk(fs, fd, e2_file, ext->fe_logical, - ext->fe_logical + ext->fe_length, - buf, zerobuf); - if (err) -@@ -569,7 +569,7 @@ static errcode_t copy_file(ext2_filsys f - goto out; - #endif - -- err = copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf, -+ err = copy_file_chunk(fs, fd, e2_file, 0, statbuf->st_size, buf, - zerobuf); - out: - ext2fs_free_mem(&zerobuf); -- cgit v1.2.3 From 029c2ba0c591d19537ec717f0d96c62459bc543b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 14:19:02 +0200 Subject: gnu: btrfs-progs: Add zlib:static. * gnu/packages/linux.scm (btrfs-progs)[inputs]: Add zlib:static. --- gnu/packages/linux.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3665080218..b25c5854b2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3278,6 +3278,7 @@ and copy/paste text in the console and in xterm.") ("libuuid:static" ,util-linux "static") ("lzo" ,lzo) ("zlib" ,zlib) + ("zlib:static" ,zlib "static") ("zstd" ,zstd))) (native-inputs `(("pkg-config" ,pkg-config) ("asciidoc" ,asciidoc) -- cgit v1.2.3 From d3028f5b273d50a490a790fba94f49494f0c7b4c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 14:55:40 +0200 Subject: gnu: python-libxml2: Do not build static output. This is a follow-up to commit 5f8642ea6ae675d0fb5b06e616064458433087d3. * gnu/packages/xml.scm (python-libxml2)[outputs]: Don't inherit from libxml2. --- gnu/packages/xml.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 644753ff53..26810773ce 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -166,6 +166,7 @@ project (but it is usable outside of the Gnome platform).") (package/inherit libxml2 (name "python-libxml2") (build-system python-build-system) + (outputs '("out")) (arguments `(;; XXX: Tests are specified in 'Makefile.am', but not in 'setup.py'. #:tests? #f -- cgit v1.2.3 From ccdc1690bd871a7a4dfa466087a85b9d180db903 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 12 Jun 2018 16:03:43 -0400 Subject: gnu: Cython: Update to 0.28.4. * gnu/packages/python.scm (python-cython, python2-cython): Update to 0.28.4. [arguments]: Use invoke. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 082b889c2a..668143d999 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2764,14 +2764,14 @@ and is very extensible.") (define-public python-cython (package (name "python-cython") - (version "0.27") + (version "0.28.4") (source (origin (method url-fetch) (uri (pypi-uri "Cython" version)) (sha256 (base32 - "02y0pp1nx77b8s1mpxc6da2dccl6wd31pp4ksi9via479qcvacmr")))) + "0imw9s2rbrh32clbl10csnwmig9p3nzkrd2baxxxfmnrsc42pb3n")))) (build-system python-build-system) ;; we need the full python package and not just the python-wrapper ;; because we need libpython3.3m.so @@ -2784,7 +2784,7 @@ and is very extensible.") ;; some tests require access to "$HOME/.cython" (lambda _ (setenv "HOME" "/tmp") #t)) (replace 'check - (lambda _ (zero? (system* "python" "runtests.py" "-vv"))))))) + (lambda _ (invoke "python" "runtests.py" "-vv")))))) (home-page "http://cython.org/") (synopsis "C extensions for Python") (description "Cython is an optimising static compiler for both the Python -- cgit v1.2.3 From cfe62fb22b96c76efde2872398d2814df3ecf113 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 22:06:07 +0200 Subject: gnu: python-cython: Remove failing test. * gnu/packages/python.scm (python-cython)[arguments]: Remove failing test. --- gnu/packages/python.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 668143d999..84683a9d16 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2784,7 +2784,11 @@ and is very extensible.") ;; some tests require access to "$HOME/.cython" (lambda _ (setenv "HOME" "/tmp") #t)) (replace 'check - (lambda _ (invoke "python" "runtests.py" "-vv")))))) + (lambda _ + ;; The "with_outer_raising" test fails with Python 3.7. See + ;; https://github.com/cython/cython/issues/2454 + (delete-file "tests/run/generators_py.py") + (invoke "python" "runtests.py" "-vv")))))) (home-page "http://cython.org/") (synopsis "C extensions for Python") (description "Cython is an optimising static compiler for both the Python -- cgit v1.2.3 From 2df4ecd61d663211b3ce5a0036e25ff143b3b4b1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 22:06:46 +0200 Subject: gnu: python-dbus: Update to 1.2.8. * gnu/packages/python.scm (python-dbus): Update to 1.2.8. [inputs]: Replace "python" with "python-wrapper". --- gnu/packages/python.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 84683a9d16..65daba4e4b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4873,15 +4873,15 @@ toolkit. Use it to build trees of widgets.") (define-public python-dbus (package (name "python-dbus") - (version "1.2.0") + (version "1.2.8") (source (origin (method url-fetch) - (uri (string-append - "https://dbus.freedesktop.org/releases/dbus-python/dbus-python-" - version ".tar.gz")) + (uri (string-append "https://dbus.freedesktop.org/releases/dbus-python/" + "dbus-python-" version ".tar.gz")) (sha256 - (base32 "1py62qir966lvdkngg0v8k1khsqxwk5m4s8nflpk1agk5f5nqb71")))) + (base32 + "0vvvjmiwnc9cjlks3gcdk43ap7llhlpz7cm1wbw0nc2yfsxjpwdb")))) (build-system gnu-build-system) (arguments '(#:phases @@ -4897,7 +4897,7 @@ toolkit. Use it to build trees of widgets.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("python" ,python) + `(("python" ,python-wrapper) ("dbus-glib" ,dbus-glib))) (synopsis "Python bindings for D-bus") (description "python-dbus provides bindings for libdbus, the reference -- cgit v1.2.3 From 5417c92877c9893e23cb4023e4cebb332c6847f5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 22:24:13 +0200 Subject: gnu: python-flake8: Use INVOKE. * gnu/packages/python.scm (python-flake8)[arguments]: Use INVOKE and always return #T. --- gnu/packages/python.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 65daba4e4b..fc72bb25e1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5660,7 +5660,8 @@ complexity of Python source code.") (add-after 'install 'check (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) - (zero? (system* "pytest" "-v"))))))) + (invoke "pytest" "-v") + #t))))) (propagated-inputs `(("python-pycodestyle" ,python-pycodestyle) ("python-pyflakes" ,python-pyflakes) -- cgit v1.2.3 From bc731eada6b318c46325e614173f16f0501bc1ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 8 Aug 2018 23:08:29 +0200 Subject: gnu: python-flake8: Fix build. * gnu/packages/python.scm (python-flake8)[arguments]: Add build phases "delete-broken-test" and "fix-problem-with-pycodestyle". [propagated-inputs]: Remove python-setuptools. --- gnu/packages/python.scm | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fc72bb25e1..eba1cc9186 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5656,22 +5656,32 @@ complexity of Python source code.") (arguments `(#:phases (modify-phases %standard-phases + ;; Two errors don't seem to have assigned codes. + (add-after 'unpack 'delete-broken-test + (lambda _ (delete-file "tests/unit/test_pyflakes_codes.py") #t)) + (add-after 'unpack 'fix-problem-with-pycodestyle + (lambda _ + ;; See https://gitlab.com/pycqa/flake8/merge_requests/230 + ;; This should no longer be needed with the next release. + (substitute* "setup.py" + (("PEP8_PLUGIN\\('break_around_binary_operator'\\),") + "PEP8_PLUGIN('break_after_binary_operator'),\ +PEP8_PLUGIN('break_before_binary_operator'),")) + #t)) (delete 'check) (add-after 'install 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-v") - #t))))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-v") + #t))))) (propagated-inputs - `(("python-pycodestyle" ,python-pycodestyle) - ("python-pyflakes" ,python-pyflakes) - ;; flake8 depends on a newer setuptools than provided by python. - ("python-setuptools" ,python-setuptools) - ("python-mccabe" ,python-mccabe))) + `(("python-pycodestyle" ,python-pycodestyle) + ("python-pyflakes" ,python-pyflakes) + ("python-mccabe" ,python-mccabe))) (native-inputs - `(("python-mock" ,python-mock) ; TODO: only required for < 3.3 - ("python-pytest" ,python-pytest-bootstrap) - ("python-pytest-runner" ,python-pytest-runner))) + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest-bootstrap) + ("python-pytest-runner" ,python-pytest-runner))) (home-page "https://gitlab.com/pycqa/flake8") (synopsis "The modular source code checker: pep8, pyflakes and co") -- cgit v1.2.3 From a7e231a2a3edbd6a70949432c1ff434d87f625ff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 9 Aug 2018 14:37:36 +0200 Subject: build-system/haskell: Let all phases return #T unconditionally. * guix/build/haskell-build-system.scm (make-ghc-package-database, register, check, haddock): Return #T unconditionally; use INVOKE. --- guix/build/haskell-build-system.scm | 43 +++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index 26519ce5a6..5a72d22842 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Paul van der Walt +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -178,9 +179,10 @@ first match and return the content of the group." (unless (file-exists? dest) (copy-file file dest)))) conf-files) - (zero? (system* "ghc-pkg" - (string-append "--package-db=" %tmp-db-dir) - "recache")))) + (invoke "ghc-pkg" + (string-append "--package-db=" %tmp-db-dir) + "recache") + #t)) (define* (register #:key name system inputs outputs #:allow-other-keys) "Generate the compiler registration and binary package database files for a @@ -238,32 +240,31 @@ given Haskell package." (list (string-append "--gen-pkg-config=" config-file)))) (run-setuphs "register" params) ;; The conf file is created only when there is a library to register. - (or (not (file-exists? config-file)) - (begin - (mkdir-p config-dir) - (let* ((config-file-name+id - (call-with-ascii-input-file config-file (cut grep id-rx <>)))) - (install-transitive-deps config-file %tmp-db-dir config-dir) - (rename-file config-file - (string-append config-dir "/" - config-file-name+id ".conf")) - (zero? (system* "ghc-pkg" - (string-append "--package-db=" config-dir) - "recache"))))))) + (unless (file-exists? config-file) + (mkdir-p config-dir) + (let* ((config-file-name+id + (call-with-ascii-input-file config-file (cut grep id-rx <>)))) + (install-transitive-deps config-file %tmp-db-dir config-dir) + (rename-file config-file + (string-append config-dir "/" + config-file-name+id ".conf")) + (invoke "ghc-pkg" + (string-append "--package-db=" config-dir) + "recache"))) + #t)) (define* (check #:key tests? test-target #:allow-other-keys) "Run the test suite of a given Haskell package." (if tests? (run-setuphs test-target '()) - (begin - (format #t "test suite not run~%") - #t))) + (format #t "test suite not run~%")) + #t) (define* (haddock #:key outputs haddock? haddock-flags #:allow-other-keys) "Run the test suite of a given Haskell package." - (if haddock? - (run-setuphs "haddock" haddock-flags) - #t)) + (when haddock? + (run-setuphs "haddock" haddock-flags)) + #t) (define %standard-phases (modify-phases gnu:%standard-phases -- cgit v1.2.3 From 9611080117cc169ac9c5fba498f504f2431ef4d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Aug 2018 08:43:49 +0200 Subject: gnu: fontforge: Build with Python 2. * gnu/packages/fontutils.scm (fontforge)[inputs]: Replace python-wrapper with python-2. --- gnu/packages/fontutils.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 94cdc520ba..53b6355be6 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -536,7 +536,10 @@ definitions.") ("libxml2" ,libxml2) ("pango" ,pango) ("potrace" ,potrace) - ("python" ,python-wrapper) + ;; FIXME: We use Python 2 here because there is a bug in Python + ;; 3.7 that is triggered when Py_Main is called after Py_Init, as + ;; is done by fontforge. This will be fixed in Python 3.7.1. + ("python" ,python-2) ("zlib" ,zlib))) (arguments '(#:phases -- cgit v1.2.3 From bedf0535ff97f7875c5006ed8af1bbd01897c377 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Aug 2018 08:44:20 +0200 Subject: gnu: inkscape: Add poppler compatibility patch. * gnu/packages/inkscape.scm (inkscape)[source]: Add second poppler compatibility patch. --- gnu/packages/inkscape.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 8471cf2392..1673cc602e 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -63,7 +63,15 @@ (file-name "inkscape-poppler-compat.patch") (sha256 (base32 - "19dam5vsy571xszgjddl5g0958dmcsv0wvgxidp4bhj2lban222i"))))))) + "19dam5vsy571xszgjddl5g0958dmcsv0wvgxidp4bhj2lban222i"))) + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/inkscape/inkscape/commit/" + "fa1c469aa8c005e07bb8676d72af9f7c16fae3e0.diff")) + (file-name "inkscape-poppler-compat2.patch") + (sha256 + (base32 + "14k9yrfjz4nx3bz9dk91q74mc0i7rvl2qzkwhcy1br71yqjvngn5"))))))) (build-system cmake-build-system) (inputs `(("aspell" ,aspell) -- cgit v1.2.3 From a3baaaa07a77ae03e891ed5b462d0836d8a2a66e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 10 Aug 2018 16:00:22 +0200 Subject: gnu: meson: Update to 0.47.1. * gnu/packages/build-tools.scm (meson): Update to 0.47.1. * gnu/packages/patches/meson-for-build-rpath.patch: Adjust. --- gnu/packages/build-tools.scm | 6 ++-- gnu/packages/patches/meson-for-build-rpath.patch | 36 +++++++++++++----------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index e693aec4ac..aaae0a0a6e 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Corentin Bocquillon ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial @@ -100,7 +100,7 @@ generate such a compilation database.") (define-public meson (package (name "meson") - (version "0.46.1") + (version "0.47.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -108,7 +108,7 @@ generate such a compilation database.") version ".tar.gz")) (sha256 (base32 - "0y7f5hhy16q99l7x06x8sid9p9dbg6d7i60zs7c07cz5ww1plj8r")))) + "19mdap2ncvczajx220bd73xmwhd8x906382y18cn9c5syxwxwwyn")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH diff --git a/gnu/packages/patches/meson-for-build-rpath.patch b/gnu/packages/patches/meson-for-build-rpath.patch index 2151d53565..04c07d05bf 100644 --- a/gnu/packages/patches/meson-for-build-rpath.patch +++ b/gnu/packages/patches/meson-for-build-rpath.patch @@ -2,22 +2,24 @@ This patch removes a part of meson that clears the rpath upon installation. This will only be applied to a special version of meson, used for the meson-build-system. -Patch by Peter Mikkelsen - ---- meson-0.42.0/mesonbuild/scripts/meson_install.py.orig 2017-09-09 01:49:39.147374148 +0200 -+++ meson-0.42.0/mesonbuild/scripts/meson_install.py 2017-09-09 01:51:01.209134717 +0200 -@@ -391,14 +391,6 @@ - print("Symlink creation does not work on this platform. " - "Skipping all symlinking.") - printed_symlink_error = True -- if os.path.isfile(outname): -- try: -- depfixer.fix_rpath(outname, install_rpath, False) -- except SystemExit as e: -- if isinstance(e.code, int) and e.code == 0: -- pass -- else: -- raise +Patch for Meson 0.42.0 by Peter Mikkelsen +Adjusted for Meson 0.47.1 by Ricardo Wurmus +--- meson-0.47.1/mesonbuild/minstall.py.old 2018-08-10 11:01:27.812327013 +0200 ++++ meson-0.47.1/mesonbuild/minstall.py 2018-08-10 11:01:51.940368505 +0200 +@@ -436,15 +436,6 @@ + print("Symlink creation does not work on this platform. " + "Skipping all symlinking.") + printed_symlink_error = True +- if os.path.isfile(outname): +- try: +- depfixer.fix_rpath(outname, install_rpath, final_path, +- install_name_mappings, verbose=False) +- except SystemExit as e: +- if isinstance(e.code, int) and e.code == 0: +- pass +- else: +- raise + def run(args): - global install_log_file + parser = buildparser() -- cgit v1.2.3 From 25bd72678ae4048b0b84ee82bc5f2644367e9715 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 10 Aug 2018 17:00:27 +0200 Subject: gnu: gcc@5: Build with isl@0.18. * gnu/packages/gcc.scm (gcc-5)[inputs]: Change ISL to ISL-0.18. (isl-0.18): New public variable. --- gnu/packages/gcc.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 5bdd70b0db..46b70ce497 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -451,7 +451,8 @@ Go. It also includes runtime support libraries for these languages.") "$OBJDUMP_FOR_TARGET -T")) #t)))) (inputs - `(("isl" ,isl) + `(;; GCC5 needs which is removed in later versions. + ("isl" ,isl-0.18) ,@(package-inputs gcc-4.7))))) (define-public gcc-6 @@ -860,6 +861,20 @@ reduction, transitive closures on maps (which may encode infinite graphs), dependence analysis and bounds on piecewise step-polynomials.") (license lgpl2.1+))) +(define-public isl-0.18 + (package + (inherit isl) + (version "0.18") + (source (origin + (method url-fetch) + (uri (list (string-append "http://isl.gforge.inria.fr/isl-" + version ".tar.bz2") + (string-append %gcc-infrastructure + "isl-" version ".tar.gz"))) + (sha256 + (base32 + "06ybml6llhi4i56q90jnimbcgk1lpcdwhy9nxdxra2hxz3bhz2vb")))))) + (define-public isl-0.11 (package (inherit isl) -- cgit v1.2.3 From 4866cba66ae40d722bb6c50b7dca27725ffa4532 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Thu, 9 Aug 2018 16:45:45 +0200 Subject: gnu: libgcrypt: Make build reproducible. * gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnupg.scm (libgcrypt)[source]: Use it. Signed-off-by: Leo Famulari --- gnu/local.mk | 1 + gnu/packages/gnupg.scm | 4 ++- .../libgcrypt-make-yat2m-reproducible.patch | 32 ++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1e2ce8f49e..341e1c4fdf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -860,6 +860,7 @@ dist_patch_DATA = \ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libexif-CVE-2016-6328.patch \ %D%/packages/patches/libexif-CVE-2017-7544.patch \ + %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgdata-fix-tests.patch \ %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 54b44996ef..942f975e56 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -101,7 +101,9 @@ Daemon and possibly more in the future.") version ".tar.bz2")) (sha256 (base32 - "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36")))) + "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36")) + (patches + (search-patches "libgcrypt-make-yat2m-reproducible.patch")))) (build-system gnu-build-system) (propagated-inputs `(("libgpg-error-host" ,libgpg-error))) diff --git a/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch b/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch new file mode 100644 index 0000000000..3056f0baad --- /dev/null +++ b/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch @@ -0,0 +1,32 @@ +Make yat2m in libgcrypt respect SOURCE_DATE_EPOCH, making +the build reproducible. + +This was already fixed upstream in GnuPG: +https://dev.gnupg.org/rG139de02b93773615bdd95e04a7f0c1ad73b4f6fb + +and in libgpg-error: +https://dev.gnupg.org/rE5494a5728418938d2e42158bb646b07124184e64 + + +--- a/doc/yat2m.c 2017-11-23 19:16:58.000000000 +0100 ++++ b/doc/yat2m.c 2017-08-28 12:22:54.000000000 +0200 +@@ -1475,6 +1484,7 @@ + main (int argc, char **argv) + { + int last_argc = -1; ++ const char *s; + + opt_source = "GNU"; + opt_release = ""; +@@ -1608,6 +1618,11 @@ + if (argc > 1) + die ("usage: " PGM " [OPTION] [FILE] (try --help for more information)\n"); + ++ /* Take care of supplied timestamp for reproducible builds. See ++ * https://reproducible-builds.org/specs/source-date-epoch/ */ ++ if (!opt_date && (s = getenv ("SOURCE_DATE_EPOCH")) && *s) ++ opt_date = s; ++ + /* Start processing. */ + if (argc && strcmp (*argv, "-")) + { -- cgit v1.2.3 From e6c4e41102f420cb05b32636909ecc9d45a624b7 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Mon, 20 Aug 2018 16:51:04 +0200 Subject: utils: Generate valid substitutions in 'wrap-program'. * guix/build/utils.scm (wrap-program)[export-variable]: Generate valid bash substitutions when using custom separators. --- guix/build/utils.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index c58a1afd1c..5fe3286843 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -1057,11 +1057,11 @@ with definitions for VARS." (format #f "export ~a=\"~a\"" var (string-join rest sep))) ((var sep 'prefix rest) - (format #f "export ~a=\"~a${~a~a+~a}$~a\"" - var (string-join rest sep) var sep sep var)) + (format #f "export ~a=\"~a${~a:+~a}$~a\"" + var (string-join rest sep) var sep var)) ((var sep 'suffix rest) - (format #f "export ~a=\"$~a${~a~a+~a}~a\"" - var var var sep sep (string-join rest sep))) + (format #f "export ~a=\"$~a${~a+~a}~a\"" + var var var sep (string-join rest sep))) ((var '= rest) (format #f "export ~a=\"~a\"" var (string-join rest ":"))) -- cgit v1.2.3 From c0b3867c21d60c35dca6ecd44f00dc81afa87476 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 15:07:34 +0200 Subject: gnu: libunistring: Do install static library. ...but do so to a separate output. This reverts commit 1f2d64e4a86fbd77cfd7c773a9621a001516e1ce. * gnu/packages/libunistring.scm (libunistring)[outputs]: New field. [arguments]: Add phase for moving libunistring.a. Remove #:configure-flags. --- gnu/packages/libunistring.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm index debf3cc7dd..fda839be54 100644 --- a/gnu/packages/libunistring.scm +++ b/gnu/packages/libunistring.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,13 +44,23 @@ (base32 "1mq57h06622m6qc5cv347fc3qk5mj840axw3c0vd7qmnwk1v53zb")))) (propagated-inputs (libiconv-if-needed)) + (outputs '("out" "static")) (build-system gnu-build-system) (arguments ;; Work around parallel build issue whereby C files may be compiled before ;; config.h is built: see and ;; . '(#:parallel-build? #f - #:configure-flags '("--disable-static"))) + #: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"))) + (with-directory-excursion (string-append out "/lib") + (install-file "libunistring.a" + (string-append static "/lib")) + (delete-file "libunistring.a") + #t))))))) (synopsis "C library for manipulating Unicode strings") (description "GNU libunistring is a library providing functions to manipulate -- cgit v1.2.3 From 3f35e0da86ea8524859905fe81eeffb712b2601e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 03:20:19 +0200 Subject: gnu: bootstrap-tarballs: Adjust to static outputs of zlib and libunistring. * gnu/packages/make-bootstrap.scm (%gcc-static)[inputs]: Add ZLIB:STATIC. (%guile-static)[inputs]: Add LIBUNISTRING:STATIC. --- gnu/packages/make-bootstrap.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 475749bbf6..65d632f64e 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -22,7 +22,7 @@ (define-module (gnu packages make-bootstrap) #:use-module (guix utils) #:use-module (guix packages) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:select (gpl3+)) #:use-module (guix build-system trivial) #:use-module (guix build-system gnu) #:use-module ((gnu packages) #:select (search-patch)) @@ -34,6 +34,7 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages guile) #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages libunistring) #:use-module (gnu packages linux) #:use-module (gnu packages hurd) #:use-module (gnu packages multiprecision) @@ -440,6 +441,9 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." "^gnu-user.*\\.h$")) ((" -lgcc_s}}") "}}")) #t))))))) + (inputs + `(("zlib:static" ,zlib "static") + ,@(package-inputs gcc))) (native-inputs (if (%current-target-system) `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both @@ -525,6 +529,10 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ;; Remove the 'debug' output (see above for the reason.) (outputs (delete "debug" (package-outputs guile-2.2))) + (inputs + `(("libunistring:static" ,libunistring "static") + ,@(package-inputs guile-2.2))) + (propagated-inputs `(("bdw-gc" ,libgc) ,@(alist-delete "bdw-gc" -- cgit v1.2.3 From 11e5bf70d5108db9f792113fd423f0b20805ac47 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:46:42 +0200 Subject: gnu: harfbuzz: Update to 1.8.8. * gnu/packages/gtk.scm (harfbuzz): Update to 1.8.8. --- 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 c4e00bc62a..57f05eb49d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -178,7 +178,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public harfbuzz (package (name "harfbuzz") - (version "1.8.4") + (version "1.8.8") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" @@ -186,7 +186,7 @@ affine transformation (scale, rotation, shear, etc.).") version ".tar.bz2")) (sha256 (base32 - "1za5lmzz4j2plh6a12llnwxyy7dnspsykjlq1qp9x9hdza32yn9w")))) + "1ag3scnm1fcviqgx2p4858y433mr0ndqw6zccnccrqcr9mpcird8")))) (build-system gnu-build-system) (outputs '("out" "bin")) ; 160K, only hb-view depend on cairo -- cgit v1.2.3 From a5dae0c03c4a12f6b92c89c01f1d41b2aec398df Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:48:53 +0200 Subject: gnu: dbus: Update to 1.12.10. * gnu/packages/glib.scm (dbus): Update to 1.12.10. --- 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 dbd9c8ff88..a4030a58aa 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -80,7 +80,7 @@ (define dbus (package (name "dbus") - (version "1.12.8") + (version "1.12.10") (source (origin (method url-fetch) (uri (string-append @@ -88,7 +88,7 @@ version ".tar.gz")) (sha256 (base32 - "1cvfi7jiby12h0f5gbysphhk99m6mch87ab3cqxkj0w36gkrkp72")) + "1xywijmgfad4m3cxp0b4l6kvypwc53ckmhwwzbrc6n32jwj3ssab")) (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 09118c58dacfd8cd7ceff0cc3fea9c3e54ed9ef4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:51:06 +0200 Subject: gnu: glib: Update to 2.56.2. * gnu/packages/glib.scm (glib): Update to 2.56.2. --- 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 a4030a58aa..49a15b4d52 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -150,7 +150,7 @@ shared NFS home directories.") (define glib (package (name "glib") - (version "2.56.1") + (version "2.56.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -158,7 +158,7 @@ shared NFS home directories.") name "-" version ".tar.xz")) (sha256 (base32 - "138b3hi7glfpbia49gi07lyz1dh9k0jl9vpd3aiwflf6y923zvs0")) + "12d738n1wpvrn39zvy9xazg5h6vzyiwsw8z1qibcj09mh4bbsjnn")) (patches (search-patches "glib-tests-timer.patch")))) (build-system gnu-build-system) (outputs '("out" ; everything -- cgit v1.2.3 From f203e533861005431e26adbbd1bb053c22dbf0de Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:53:38 +0200 Subject: gnu: cmake: Update to 3.12.1. * gnu/packages/cmake.scm (cmake): Update to 3.12.1. --- 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 e113048690..03bce8b68d 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -44,7 +44,7 @@ (define-public cmake (package (name "cmake") - (version "3.12.0") + (version "3.12.1") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -52,7 +52,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "0scxdgdrkrri0f5fm7cb969vcl4k1wanmhaa22fh9ffdys81ly6h")) + "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 1c61a086bcb2644e6d6c6fc714dde498402cc561 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 19:55:14 +0200 Subject: gnu: expat: Update to 2.2.6. * gnu/packages/xml.scm (expat): Update to 2.2.6. --- 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 26810773ce..e4284333bc 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -64,14 +64,14 @@ (define-public expat (package (name "expat") - (version "2.2.5") + (version "2.2.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/expat/expat/" version "/expat-" version ".tar.bz2")) (sha256 (base32 - "1xpd78sp7m34jqrw5x13bz7kgz0n6aj15wn4zj4gfx3ypbpk5p6r")))) + "1wl1x93b5w457ddsdgj0lh7yjq4q6l7wfbgwhagkc8fm2qkkrd0p")))) (build-system gnu-build-system) (home-page "https://libexpat.github.io/") (synopsis "Stream-oriented XML parser library written in C") -- cgit v1.2.3 From 85932a7b8ee2b4e0834da26465b5c5c77cddb025 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 20:03:44 +0200 Subject: gnu: libuv: Update to 1.23.0. * gnu/packages/libevent.scm (libuv): Update to 1.23.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 18e443be80..21c8d2a079 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -121,14 +121,14 @@ limited support for fork events.") (define-public libuv (package (name "libuv") - (version "1.22.0") + (version "1.23.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1009m5paidnl4y8x0fzmsfcq7i5234jy50hsfqhspkqg59zs6zpb")))) + "09yf7c71n8b80nbsv4lsmq5nqmb0rylhpx3z9jgkv5za9lr6sx6i")))) (build-system gnu-build-system) (arguments '(;; XXX: Some tests want /dev/tty, attempt to make connections, etc. -- cgit v1.2.3 From fdf16a81b2440964a8fc5f5e40cad84c70d165e1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 20:06:26 +0200 Subject: gnu: graphite2: Update to 1.3.12. * gnu/packages/fontutils.scm (graphite2): Update to 1.3.12. --- 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 53b6355be6..f9e117b2f4 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -378,7 +378,7 @@ applications should be.") (define-public graphite2 (package (name "graphite2") - (version "1.3.11") + (version "1.3.12") (source (origin (method url-fetch) @@ -386,7 +386,7 @@ applications should be.") "download/" version "/" name "-" version ".tgz")) (sha256 (base32 - "0z5dcgh8r3678awq6fb8igik7xmar5m6z9xxwpkkhradhk8jxfds")))) + "1l1940d8fz67jm6a0x8cjb5p2dv48cvz3wcskwa83hamd70k15fd")))) (build-system cmake-build-system) (native-inputs `(("python" ,python-2) ; because of "import imap" in tests -- cgit v1.2.3 From 27885fcc26b7f9eed37c0e587d6be00ee8bb9cb3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 00:12:45 +0200 Subject: gnu: python-pluggy: Update to 0.7.1. * gnu/packages/python.scm (python-pluggy): Update to 0.7.1. [native-inputs]: Add PYTHON-SETUPTOOLS-SCM. --- gnu/packages/python.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fde21d35f8..8f8aba947e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7671,15 +7671,17 @@ library as well as on the command line.") (define-public python-pluggy (package (name "python-pluggy") - (version "0.6.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (pypi-uri "pluggy" version)) (sha256 (base32 - "1zqckndfn85l1cd8pndw212zg1bq9fkg1nnj32kp2mppppsyg2kz")))) + "1qbn70mksmr03hac6jgp6fiqc4l7859z8dchx2x950vhlij87swm")))) (build-system python-build-system) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) (synopsis "Plugin and hook calling mechanism for Python") (description "Pluggy is an extraction of the plugin manager as used by Pytest but stripped of Pytest specific details.") -- cgit v1.2.3 From e2da8bcd9ed9042db46ae37a32be5374acab4f45 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Aug 2018 21:43:45 +0200 Subject: gnu: python-pytest: Update to 3.7.2. * gnu/packages/check.scm (python-pytest): Update to 3.7.2. (python2-pytest)[propagated-inputs]: Add PYTHON2-PATHLIB. (python2-pytest-bootstrap)[propagated-inputs]: Add PYTHON-PATHLIB2-BOOTSTRAP. * gnu/packages/python.scm (python2-pathlib2-bootstrap): New public variable. --- gnu/packages/check.scm | 6 ++++-- gnu/packages/python.scm | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 242c531652..7abe821209 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -619,14 +619,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "3.6.4") + (version "3.7.2") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "0h85kzdi5pfkz9v0z8xyrsj1rvnmyyjpng7cran28jmnc41w27il")))) + "00jv750alrj62r586hcmvpqlmkqszqfm1x7n6qnqacjmmlis2n9l")))) (build-system python-build-system) (arguments `(#:phases @@ -673,6 +673,7 @@ and many external plugins.") (inherit pytest) (propagated-inputs `(("python2-funcsigs" ,python2-funcsigs) + ("python2-pathlib2" ,python2-pathlib2) ,@(package-propagated-inputs pytest)))))) (define-public python-pytest-bootstrap @@ -689,6 +690,7 @@ and many external plugins.") (package (inherit pytest) (propagated-inputs `(("python2-funcsigs" ,python2-funcsigs-bootstrap) + ("python2-pathlib2" ,python2-pathlib2-bootstrap) ,@(package-propagated-inputs pytest)))))) (define-public python-pytest-cov diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8f8aba947e..9e269b4820 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8389,6 +8389,15 @@ ambiguities (forward vs. backward slashes, etc.). @end enumerate") (license license:expat))) +(define-public python2-pathlib2-bootstrap + (hidden-package + (package + (inherit python2-pathlib2) + (name "python2-pathlib2-bootstrap") + (propagated-inputs + `(("python2-scandir" ,python2-scandir) + ("python2-six" ,python2-six-bootstrap)))))) + (define-public python-jellyfish (package (name "python-jellyfish") -- cgit v1.2.3 From 7f5d3445af3316ab67b5db4eb3def5c0265205ac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 00:20:25 +0200 Subject: gnu: python-scandir: Update to 1.9.0. * gnu/packages/python.scm (python-scandir): Update to 1.9.0. --- 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 9e269b4820..c8a22a2f4b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11446,13 +11446,13 @@ It supports both normal and Unicode strings.") (define-public python-scandir (package (name "python-scandir") - (version "1.7") + (version "1.9.0") (source (origin (method url-fetch) (uri (pypi-uri "scandir" version)) (sha256 - (base32 "0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj")))) + (base32 "0r3hvf1a9jm1rkqgx40gxkmccknkaiqjavs8lccgq9s8khh5x5s4")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From e241f9a0207776a8fb11dc20ea705d3133bf9610 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 01:05:58 +0200 Subject: gnu: python-more-itertools: Update to 4.3.0. * gnu/packages/python.scm (python-more-itertools): Update to 4.3.0. --- 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 c8a22a2f4b..1c74f4e0a7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13362,14 +13362,14 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "4.2.0") + (version "4.3.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "1s6qhl7a7jy8gqw8p545rxfp7rwz1hmjr9p6prk93zbv6f9rhsrb")))) + "17h3na0rdh8xq30w4b9pizgkdxmm51896bxw600x84jflg9vaxn4")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six-bootstrap))) -- cgit v1.2.3 From 67a7da1f31d5a900802e11537876f2d75a2d3f87 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 01:13:00 +0200 Subject: gnu: python-hypothesis: Update to 3.68.2. * gnu/packages/check.scm (python-hypothesis): Update to 3.68.2. --- 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 7abe821209..572761f661 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1413,13 +1413,13 @@ normally the case.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "3.66.6") + (version "3.68.2") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "0jlcbnirj5ndv4gvb3rmydligljn1alim9d4dk377188y09iwl5k")))) + "15wlbdy148h3z0ckylf7zkszrfnnk254a6ld3qaf37lkf7hyp4r0")))) (build-system python-build-system) (native-inputs `(("python-flake8" ,python-flake8) -- cgit v1.2.3 From b3751f9cea64ddb52d3d1c97ea62369967497469 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 03:31:23 +0200 Subject: gnu: python-setuptools-scm: Update to 3.1.0. * gnu/packages/python.scm (python-setuptools-scm): Update to 3.1.0. --- 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 1c74f4e0a7..e2406dfc3f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4414,13 +4414,13 @@ child application and control it as if a human were typing commands.") (define-public python-setuptools-scm (package (name "python-setuptools-scm") - (version "1.15.6") + (version "3.1.0") (source (origin (method url-fetch) (uri (pypi-uri "setuptools_scm" version)) (sha256 (base32 - "0pzvfmx8s20yrgkgwfbxaspz2x1g38qv61jpm0ns91lrb22ldas9")))) + "0h4bglwfz8b9prqljv8z3w9rgydfyxzaj05bm1y6zs5m6shz548i")))) (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 c69d231c2a5656fe064a4fc2b6906fe3e194c7cf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 04:24:44 +0200 Subject: gnu: python-pycparser: Update to 2.18. * gnu/packages/python.scm (python-pycparser): Update to 2.18. --- 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 e2406dfc3f..c3f34fc23d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4028,14 +4028,14 @@ a general image processing tool.") (define-public python-pycparser (package (name "python-pycparser") - (version "2.17") + (version "2.18") (source (origin (method url-fetch) (uri (pypi-uri "pycparser" version)) (sha256 (base32 - "1dkkjri0miidqb1zcqhqljfa34fcy9k5akasgwsv6k622zlk3b0a")))) + "09mjyw82ibqzl449g7swy8bfxnfpmas0815d2rkdjlcqw81wma4r")))) (outputs '("out" "doc")) (build-system python-build-system) (native-inputs -- cgit v1.2.3 From f6cd3f7970c5b5a1ca008a1a51db4bddb8ce8ae2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 04:31:51 +0200 Subject: gnu: python-ipaddress: Update to 1.0.22. * gnu/packages/python.scm (python-ipaddress): Update to 1.0.22. --- 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 c3f34fc23d..0ad0626cba 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6324,13 +6324,13 @@ implementations of ASN.1-based codecs and protocols.") (define-public python-ipaddress (package (name "python-ipaddress") - (version "1.0.19") + (version "1.0.22") (source (origin (method url-fetch) (uri (pypi-uri "ipaddress" version)) (sha256 (base32 - "10agaa1cys1bk1ycpl2w8lky9vjx8h1xh1z29mg0niqx0638c390")))) + "0b570bm6xqpjwqis15pvdy6lyvvzfndjvkynilcddjj5x98wfimi")))) (build-system python-build-system) (home-page "https://github.com/phihag/ipaddress") (synopsis "IP address manipulation library") -- cgit v1.2.3 From d76cd3defd96b656a504322103921d167eb6e3d8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 04:50:12 +0200 Subject: gnu: python-lxml: Update to 4.2.4. * gnu/packages/python.scm (python-lxml): Update to 4.2.4. --- 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 0ad0626cba..fb465fac6a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4919,14 +4919,14 @@ implementation of D-Bus.") (define-public python-lxml (package (name "python-lxml") - (version "3.8.0") + (version "4.2.4") (source (origin (method url-fetch) (uri (pypi-uri "lxml" version)) (sha256 (base32 - "15nvf6n285n282682qyw3wihsncb0x5amdhyi4b83bfa2nz74vvk")))) + "1jk336k0kw616gfhqk1wwxsjjwz0flld0n294lz8kxch610bxbz2")))) (build-system python-build-system) (inputs `(("libxml2" ,libxml2) -- cgit v1.2.3 From 827509a30caa7233877e5e22f7a188ce16f3747a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 05:02:45 +0200 Subject: gnu: python-olefile: Update to 0.45.1. * gnu/packages/python.scm (python-olefile): Update to 0.45.1. --- 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 fb465fac6a..a23d85ba21 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3946,7 +3946,7 @@ services for your Python modules and applications.") (define-public python-olefile (package (name "python-olefile") - (version "0.44") + (version "0.45.1") (source (origin (method url-fetch) @@ -3955,7 +3955,7 @@ services for your Python modules and applications.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1wmxbrhyqjry2000zx0zdhqdqxhgi06nz7sbzjlh222q2zjv1gpj")))) + "18ai19zwagm6nli14k8bii31ipbab2rp7plrvsm6gmfql551a8ai")))) (build-system python-build-system) (home-page "https://www.decalage.info/python/olefileio") -- cgit v1.2.3 From e63199ec68747a590f7429a575302917857c37dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 14:59:43 +0200 Subject: gnu: libatomic-ops: Update to 7.6.6. * gnu/packages/bdw-gc.scm (libatomic-ops): Update to 7.6.6. --- gnu/packages/bdw-gc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 42ec61e324..c7491f845f 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -91,7 +91,7 @@ C or C++ programs, though that is not its primary goal.") (define-public libatomic-ops (package (name "libatomic-ops") - (version "7.6.4") + (version "7.6.6") (source (origin (method url-fetch) (uri (string-append @@ -99,7 +99,7 @@ C or C++ programs, though that is not its primary goal.") version "/libatomic_ops-" version ".tar.gz")) (sha256 (base32 - "0knxncsjhbknlyy6lx7ycxhpzfk3sykhvicgxyp0rmsxd1d3v0jv")))) + "0x7071z707msvyrv9dmgahd1sghbkw8fpbagvcag6xs8yp2spzlr")))) (build-system gnu-build-system) (outputs '("out" "debug")) (synopsis "Accessing hardware atomic memory update operations") -- cgit v1.2.3 From 1935b8d56a4c739f468af973ac9057463c18d1bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 16:36:19 +0200 Subject: gnu: libffi: Don't optimize for the build machine CPU. * gnu/packages/libffi.scm (libffi)[arguments]: Add #:configure-flags. --- gnu/packages/libffi.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 0d54c305b2..7d3abaff18 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -50,7 +50,10 @@ (patches (search-patches "libffi-3.2.1-complex-alpha.patch")))) (build-system gnu-build-system) (arguments - `(#:phases + `(;; 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) -- cgit v1.2.3 From 7b0faf32e955ce3af6defae696e0406624a40bdc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 17:25:16 +0200 Subject: gnu: pango: Update to 1.42.4. * gnu/packages/gtk.scm (pango): Update to 1.42.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 57f05eb49d..c5c34d0acc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -217,7 +217,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public pango (package (name "pango") - (version "1.42.3") + (version "1.42.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -225,7 +225,7 @@ affine transformation (scale, rotation, shear, etc.).") name "-" version ".tar.xz")) (sha256 (base32 - "0fnybmdrbx1d9g0rsxa4b31hvrh377n2ziz5rl13y56m0m9qfggv")))) + "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx")))) (build-system gnu-build-system) (propagated-inputs ;; These are all in Requires or Requires.private of the '.pc' files. -- cgit v1.2.3 From e2c7b7bb68594c2f4f3a13e98da1e32509a080a5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 20 Aug 2018 23:13:00 +0200 Subject: gnu: libssh2: MIPS workaround no longer is. * gnu/packages/ssh.scm (libssh2)[arguments]: Override the 'bootstrap' phase regardless of target system. Remove 'autoreconf' phase. --- gnu/packages/ssh.scm | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index faa09e94c3..e09bfbde6f 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -117,23 +117,10 @@ remote applications.") (propagated-inputs `(("libgcrypt" ,libgcrypt) ("zlib" ,zlib))) (arguments `(#:configure-flags `("--with-libgcrypt") - #:phases - ;; FIXME: In the next core-updates cycle, replace the entire - ;; following ,(...) form with its first 'modify-phases' - ;; subform. The change made here is only strictly needed on - ;; MIPS, but should work on any system. For now, we apply it - ;; only to MIPS to avoid forcing thousands of rebuilds on - ;; other systems. - ,(if (string-prefix? "mips" (or (%current-target-system) - (%current-system))) - '(modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (invoke "autoreconf" "-v")))) - '(modify-phases %standard-phases - (add-before 'configure 'autoreconf - (lambda _ - (invoke "autoreconf" "-v"))))))) + #:phases (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + (invoke "autoreconf" "-v")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake))) (synopsis "Client-side C library implementing the SSH2 protocol") -- cgit v1.2.3 From 4750b3a268ed511fd50e6b348a1a81b5f76b5a40 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 05:46:47 +0200 Subject: gnu: python-pytest: Run the tests again. "python setup.py test" is ineffective since 3.6.x. The circle is complete. * gnu/packages/check.scm (python-pytest)[arguments]: Override 'check' phase. [native-inputs]: Add PYTHON-PYTEST-BOOTSTRAP. --- gnu/packages/check.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 572761f661..ddd532528f 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -642,7 +642,8 @@ standard library.") (string-append "@pytest.mark.skip" "(reason=\"Assumes that /usr exists.\")\n " line))) - #t))))) + #t)) + (replace 'check (lambda _ (invoke "pytest" "-vv")))))) (propagated-inputs `(("python-atomicwrites" ,python-atomicwrites) ("python-attrs" ,python-attrs-bootstrap) @@ -656,6 +657,7 @@ standard library.") ("python-hypothesis" ,python-hypothesis) ("python-nose" ,python-nose) ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest-bootstrap) ("python-setuptools-scm" ,python-setuptools-scm))) (home-page "http://pytest.org") (synopsis "Python testing library") -- cgit v1.2.3 From 9764dac51146dab653c2abf2c7c94832504d2517 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 06:08:39 +0200 Subject: gnu: python-markupsafe: Update to 1.0. * gnu/packages/python.scm (python-markupsafe): Update to 1.0. --- 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 a23d85ba21..1bfcebe914 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2193,7 +2193,7 @@ object.") (define-public python-markupsafe (package (name "python-markupsafe") - (version "0.23") + (version "1.0") (source (origin (method url-fetch) @@ -2202,7 +2202,7 @@ object.") version ".tar.gz")) (sha256 (base32 - "1hvip33wva3fnmvfp9x5klqri7hpl1hkgqmjbss18nmrb7zimv54")))) + "0rdn1s8x9ni7ss8rfiacj7x1085lx8mh2zdwqslnw8xc3l4nkgm6")))) (build-system python-build-system) (home-page "https://github.com/mitsuhiko/markupsafe") (synopsis "XML/HTML/XHTML markup safe string implementation for Python") -- cgit v1.2.3 From 4c36fc705199d60dc441328d4d1d0c90b792575a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 06:13:31 +0200 Subject: gnu: python-imagesize: Update to 1.0.0. * gnu/packages/python.scm (python-imagesize): Update to 1.0.0. [arguments]: Remove. --- gnu/packages/python.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1bfcebe914..2813b93e67 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10354,19 +10354,15 @@ useful as a validator for JSON data.") (define-public python-imagesize (package (name "python-imagesize") - (version "0.7.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "imagesize" version)) (sha256 (base32 - "0qk07k0z4241lkzzjji7z4da04pcvg7bfc4xz1934zlqhwmwdcha")))) + "05b3p62r7rbcvvbk5vknr3bhcq9b2airysn6ric534mng136wcjv")))) (build-system python-build-system) - (arguments - '(;; Test files are not distributed on PyPi: - ;; https://github.com/shibukawa/imagesize_py/issues/7 - #:tests? #f)) (home-page "https://github.com/shibukawa/imagesize_py") (synopsis "Gets image size of files in variaous formats in Python") (description -- cgit v1.2.3 From 26aef5e9560e177d80ff34036c021ce4e537d241 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 06:18:29 +0200 Subject: gnu: python-imagesize: Fix typo. * gnu/packages/python.scm (python-imagesize)[synopsis]: Remove stray character. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2813b93e67..c3da0e89f1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10364,7 +10364,7 @@ useful as a validator for JSON data.") "05b3p62r7rbcvvbk5vknr3bhcq9b2airysn6ric534mng136wcjv")))) (build-system python-build-system) (home-page "https://github.com/shibukawa/imagesize_py") - (synopsis "Gets image size of files in variaous formats in Python") + (synopsis "Gets image size of files in various formats in Python") (description "This package allows determination of image size from PNG, JPEG, JPEG2000 and GIF files in pure Python.") -- cgit v1.2.3 From c52ff2ed7670b67b3b523c8d7c8f4fcf030c068a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 06:59:53 +0200 Subject: gnu: python-packaging: Update to 17.1. * gnu/packages/python.scm (python-packaging): Update to 17.1. --- 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 c3da0e89f1..f4236391d3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11568,14 +11568,14 @@ several utilities, as well as an API for building localization tools.") (define-public python-packaging (package (name "python-packaging") - (version "16.8") + (version "17.1") (source (origin (method url-fetch) (uri (pypi-uri "packaging" version)) (sha256 (base32 - "17k1xbjshackwvbsnxqixbph8rbqhz4bf4g3al5xyzhavxgq6l2x")))) + "0nrpayk8kij1zm9sjnk38ldz3a6705ggvw8ljylqbrb4vmqbf6gh")))) (build-system python-build-system) (native-inputs `(("python-pretend" ,python-pretend) -- cgit v1.2.3 From 632900f58650f104ba9ae7125282ca13b38f010e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:00:17 +0200 Subject: gnu: python-packaging: Run the tests. * gnu/packages/python.scm (python-packaging)[arguments]: Override 'check' phase. --- gnu/packages/python.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f4236391d3..6284d0aca1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11577,6 +11577,10 @@ several utilities, as well as an API for building localization tools.") (base32 "0nrpayk8kij1zm9sjnk38ldz3a6705ggvw8ljylqbrb4vmqbf6gh")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ (invoke "py.test" "-vv")))))) (native-inputs `(("python-pretend" ,python-pretend) ("python-pytest" ,python-pytest))) -- cgit v1.2.3 From 9871a896aacd4daa0d57fb83aa18eaf5f85c74f5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:11:00 +0200 Subject: gnu: python-sqlalchemy: Use 'invoke'. * gnu/packages/databases.scm (python-sqlalchemy)[arguments]: Use INVOKE instead of SYSTEM*. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5820314289..0ac2905f55 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2267,7 +2267,7 @@ Database API 2.0T.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? (system* "py.test"))))))) + (lambda _ (invoke "py.test")))))) (home-page "http://www.sqlalchemy.org") (synopsis "Database abstraction library") (description -- cgit v1.2.3 From 2be1b754ba9d460b7fd16f790922aed4b3d45037 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:19:33 +0200 Subject: gnu: python-sqlalchemy: Update to 1.2.11. * gnu/packages/databases.scm (python-sqlalchemy): Update to 1.2.11. --- 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 0ac2905f55..2989881028 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2249,7 +2249,7 @@ Database API 2.0T.") (define-public python-sqlalchemy (package (name "python-sqlalchemy") - (version "1.0.12") + (version "1.2.11") (source (origin (method url-fetch) @@ -2257,7 +2257,7 @@ Database API 2.0T.") "SQLAlchemy/SQLAlchemy-" version ".tar.gz")) (sha256 (base32 - "1l8qclhd0s90w3pvwhi5mjxdwr5j7gw7cjka2fx6f2vqmq7f4yb6")))) + "094mmbs4igrxplfyqd59j90jb83ixpbbzqc0w49yw81m82nnjrgg")))) (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) ;for c extensions -- cgit v1.2.3 From cb5ba282ccbf75ec092030daab41dfb6ae19b7c8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:26:24 +0200 Subject: gnu: python-pytz: Update to 2018.5. * gnu/packages/time.scm (python-pytz): Update to 2018.5. [source](uri): Update file extension. [native-inputs]: Remove. --- gnu/packages/time.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index fc831ab6cc..13eded4179 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -88,17 +88,15 @@ to a file.") (define-public python-pytz (package (name "python-pytz") - (version "2017.3") + (version "2018.5") (source (origin (method url-fetch) - (uri (pypi-uri "pytz" version ".zip")) + (uri (pypi-uri "pytz" version ".tar.gz")) (sha256 (base32 - "1dw5l527vcafvdqq4wadwl7ikhb2sssz0v0cssibh8890kyczr7s")))) + "0xzj5gkpdn2da8m6j47chlp6zrzcypv9m0fjv4236q3jw4fyzfgz")))) (build-system python-build-system) - (native-inputs - `(("unzip" ,unzip))) (home-page "http://pythonhosted.org/pytz") (synopsis "Python timezone library") (description "This library brings the Olson tz database into Python. It -- cgit v1.2.3 From b3a21b2cf92bfaa95e27072fb4bae57c39ff12eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:33:01 +0200 Subject: gnu: python-babel: Update to 2.6.0. * gnu/packages/python.scm (python-babel): Update to 2.6.0. --- 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 6284d0aca1..44488e700a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -617,14 +617,14 @@ by @code{binstar}, @code{binstar-build} and @code{chalmers}.") (define-public python-babel (package (name "python-babel") - (version "2.3.4") + (version "2.6.0") (source (origin (method url-fetch) (uri (pypi-uri "Babel" version)) (sha256 (base32 - "0x98qqqw35xllpcama013a9788ly84z8dm1w2wwfpxh2710c8df5")))) + "08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc")))) (build-system python-build-system) (propagated-inputs `(("python-pytz" ,python-pytz))) -- cgit v1.2.3 From 88166588a0a4bea41e505ba908af391b855de5c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:33:30 +0200 Subject: gnu: python-babel: Run the tests. * gnu/packages/python.scm (python-babel)[native-inputs]: Add PYTHON-FREEZEGUN and PYTHON-PYTEST. [arguments]: Replace 'check' phase. Remove #:tests?. --- gnu/packages/python.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 44488e700a..14bbe4a3c7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -626,9 +626,15 @@ by @code{binstar}, @code{binstar-build} and @code{chalmers}.") (base32 "08rxmbx2s4irp0w0gmn498vns5xy0fagm0fg33xa772jiks51flc")))) (build-system python-build-system) + (native-inputs + `(("python-freezegun" ,python-freezegun) + ("python-pytest" ,python-pytest))) (propagated-inputs `(("python-pytz" ,python-pytz))) - (arguments `(#:tests? #f)) ; no test target + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ (invoke "pytest" "-vv")))))) (home-page "http://babel.pocoo.org/") (synopsis "Tools for internationalizing Python applications") -- cgit v1.2.3 From efada0946dd1a3241af58d9988566523debb06e2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:44:39 +0200 Subject: gnu: python-jinja2: Update to 2.10. * gnu/packages/python.scm (python-jinja2): Update to 2.10. --- 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 14bbe4a3c7..56a5131b62 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2223,14 +2223,14 @@ for Python.") (define-public python-jinja2 (package (name "python-jinja2") - (version "2.9.6") + (version "2.10") (source (origin (method url-fetch) (uri (pypi-uri "Jinja2" version)) (sha256 (base32 - "1zzrkywhziqffrzks14kzixz7nd4yh2vc0fb04a68vfd2ai03anx")))) + "190l36hfw3wb2n3n68yacjabxyb1pnxwn7vjx96cmjj002xy2jzq")))) (build-system python-build-system) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) -- cgit v1.2.3 From 5f2707a255585dd7e8bd22eb05e43c72e8fec886 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:40:12 +0200 Subject: gnu: python-sphinxcontrib-websupport: Disable tests. * gnu/packages/python.scm (python-sphinxcontrib-websupport)[arguments]: New field. [native-inputs, inputs]: Remove. --- gnu/packages/python.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 56a5131b62..7bb402db89 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2394,18 +2394,9 @@ reStructuredText.") (base32 "1f9f0wjpi9nhikbyaz6d19s7qvzdf1nq2g5dsh640fma4q9rd1bs")))) (build-system python-build-system) - (propagated-inputs - `(("python-mock" ,python-mock) - ("python-pytest" ,python-pytest) - ("python-xapian-bindings" ,python-xapian-bindings))) - ;; Needed for running the test suite - (native-inputs - `(("python-six" ,python-six) - ("python-jinja2" ,python-jinja2) - ("python-docutils" ,python-docutils) - ("python-sphinx" ,python-sphinx) - ("python-sqlalchemy" ,python-sqlalchemy) - ("python-whoosh" ,python-whoosh))) + (arguments + ;; FIXME: Tests depend on Sphinx, which depends on this. + `(#:tests? #f)) (home-page "http://sphinx-doc.org/") (synopsis "Sphinx API for web applications") (description "This package provides a Python API to easily integrate -- cgit v1.2.3 From f65ef0055651b1bd554549d7d1d1fef7935320bb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:45:08 +0200 Subject: gnu: python-sphinxcontrib-websupport: Update to 1.1.0. * gnu/packages/python.scm (python-sphinxcontrib-websupport): Update to 1.1.0. --- 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 7bb402db89..ad16ba0e92 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2386,13 +2386,13 @@ reStructuredText.") (define-public python-sphinxcontrib-websupport (package (name "python-sphinxcontrib-websupport") - (version "1.0.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (pypi-uri "sphinxcontrib-websupport" version)) (sha256 (base32 - "1f9f0wjpi9nhikbyaz6d19s7qvzdf1nq2g5dsh640fma4q9rd1bs")))) + "1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x")))) (build-system python-build-system) (arguments ;; FIXME: Tests depend on Sphinx, which depends on this. -- cgit v1.2.3 From f70785a4c0e12eb2db0ee8e66a41d3a9952a1f63 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 07:58:09 +0200 Subject: gnu: python-sphinxcontrib-websupport: Add a python2 variant. * gnu/packages/python.scm (python2-sphinxcontrib-websupport): New public variable. --- gnu/packages/python.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ad16ba0e92..dbc79b3bf6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2404,6 +2404,9 @@ Sphinx documentation into your web application. It provides tools to integrate Sphinx documents in web templates and to handle searches.") (license license:bsd-3))) +(define-public python2-sphinxcontrib-websupport + (package-with-python2 python-sphinxcontrib-websupport)) + (define-public python-sphinx (package (name "python-sphinx") -- cgit v1.2.3 From 3bbfc451edcb9af438eb8e205d3016203e0ef8e4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 15:41:29 +0200 Subject: gnu: python-sphinx: Update to 1.7.7. * gnu/packages/openstack.scm (python-mox3, python-openstackdocstheme, python-stevedore, python-oslo.config)[native-inputs]: Change PYTHON-SPHINX-1.6 to PYTHON-SPHINX. * gnu/packages/python.scm (python-sphinx): Update to 1.7.7. [arguments]: Incorporate changes from the 1.6 variant. Disable two tests. [propagated-inputs]: Add PYTHON-PACKAGING and PYTHON-SPHINXCONTRIB-WEBSUPPORT. [native-inputs]: Add IMAGEMAGICK and PYTHON-PYTEST. (python2-sphinx)[propagated-inputs]: Add PYTHON2-TYPING. (python-sphinx-1.6, python2-sphinx-1.6, python-sphinx-1.5.3): Remove variables. (python-matplotlib-documentation)[native-inputs]: Change from PYTHON-SPHINX-1.6 to PYTHON-SPHINX. --- gnu/packages/openstack.scm | 8 ++--- gnu/packages/python.scm | 81 +++++++++++----------------------------------- 2 files changed, 23 insertions(+), 66 deletions(-) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 64e05c4b0e..c07f011c9d 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -182,7 +182,7 @@ guidelines}.") ("python-pbr" ,python-pbr))) (native-inputs `(("python-openstackdocstheme" ,python-openstackdocstheme) - ("python-sphinx" ,python-sphinx-1.6) + ("python-sphinx" ,python-sphinx) ("python-subunit" ,python-subunit) ("python-testrepository" ,python-testrepository) ("python-testtools" ,python-testtools))) @@ -216,7 +216,7 @@ with mox as possible, but small enhancements have been made.") `(("python-dulwich" ,python-dulwich) ("python-pbr" ,python-pbr))) (native-inputs - `(("python-sphinx" ,python-sphinx-1.6))) + `(("python-sphinx" ,python-sphinx))) (home-page "https://docs.openstack.org/openstackdocstheme/latest/") (synopsis "OpenStack Docs Theme") (description @@ -313,7 +313,7 @@ to docs.openstack.org and developer.openstack.org.") ("python-six" ,python-six))) (native-inputs `(("python-mock" ,python-mock) - ("python-sphinx" ,python-sphinx-1.6) + ("python-sphinx" ,python-sphinx) ("python-testrepository" ,python-testrepository))) (home-page "https://github.com/dreamhost/stevedore") (synopsis "Manage dynamic plugins for Python applications") @@ -405,7 +405,7 @@ common features used in Tempest.") ("python-openstackdocstheme" ,python-openstackdocstheme) ("python-oslotest" ,python-oslotest) ("python-reno" ,python-reno) - ("python-sphinx" ,python-sphinx-1.6) + ("python-sphinx" ,python-sphinx) ("python-testrepository" ,python-testrepository) ("python-testscenarios" ,python-testscenarios) ("python-testtools" ,python-testtools))) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index dbc79b3bf6..3aa54e6c66 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2410,14 +2410,14 @@ integrate Sphinx documents in web templates and to handle searches.") (define-public python-sphinx (package (name "python-sphinx") - (version "1.5.1") + (version "1.7.7") (source (origin (method url-fetch) (uri (pypi-uri "Sphinx" version)) (sha256 (base32 - "1i8p9idnli4gr0y4x67yakbdk5w6a0xjzhrg6bg51y9d1fi7fslf")))) + "0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi")))) (build-system python-build-system) (arguments `(#:phases @@ -2426,7 +2426,15 @@ integrate Sphinx documents in web templates and to handle searches.") (lambda _ ;; Requires Internet access. (delete-file "tests/test_build_linkcheck.py") - (zero? (system* "make" "test"))))))) + (substitute* "tests/test_build_latex.py" + (("@pytest.mark.sphinx\\('latex', testroot='images'\\)") + "@pytest.mark.skip()")) + (when (which "python") + ;; XXX: These tests are broken when using Python2: + ;; . + (delete-file "tests/test_api_translator.py") + (delete-file "tests/test_setup_command.py")) + (invoke "make" "test")))))) (propagated-inputs `(("python-imagesize" ,python-imagesize) ("python-sphinx-alabaster-theme" @@ -2435,14 +2443,18 @@ integrate Sphinx documents in web templates and to handle searches.") ("python-snowballstemmer" ,python-snowballstemmer) ("python-docutils" ,python-docutils) ("python-jinja2" ,python-jinja2) + ("python-packaging" ,python-packaging) ("python-pygments" ,python-pygments) ("python-requests" ,python-requests) - ("python-six" ,python-six))) + ("python-six" ,python-six) + ("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport))) (native-inputs `(("graphviz" ,graphviz) + ("imagemagick" ,imagemagick) ;for "convert" ("python-html5lib" ,python-html5lib) ("python-mock" ,python-mock) - ("python-nose" ,python-nose))) + ("python-nose" ,python-nose) + ("python-pytest" ,python-pytest))) (home-page "http://sphinx-doc.org/") (synopsis "Python documentation generator") (description "Sphinx is a tool that makes it easy to create documentation @@ -2451,62 +2463,6 @@ sources.") (license license:bsd-3) (properties `((python2-variant . ,(delay python2-sphinx)))))) -(define-public python-sphinx-1.6 - (package (inherit python-sphinx) - (name "python-sphinx") - (version "1.6.4") - (source (origin - (method url-fetch) - (uri (pypi-uri "Sphinx" version)) - (sha256 - (base32 - "0gjakw9fv5pwqb5yyclxycs36sapxizk1vx6mkcdizmzgzcfy0gi")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - ;; Requires Internet access. - (delete-file "tests/test_build_linkcheck.py") - (substitute* "tests/test_build_latex.py" - (("@pytest.mark.sphinx\\('latex', testroot='images'\\)") - "@pytest.mark.skip()")) - (zero? (system* "make" "test"))))))) - (propagated-inputs - `(("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport) - ,@(package-propagated-inputs python-sphinx))) - (native-inputs - `(("python-pytest" ,python-pytest) - ("imagemagick" ,imagemagick) ; for "convert" - ,@(package-native-inputs python-sphinx))) - (properties `((python2-variant . ,(delay python2-sphinx-1.6)))))) - -(define-public python2-sphinx-1.6 - (let ((base (package-with-python2 (strip-python2-variant python-sphinx-1.6)))) - (package - (inherit base) - (propagated-inputs - `(("python2-typing" ,python2-typing) - ,@(package-propagated-inputs base))) - (native-inputs `(("python2-enum34" ,python2-enum34) - ,@(package-native-inputs base)))))) - -(define-public python-sphinx-1.5.3 - (package - (inherit python-sphinx) - (name "python-sphinx") - (version "1.5.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Sphinx" version)) - (sha256 - (base32 - "0kw1axswbvaavr8ggyf4qr6hnisnrzlbkkcdada69vk1x9xjassg")))) - (native-inputs - `(("python-pytest" ,python-pytest) - ,@(package-native-inputs python-sphinx))))) - (define-public python2-sphinx (let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) (package @@ -2515,6 +2471,7 @@ sources.") ("python2-enum34" ,python2-enum34) ,@(package-native-inputs base))) (propagated-inputs `(("python2-pytz" ,python2-pytz) + ("python2-typing" ,python2-typing) ,@(package-propagated-inputs base)))))) (define-public python-sphinx-gallery @@ -3502,7 +3459,7 @@ toolkits.") (native-inputs `(("python-matplotlib" ,python-matplotlib) ("python-colorspacious" ,python-colorspacious) - ("python-sphinx" ,python-sphinx-1.6) + ("python-sphinx" ,python-sphinx) ("python-sphinx-gallery" ,python-sphinx-gallery) ("python-numpydoc" ,python-numpydoc) ("python-ipython" ,python-ipython) -- cgit v1.2.3 From a8c9321368604df74269217ede5c8058009e3ba0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 15:13:20 +0200 Subject: gnu: cups-filters: Update to 1.21.0. * gnu/packages/cups.scm (cups-filters): Update to 1.21.0. --- 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 c2c1a01b73..b4034dfad8 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -53,7 +53,7 @@ (define-public cups-filters (package (name "cups-filters") - (version "1.20.4") + (version "1.21.0") (source(origin (method url-fetch) (uri @@ -61,7 +61,7 @@ "cups-filters-" version ".tar.xz")) (sha256 (base32 - "0sjkmclcb1r77015wllsyz26272br3s17v6b1q2xwb2nm2gnwx9k")) + "0fs90xx9i4h8gbpligf5kkh21llv4kf5g3bgfbx4z272xkm7bsfi")) (modules '((guix build utils))) (snippet ;; install backends, banners and filters to cups-filters output -- cgit v1.2.3 From 7eab5e7377de82666d41a8e58e3d9f7e116df5ff Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 16:00:38 +0200 Subject: gnu: python-greenlet: Update to 0.4.14. * gnu/packages/python.scm (python-greenlet): Update to 0.4.14. --- 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 3aa54e6c66..e47da91306 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8837,13 +8837,13 @@ multiple processes (imagine multiprocessing, billiard, futures, celery etc). (define-public python-greenlet (package (name "python-greenlet") - (version "0.4.11") + (version "0.4.14") (source (origin (method url-fetch) (uri (pypi-uri "greenlet" version)) (sha256 (base32 - "1xhik26j4f3kc4qw9xmj0c567rb5h1zryb4ijwqnqwwjvfhbv59h")))) + "1bsij3bwdhz2chq4ar2v6jqbh69yc7k9ymh41jd8vrdd2n52dk7i")))) (build-system python-build-system) (home-page "https://greenlet.readthedocs.io/") (synopsis "Lightweight in-process concurrent programming") -- cgit v1.2.3 From 25febeedc6457b8c064aa4045394b39efc46d22c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 17:15:13 +0200 Subject: gnu: python-numpydoc: Update to 0.8.0. * gnu/packages/python.scm (python-numpydoc): Update to 0.8.0. [source](uri): Use PYPI-URI. [source](snippet): Remove. --- gnu/packages/python.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e47da91306..e574aec555 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3222,25 +3222,14 @@ that client code uses to construct the grammar directly in Python code.") (define-public python-numpydoc (package (name "python-numpydoc") - (version "0.5") + (version "0.8.0") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/n/numpydoc/numpydoc-" - version ".tar.gz")) + (uri (pypi-uri "numpydoc" version)) (sha256 (base32 - "0d4dnifaxkll50jx6czj05y8cb4ny60njd2wz299sj2jxfy51w4k")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Drop a test requiring matplotlib, which we cannot add as an - ;; input since it would create a circular dependency: Extend the - ;; test for Python 3, where it is already dropped, to Python 2. - (substitute* "numpydoc/tests/test_plot_directive.py" - (("3") "2")) - #t)))) + "1zazxg3m8j4fksv3f7v7vpf4bj9qb1vj3r326am0vdip141vzx31")))) (build-system python-build-system) (propagated-inputs `(("python-sphinx" ,python-sphinx))) -- cgit v1.2.3 From fdb222033c7bf4580bea0158840e9bb7905a00bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Aug 2018 17:25:23 +0200 Subject: gnu: gdbm: Update to 1.18. * gnu/packages/databases.scm (gdbm): Update to 1.18. --- 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 2989881028..bf0484197b 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -163,14 +163,14 @@ either single machines or networked clusters.") (define-public gdbm (package (name "gdbm") - (version "1.16") + (version "1.18") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdbm/gdbm-" version ".tar.gz")) (sha256 (base32 - "0bsimfb0h9vkxh6hzz66hrpxrzcqla58y0gvzvpc784x4p38p8f8")))) + "1kimnv12bzjjhaqk4c8w2j6chdj9c6bg21lchaf7abcyfss2r0mq")))) (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) (build-system gnu-build-system) (home-page "http://www.gnu.org.ua/software/gdbm") -- cgit v1.2.3 From bf91e6835d21e3bd7b49bb85b40f61389604c6f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 16:22:36 +0200 Subject: build-system/meson: Strip RUNPATH and remove PatchELF traces. * guix/build-system/meson.scm (%meson-build-system-modules): Don't import (guix build rpath). * guix/build/meson-build-system.scm (fix-runpath): Rename to ... (shrink-runpath): ... this. Update docstring. Remove AUGMENT-RPATH calls and related code. (%standard-phases): Add 'shrink-runpath'. --- guix/build-system/meson.scm | 1 - guix/build/meson-build-system.scm | 52 ++++++--------------------------------- 2 files changed, 7 insertions(+), 46 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index fddf899092..8d49020454 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -41,7 +41,6 @@ (define %meson-build-system-modules ;; Build-side modules imported by default. `((guix build meson-build-system) - (guix build rpath) ;; The modules from glib-or-gtk contains the modules from gnu-build-system, ;; so there is no need to import that too. ,@%glib-or-gtk-build-system-modules)) diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm index f6b8b49801..d0975fcab0 100644 --- a/guix/build/meson-build-system.scm +++ b/guix/build/meson-build-system.scm @@ -22,7 +22,6 @@ #:use-module ((guix build gnu-build-system) #:prefix gnu:) #:use-module ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) #:use-module (guix build utils) - #:use-module (guix build rpath) #:use-module (guix build gremlin) #:use-module (guix elf) #:use-module (ice-9 match) @@ -78,42 +77,13 @@ (define* (install #:rest args) (invoke "ninja" "install")) -(define* (fix-runpath #:key (elf-directories '("lib" "lib64" "libexec" - "bin" "sbin")) - outputs #:allow-other-keys) - "Try to make sure all ELF files in ELF-DIRECTORIES are able to find their -local dependencies in their RUNPATH, by searching for the needed libraries in -the directories of the package, and adding them to the RUNPATH if needed. -Also shrink the RUNPATH to what is needed, +(define* (shrink-runpath #:key (elf-directories '("lib" "lib64" "libexec" + "bin" "sbin")) + outputs #:allow-other-keys) + "Go through all ELF files from ELF-DIRECTORIES and shrink the RUNPATH since a lot of directories are left over from the build phase of meson, for example libraries only needed for the tests." - ;; Find the directories (if any) that contains DEP-NAME. The directories - ;; searched are the ones that ELF-FILES are in. - (define (find-deps dep-name elf-files) - (map dirname (filter (lambda (file) - (string=? dep-name (basename file))) - elf-files))) - - ;; Return a list of libraries that FILE needs. - (define (file-needed file) - (let* ((elf (call-with-input-file file - (compose parse-elf get-bytevector-all))) - (dyninfo (elf-dynamic-info elf))) - (if dyninfo - (elf-dynamic-info-needed dyninfo) - '()))) - - - ;; If FILE needs any libs that are part of ELF-FILES, the RUNPATH - ;; is modified accordingly. - (define (handle-file file elf-files) - (let* ((dep-dirs (concatenate (map (lambda (dep-name) - (find-deps dep-name elf-files)) - (file-needed file))))) - (unless (null? dep-dirs) - (augment-rpath file (string-join dep-dirs ":"))))) - (define handle-output (match-lambda ((output . directory) @@ -129,10 +99,7 @@ for example libraries only needed for the tests." (elf-list (concatenate (map (lambda (dir) (find-files dir elf-pred)) existing-elf-dirs)))) - (for-each (lambda (elf-file) - (strip-runpath elf-file) - (handle-file elf-file elf-list)) - elf-list))))) + (for-each strip-runpath elf-list))))) (for-each handle-output outputs) #t) @@ -144,13 +111,8 @@ for example libraries only needed for the tests." (replace 'configure configure) (replace 'build build) (replace 'check check) - ;; XXX: We used to have 'fix-runpath' here, but it appears no longer - ;; necessary with newer Meson. However on 'core-updates' there is a - ;; useful 'strip-runpath' procedure to ensure no bogus directories in - ;; RUNPATH (remember that we tell Meson to not touch RUNPATH in - ;; (@ (gnu packages build-tools) meson-for-build)), so it should be - ;; re-added there sans the augment-rpath calls (which are not needed). - (replace 'install install))) + (replace 'install install) + (add-after 'strip 'shrink-runpath shrink-runpath))) (define* (meson-build #:key inputs phases #:allow-other-keys #:rest args) -- cgit v1.2.3 From fb76ef8477f189d35c1e91bf026236f5627f3a27 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 16:45:17 +0200 Subject: gnu: Remove GCC ICE workarounds. * gnu/packages/patches/doxygen-gcc-ice.patch, gnu/packages/patches/mariadb-gcc-ice.patch, gnu/packages/patches/perf-gcc-ice.patch: Delete files * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/databases.scm (mariadb)[source](patches): Likewise. * gnu/packages/linux.scm (perf)[source](patches): Likewise. * gnu/packages/documentation.scm (doxygen)[inputs, arguments]: Likewise. --- gnu/local.mk | 3 --- gnu/packages/databases.scm | 3 +-- gnu/packages/documentation.scm | 15 +-------------- gnu/packages/linux.scm | 4 +--- gnu/packages/patches/doxygen-gcc-ice.patch | 25 ------------------------- gnu/packages/patches/mariadb-gcc-ice.patch | 24 ------------------------ gnu/packages/patches/perf-gcc-ice.patch | 13 ------------- 7 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 gnu/packages/patches/doxygen-gcc-ice.patch delete mode 100644 gnu/packages/patches/mariadb-gcc-ice.patch delete mode 100644 gnu/packages/patches/perf-gcc-ice.patch diff --git a/gnu/local.mk b/gnu/local.mk index 341e1c4fdf..e4a7c3d141 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -641,7 +641,6 @@ dist_patch_DATA = \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ - %D%/packages/patches/doxygen-gcc-ice.patch \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/eigen-arm-neon-fixes.patch \ @@ -927,7 +926,6 @@ dist_patch_DATA = \ %D%/packages/patches/mailutils-uninitialized-memory.patch \ %D%/packages/patches/make-glibc-compat.patch \ %D%/packages/patches/make-impure-dirs.patch \ - %D%/packages/patches/mariadb-gcc-ice.patch \ %D%/packages/patches/mariadb-client-test-32bit.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ @@ -1008,7 +1006,6 @@ dist_patch_DATA = \ %D%/packages/patches/patchelf-rework-for-arm.patch \ %D%/packages/patches/patchutils-xfail-gendiff-tests.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ - %D%/packages/patches/perf-gcc-ice.patch \ %D%/packages/patches/perl-autosplit-default-time.patch \ %D%/packages/patches/perl-dbd-mysql-CVE-2017-10788.patch \ %D%/packages/patches/perl-deterministic-ordering.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index bf0484197b..4c0a6d4c28 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -636,8 +636,7 @@ Language.") (sha256 (base32 "0k9walaglwmwdwmkq48ir17g98n83vliyyg5wck22rjgxn2xk4cy")) - (patches (search-patches "mariadb-gcc-ice.patch" - "mariadb-client-test-32bit.patch")) + (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index f533535f03..9425df707c 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -139,23 +139,10 @@ markup) can be customized and extended by the user.") ("libxml2" ,libxml2) ; provides xmllint for the tests ("python" ,python-2))) ; for creating the documentation (inputs - `(("bash" ,bash-minimal) - ,@(if (string-prefix? "armhf-" (%current-system)) - `(("gcc-ice-patch" ,@(search-patches "doxygen-gcc-ice.patch"))) - '()))) + `(("bash" ,bash-minimal))) (arguments `(#:test-target "tests" #:phases (modify-phases %standard-phases - ;; Work around an ICE that shows up on native compiles for - ;; armhf-linux. - ,@(if (string-prefix? "armhf-" (%current-system)) - `((add-after 'unpack 'apply-gcc-patch - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch (assoc-ref inputs "gcc-ice-patch"))) - (invoke "patch" "-p1" "--force" - "--input" patch))))) - '()) - (add-before 'configure 'patch-sh (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/portable.cpp" diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d7958ac470..cbb8f8f01f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2508,9 +2508,7 @@ in a digital read-out.") (package (name "perf") (version (package-version linux-libre)) - (source (origin - (inherit (package-source linux-libre)) - (patches (search-patches "perf-gcc-ice.patch")))) + (source (package-source linux-libre)) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/doxygen-gcc-ice.patch b/gnu/packages/patches/doxygen-gcc-ice.patch deleted file mode 100644 index fbfedcb7ab..0000000000 --- a/gnu/packages/patches/doxygen-gcc-ice.patch +++ /dev/null @@ -1,25 +0,0 @@ -Work around this GCC ICE: . It shows up -only when doing native compiles on armhf-linux. - -Yes it's a terrible patch, but it does the job. - ---- doxygen-1.8.13/qtools/qutfcodec.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ doxygen-1.8.13/qtools/qutfcodec.cpp 2018-06-08 14:14:29.614009929 +0200 -@@ -189,7 +189,7 @@ int QUtf16Codec::heuristicContentMatch(c - } - - -- -+volatile const void *bomPointer = &QChar::byteOrderMark; - - class QUtf16Encoder : public QTextEncoder { - bool headerdone; -@@ -209,7 +209,7 @@ public: - headerdone = TRUE; - len_in_out = (1+uc.length())*(int)sizeof(QChar); - QCString d(len_in_out); -- memcpy(d.rawData(),&QChar::byteOrderMark,sizeof(QChar)); -+ memcpy(d.rawData(),(void *)bomPointer,sizeof(QChar)); - memcpy(d.rawData()+sizeof(QChar),uc.unicode(),uc.length()*sizeof(QChar)); - return d; - } diff --git a/gnu/packages/patches/mariadb-gcc-ice.patch b/gnu/packages/patches/mariadb-gcc-ice.patch deleted file mode 100644 index 59b188f45a..0000000000 --- a/gnu/packages/patches/mariadb-gcc-ice.patch +++ /dev/null @@ -1,24 +0,0 @@ -Work around this GCC ICE: . It shows up -only when doing native compiles on armhf-linux. - ---- mariadb-10.1.33/plugin/semisync/semisync_master.cc 2018-07-28 02:13:12.604020250 +0200 -+++ mariadb-10.1.33/plugin/semisync/semisync_master.cc 2018-07-28 02:14:11.907753417 +0200 -@@ -847,6 +847,8 @@ - return function_exit(kWho, 0); - } - -+volatile const void *kSyncHeaderPtr = &ReplSemiSyncMaster::kSyncHeader; -+ - int ReplSemiSyncMaster::reserveSyncHeader(unsigned char *header, - unsigned long size) - { -@@ -873,7 +875,7 @@ - /* Set the magic number and the sync status. By default, no sync - * is required. - */ -- memcpy(header, kSyncHeader, sizeof(kSyncHeader)); -+ memcpy(header, (void *)kSyncHeaderPtr, sizeof(kSyncHeader)); - hlen= sizeof(kSyncHeader); - } - return function_exit(kWho, hlen); - diff --git a/gnu/packages/patches/perf-gcc-ice.patch b/gnu/packages/patches/perf-gcc-ice.patch deleted file mode 100644 index 58ab5359c2..0000000000 --- a/gnu/packages/patches/perf-gcc-ice.patch +++ /dev/null @@ -1,13 +0,0 @@ -Work around this GCC ICE: . - ---- linux-4.16.13/tools/perf/util/header.c 2018-06-04 11:30:39.368146035 +0200 -+++ linux-4.16.13/tools/perf/util/header.c 2018-06-04 11:34:04.667212378 +0200 -@@ -135,7 +135,7 @@ int do_write(struct feat_fd *ff, const v - int write_padded(struct feat_fd *ff, const void *bf, - size_t count, size_t count_aligned) - { -- static const char zero_buf[NAME_ALIGN]; -+ static const char zero_buf[NAME_ALIGN] = { 0 }; - int err = do_write(ff, bf, count); - - if (!err) -- cgit v1.2.3 From 00ffbfd39416e91e1d0e3ce1ee5337a7a2665dfd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 17:10:32 +0200 Subject: gnu: python-idna: Update to 2.7. * gnu/packages/python.scm (python-idna): Update to 2.7. --- 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 e574aec555..8c5e0890c5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6322,14 +6322,14 @@ versions of Python.") (define-public python-idna (package (name "python-idna") - (version "2.6") + (version "2.7") (source (origin (method url-fetch) (uri (pypi-uri "idna" version)) (sha256 (base32 - "13qaab6d0s15gknz8v3zbcfmbj6v86hn9pjxgkdf62ch13imssic")))) + "05jam7d31767dr12x0rbvvs8lxnpb1mhdb2zdlfxgh83z6k3hjk8")))) (build-system python-build-system) (home-page "https://github.com/kjd/idna") (synopsis "Internationalized domain names in applications") -- cgit v1.2.3 From 064732bd0c3bb43a07da30bdfc39e0ac255550b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 17:25:58 +0200 Subject: gnu: python-certifi: Update to 2018.8.13. * gnu/packages/python-crypto.scm (python-certifi): Update to 2018.8.13. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index ed8aa836fd..267f769402 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -338,13 +338,13 @@ password storage.") (define-public python-certifi (package (name "python-certifi") - (version "2017.1.23") + (version "2018.8.13") (source (origin (method url-fetch) (uri (pypi-uri "certifi" version)) (sha256 (base32 - "1klrzl3hgvcf2mjk00g0k3kk1p2z27vzwnxivwar4vhjmjvpz1w1")))) + "1x7jy10rz3100g9iw7c2czcw2z4lqfaalsd8yg991l4d82hnh7ac")))) (build-system python-build-system) (home-page "https://certifi.io/") (synopsis "Python CA certificate bundle") -- cgit v1.2.3 From a20016e15a8f1a02dcc77666603ad71538b5a2f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 17:41:30 +0200 Subject: gnu: python-urllib3: Update to 1.23. * gnu/packages/python-web.scm (python-urllib3): Update to 1.23. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2e98a95d4b..494fbe7999 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1286,14 +1286,14 @@ authenticated session objects providing things like keep-alive.") (define-public python-urllib3 (package (name "python-urllib3") - (version "1.18.1") + (version "1.23") (source (origin (method url-fetch) (uri (pypi-uri "urllib3" version)) (sha256 (base32 - "1wb8aqnq53vzh2amrv8kc66f3h6fx217y0q62y6n30a64p2yqmam")))) + "1bvbd35q3zdcd7gsv38fwpizy7p06dr0154g5gfybrvnbvhwb2m6")))) (build-system python-build-system) (arguments `(#:tests? #f)) (native-inputs -- cgit v1.2.3 From 22cf2f4abfa2b1ad5620d35644b6538b7041dbf1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 18:00:16 +0200 Subject: gnu: python-cffi: Update to 1.11.5. * gnu/packages/libffi.scm (python-cffi): Update to 1.11.5. --- gnu/packages/libffi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 7d3abaff18..d1b910bd07 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -82,13 +82,13 @@ conversions for values passed between the two languages.") (define-public python-cffi (package (name "python-cffi") - (version "1.11.4") + (version "1.11.5") (source (origin (method url-fetch) (uri (pypi-uri "cffi" version)) (sha256 - (base32 "07fiy4wqg8g08x38r04ydjr8n6g0g74gb8si8b6jhymijalq746z")))) + (base32 "1x3lrj928dcxx1k8k9gf3s4s3jwvzv8mc3kkyg1g7c3a1sc1f3z9")))) (build-system python-build-system) (outputs '("out" "doc")) (inputs -- cgit v1.2.3 From bd65ecf4608152d586be610add0c9d2ab2b4ac25 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 20:03:29 +0200 Subject: gnu: boost: Provide libboost_python compatibility symlink. * gnu/packages/boost.scm (boost)[arguments]: Add phase 'provide-libboost_python'. --- gnu/packages/boost.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index fbd0425c96..71b34ada1f 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -100,7 +100,18 @@ make-flags))) (replace 'install (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "./b2" "install" make-flags)))))) + (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)))))) (home-page "https://www.boost.org") (synopsis "Peer-reviewed portable C++ source libraries") -- cgit v1.2.3 From 3ea66dadf6113f885ecc26484a535a0003bd2383 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 15:36:59 +0200 Subject: gnu: boost: Update to 1.68.0. * gnu/packages/boost.scm (boost): Update to 1.68.0. [arguments]: Remove /bin/sh substitution. --- gnu/packages/boost.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 71b34ada1f..aa4a4d3dd8 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -43,7 +43,7 @@ (define-public boost (package (name "boost") - (version "1.67.0") + (version "1.68.0") (source (origin (method url-fetch) (uri (string-append @@ -52,7 +52,7 @@ ".tar.bz2")) (sha256 (base32 - "1fmdlmkzsrd46wwk834jsi2ypxj68w2by0rfcg2pzrafk5rck116")) + "1dyqsr9yb01y0nnjdq9b8q5s2kvhxbayk34832k5cpzn7jy30qbz")) (patches (search-patches "boost-fix-icu-build.patch")))) (build-system gnu-build-system) (inputs `(("icu4c" ,icu4c) @@ -78,7 +78,6 @@ (out (assoc-ref outputs "out"))) (substitute* '("libs/config/configure" "libs/spirit/classic/phoenix/test/runtest.sh" - "tools/build/doc/bjam.qbk" "tools/build/src/engine/execunix.c" "tools/build/src/engine/Jambase" "tools/build/src/engine/jambase.c") -- cgit v1.2.3 From e13b547407b0db6c0f8205154ea43d6f99e8b186 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Aug 2018 16:13:45 +0200 Subject: gnu: glibc: Update to 2.28. * gnu/packages/patches/glibc-2.28-git-fixes.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/base.scm (glibc/linux): Update to 2.28. [source](patches): Add 'glibc-2.28-git-fixes.patch'. Remove 2.27 equivalent. (glibc-2.28): Remove variable. (glibc-2.27): New public variable --- gnu/local.mk | 1 + gnu/packages/base.scm | 28 +-- gnu/packages/patches/glibc-2.28-git-fixes.patch | 248 ++++++++++++++++++++++++ 3 files changed, 263 insertions(+), 14 deletions(-) create mode 100644 gnu/packages/patches/glibc-2.28-git-fixes.patch diff --git a/gnu/local.mk b/gnu/local.mk index e4a7c3d141..d1228b9261 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -740,6 +740,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-vectorized-strcspn-guards.patch \ %D%/packages/patches/glibc-versioned-locpath.patch \ %D%/packages/patches/glibc-2.27-git-fixes.patch \ + %D%/packages/patches/glibc-2.28-git-fixes.patch \ %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch \ %D%/packages/patches/glog-gcc-5-demangling.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 572d64f53a..c073672473 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -561,13 +561,13 @@ store.") (name "glibc") ;; Note: Always use a dot after the minor version since various places rely ;; on "version-major+minor" to determine where locales are found. - (version "2.27") + (version "2.28") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "0wpwq7gsm7sd6ysidv0z575ckqdg13cr2njyfgrbgh4f65adwwji")) + "10iha5ynvdj5m62vgpgqbq4cwvc2yhyl2w9yyyjgfxmdmx8h145i")) (snippet ;; Disable 'ldconfig' and /etc/ld.so.cache. The latter is ;; required on LFS distros to avoid loading the distro's libc.so @@ -579,7 +579,7 @@ store.") #t)) (modules '((guix build utils))) (patches (search-patches "glibc-ldd-x86_64.patch" - "glibc-2.27-git-fixes.patch" + "glibc-2.28-git-fixes.patch" "glibc-hidden-visibility-ldconfig.patch" "glibc-versioned-locpath.patch" "glibc-allow-kernel-2.6.32.patch" @@ -862,25 +862,25 @@ GLIBC/HURD for a Hurd host" (define-syntax glibc (identifier-syntax (glibc-for-target))) -;; The "next" libc. Useful for populating locale data before reconfiguring the -;; entire system on it. Will be the default in the next rebuild cycle. -(define-public glibc-2.28 +;; 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.27 (package (inherit glibc) - (version "2.28") + (version "2.27") (source (origin (inherit (package-source glibc)) (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) (sha256 (base32 - "10iha5ynvdj5m62vgpgqbq4cwvc2yhyl2w9yyyjgfxmdmx8h145i")) - (patches (search-patches "glibc-allow-kernel-2.6.32.patch" - "glibc-ldd-x86_64.patch" + "0wpwq7gsm7sd6ysidv0z575ckqdg13cr2njyfgrbgh4f65adwwji")) + (patches (search-patches "glibc-ldd-x86_64.patch" + "glibc-2.27-git-fixes.patch" "glibc-hidden-visibility-ldconfig.patch" - "glibc-versioned-locpath.patch")))))) - -;; Below are old libc versions, which we use mostly to build locale data in -;; the old format (which the new libc cannot cope with.) + "glibc-versioned-locpath.patch" + "glibc-allow-kernel-2.6.32.patch" + "glibc-reinstate-prlimit64-fallback.patch")))))) (define-public glibc-2.26 (package diff --git a/gnu/packages/patches/glibc-2.28-git-fixes.patch b/gnu/packages/patches/glibc-2.28-git-fixes.patch new file mode 100644 index 0000000000..7e370ef0b1 --- /dev/null +++ b/gnu/packages/patches/glibc-2.28-git-fixes.patch @@ -0,0 +1,248 @@ +This file contains fixes from the "release/2.28/master" branch: +https://sourceware.org/git/?p=glibc.git;a=shortlog;h=refs/heads/release/2.28/master + +Currently we have these commits (sans tests and ChangeLog updates): +7f11842e7483da7aa9fa3031be122021978ef600 +726e1554ce4db5e35af41cb0110c54c5e1232054 +4b25485f03158959cff45379eecc1d73c7dcdd11 +d05b05d1570ba3ae354a2f5a3cfeefb373b09979 +bfcfa22589f2b4277a65e60c6b736b6bbfbd87d0 +2f498f3d140ab5152bd784df2be7af7d9c5e63ed + +diff --git a/htl/Versions b/htl/Versions +index 6a63a1b8a1..c5a616da10 100644 +--- a/htl/Versions ++++ b/htl/Versions +@@ -150,6 +150,8 @@ libpthread { + __cthread_keycreate; + __cthread_getspecific; + __cthread_setspecific; ++ __pthread_getspecific; ++ __pthread_setspecific; + __pthread_getattr_np; + __pthread_attr_getstack; + } + +diff --git a/sysdeps/htl/pt-getspecific.c b/sysdeps/htl/pt-getspecific.c +index a0227a67f6..64ddf9551a 100644 +--- a/sysdeps/htl/pt-getspecific.c ++++ b/sysdeps/htl/pt-getspecific.c +@@ -36,3 +36,4 @@ __pthread_getspecific (pthread_key_t key) + return self->thread_specifics[key]; + } + strong_alias (__pthread_getspecific, pthread_getspecific); ++hidden_def (__pthread_getspecific) +diff --git a/sysdeps/htl/pt-setspecific.c b/sysdeps/htl/pt-setspecific.c +index a46a12f157..02aff417ef 100644 +--- a/sysdeps/htl/pt-setspecific.c ++++ b/sysdeps/htl/pt-setspecific.c +@@ -48,3 +48,4 @@ __pthread_setspecific (pthread_key_t key, const void *value) + return 0; + } + strong_alias (__pthread_setspecific, pthread_setspecific); ++hidden_def (__pthread_setspecific) +diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h +index 132ac1718e..71c2fcd9c6 100644 +--- a/sysdeps/htl/pthreadP.h ++++ b/sysdeps/htl/pthreadP.h +@@ -68,6 +68,8 @@ struct __pthread_cancelation_handler **___pthread_get_cleanup_stack (void) attri + + #if IS_IN (libpthread) + hidden_proto (__pthread_key_create) ++hidden_proto (__pthread_getspecific) ++hidden_proto (__pthread_setspecific) + hidden_proto (_pthread_mutex_init) + #endif + +diff --git a/sysdeps/unix/sysv/linux/getdents64.c b/sysdeps/unix/sysv/linux/getdents64.c +index 3bde0cf4f0..bc140b5a7f 100644 +--- a/sysdeps/unix/sysv/linux/getdents64.c ++++ b/sysdeps/unix/sysv/linux/getdents64.c +@@ -33,41 +33,80 @@ strong_alias (__getdents64, __getdents) + # include + + # if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) +-# include ++# include ++# include + +-/* kernel definition of as of 3.2. */ +-struct compat_linux_dirent ++static ssize_t ++handle_overflow (int fd, __off64_t offset, ssize_t count) + { +- /* Both d_ino and d_off are compat_ulong_t which are defined in all +- architectures as 'u32'. */ +- uint32_t d_ino; +- uint32_t d_off; +- unsigned short d_reclen; +- char d_name[1]; +-}; ++ /* If this is the first entry in the buffer, we can report the ++ error. */ ++ if (count == 0) ++ { ++ __set_errno (EOVERFLOW); ++ return -1; ++ } ++ ++ /* Otherwise, seek to the overflowing entry, so that the next call ++ will report the error, and return the data read so far.. */ ++ if (__lseek64 (fd, offset, SEEK_SET) != 0) ++ return -1; ++ return count; ++} + + ssize_t + __old_getdents64 (int fd, char *buf, size_t nbytes) + { +- ssize_t retval = INLINE_SYSCALL_CALL (getdents, fd, buf, nbytes); ++ /* We do not move the individual directory entries. This is only ++ possible if the target type (struct __old_dirent64) is smaller ++ than the source type. */ ++ _Static_assert (offsetof (struct __old_dirent64, d_name) ++ <= offsetof (struct dirent64, d_name), ++ "__old_dirent64 is larger than dirent64"); ++ _Static_assert (__alignof__ (struct __old_dirent64) ++ <= __alignof__ (struct dirent64), ++ "alignment of __old_dirent64 is larger than dirent64"); + +- /* The kernel added the d_type value after the name. Change this now. */ +- if (retval != -1) ++ ssize_t retval = INLINE_SYSCALL_CALL (getdents64, fd, buf, nbytes); ++ if (retval > 0) + { +- union +- { +- struct compat_linux_dirent k; +- struct dirent u; +- } *kbuf = (void *) buf; +- +- while ((char *) kbuf < buf + retval) ++ char *p = buf; ++ char *end = buf + retval; ++ while (p < end) + { +- char d_type = *((char *) kbuf + kbuf->k.d_reclen - 1); +- memmove (kbuf->u.d_name, kbuf->k.d_name, +- strlen (kbuf->k.d_name) + 1); +- kbuf->u.d_type = d_type; ++ struct dirent64 *source = (struct dirent64 *) p; ++ ++ /* Copy out the fixed-size data. */ ++ __ino_t ino = source->d_ino; ++ __off64_t offset = source->d_off; ++ unsigned int reclen = source->d_reclen; ++ unsigned char type = source->d_type; ++ ++ /* Check for ino_t overflow. */ ++ if (__glibc_unlikely (ino != source->d_ino)) ++ return handle_overflow (fd, offset, p - buf); ++ ++ /* Convert to the target layout. Use a separate struct and ++ memcpy to side-step aliasing issues. */ ++ struct __old_dirent64 result; ++ result.d_ino = ino; ++ result.d_off = offset; ++ result.d_reclen = reclen; ++ result.d_type = type; ++ ++ /* Write the fixed-sized part of the result to the ++ buffer. */ ++ size_t result_name_offset = offsetof (struct __old_dirent64, d_name); ++ memcpy (p, &result, result_name_offset); ++ ++ /* Adjust the position of the name if necessary. Copy ++ everything until the end of the record, including the ++ terminating NUL byte. */ ++ if (result_name_offset != offsetof (struct dirent64, d_name)) ++ memmove (p + result_name_offset, source->d_name, ++ reclen - offsetof (struct dirent64, d_name)); + +- kbuf = (void *) ((char *) kbuf + kbuf->k.d_reclen); ++ p += reclen; + } + } + return retval; + +diff --git a/misc/error.c b/misc/error.c +index b4e8b6c938..03378e2f2a 100644 +--- a/misc/error.c ++++ b/misc/error.c +@@ -319,6 +319,7 @@ error (int status, int errnum, const char *message, ...) + + va_start (args, message); + error_tail (status, errnum, message, args); ++ va_end (args); + + #ifdef _LIBC + _IO_funlockfile (stderr); +@@ -390,6 +391,7 @@ error_at_line (int status, int errnum, const char *file_name, + + va_start (args, message); + error_tail (status, errnum, message, args); ++ va_end (args); + + #ifdef _LIBC + _IO_funlockfile (stderr); + +diff --git a/nscd/nscd_conf.c b/nscd/nscd_conf.c +index 265a02434d..7293b795b6 100644 +--- a/nscd/nscd_conf.c ++++ b/nscd/nscd_conf.c +@@ -190,7 +190,10 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb]) + if (!arg1) + error (0, 0, _("Must specify user name for server-user option")); + else +- server_user = xstrdup (arg1); ++ { ++ free ((char *) server_user); ++ server_user = xstrdup (arg1); ++ } + } + else if (strcmp (entry, "stat-user") == 0) + { +@@ -198,6 +201,7 @@ nscd_parse_file (const char *fname, struct database_dyn dbs[lastdb]) + error (0, 0, _("Must specify user name for stat-user option")); + else + { ++ free ((char *) stat_user); + stat_user = xstrdup (arg1); + + struct passwd *pw = getpwnam (stat_user); + +diff --git a/nss/nss_files/files-alias.c b/nss/nss_files/files-alias.c +index cfd34b66b9..35b0bfc5d2 100644 +--- a/nss/nss_files/files-alias.c ++++ b/nss/nss_files/files-alias.c +@@ -221,6 +221,13 @@ get_next_alias (FILE *stream, const char *match, struct aliasent *result, + { + while (! feof_unlocked (listfile)) + { ++ if (room_left < 2) ++ { ++ free (old_line); ++ fclose (listfile); ++ goto no_more_room; ++ } ++ + first_unused[room_left - 1] = '\xff'; + line = fgets_unlocked (first_unused, room_left, + listfile); +@@ -229,6 +236,7 @@ get_next_alias (FILE *stream, const char *match, struct aliasent *result, + if (first_unused[room_left - 1] != '\xff') + { + free (old_line); ++ fclose (listfile); + goto no_more_room; + } + +@@ -256,6 +264,7 @@ get_next_alias (FILE *stream, const char *match, struct aliasent *result, + + __alignof__ (char *))) + { + free (old_line); ++ fclose (listfile); + goto no_more_room; + } + room_left -= ((first_unused - cp) + -- cgit v1.2.3 From 1aef659e86242020c7ec813e9a1f6ad35431de9d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 1 Aug 2018 23:19:28 +0200 Subject: gnu: gcc: Fix build with glibc >= 2.28. * gnu/packages/patches/gcc-libsanitizer-ustat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gcc.scm (gcc-5)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/gcc.scm | 1 + gnu/packages/patches/gcc-libsanitizer-ustat.patch | 41 +++++++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 gnu/packages/patches/gcc-libsanitizer-ustat.patch diff --git a/gnu/local.mk b/gnu/local.mk index d1228b9261..9c79e843a8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -690,6 +690,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-fix-texi2pod.patch \ %D%/packages/patches/gcc-4.9-libsanitizer-fix.patch \ %D%/packages/patches/gcc-libsanitizer-fix.patch \ + %D%/packages/patches/gcc-libsanitizer-ustat.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 46b70ce497..2e2135ab51 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -431,6 +431,7 @@ Go. It also includes runtime support libraries for these languages.") (base32 "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k")) (patches (search-patches "gcc-arm-bug-71399.patch" + "gcc-libsanitizer-ustat.patch" "gcc-strmov-store-file-names.patch" "gcc-5.0-libvtv-runpath.patch" "gcc-5-source-date-epoch-1.patch" diff --git a/gnu/packages/patches/gcc-libsanitizer-ustat.patch b/gnu/packages/patches/gcc-libsanitizer-ustat.patch new file mode 100644 index 0000000000..a4e0c6affa --- /dev/null +++ b/gnu/packages/patches/gcc-libsanitizer-ustat.patch @@ -0,0 +1,41 @@ +Remove use of deprecated ustat interface in glibc 2.28: + +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85835 + +Taken from upstream: + +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=260684 + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 858bb2184505..de18e56d11cf 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -157,7 +157,6 @@ typedef struct user_fpregs elf_fpregset_t; + # include + #endif + #include +-#include + #include + #include + #include +@@ -250,7 +249,19 @@ namespace __sanitizer { + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned struct_ustat_sz = sizeof(struct ustat); ++ // Use pre-computed size of struct ustat to avoid which ++ // has been removed from glibc 2.28. ++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ ++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ ++ || defined(__x86_64__) ++#define SIZEOF_STRUCT_USTAT 32 ++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ ++ || defined(__powerpc__) || defined(__s390__) ++#define SIZEOF_STRUCT_USTAT 20 ++#else ++#error Unknown size of struct ustat ++#endif ++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; + unsigned struct_rlimit64_sz = sizeof(struct rlimit64); + unsigned struct_statvfs64_sz = sizeof(struct statvfs64); + #endif // SANITIZER_LINUX && !SANITIZER_ANDROID -- cgit v1.2.3 From 95895d53b06015fa74f07643cf98f86ae21551d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 Aug 2018 13:32:29 +0200 Subject: gnu: m4: Fix FTBFS with glibc >= 2.28. * gnu/packages/patches/m4-gnulib-libio.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/m4.scm (m4)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/m4.scm | 1 + gnu/packages/patches/m4-gnulib-libio.patch | 128 +++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 gnu/packages/patches/m4-gnulib-libio.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9c79e843a8..ab21d6b28e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -960,6 +960,7 @@ dist_patch_DATA = \ %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \ %D%/packages/patches/mutt-store-references.patch \ %D%/packages/patches/myrepos-CVE-2018-7032.patch \ + %D%/packages/patches/m4-gnulib-libio.patch \ %D%/packages/patches/net-tools-bitrot.patch \ %D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netcdf-tst_h_par.patch \ diff --git a/gnu/packages/m4.scm b/gnu/packages/m4.scm index b223ce91d1..090f5578e3 100644 --- a/gnu/packages/m4.scm +++ b/gnu/packages/m4.scm @@ -32,6 +32,7 @@ (method url-fetch) (uri (string-append "mirror://gnu/m4/m4-" version ".tar.xz")) + (patches (search-patches "m4-gnulib-libio.patch")) (sha256 (base32 "01sfjd5a4waqw83bibvmn522g69qfqvwig9i2qlgy154l1nfihgj")))) diff --git a/gnu/packages/patches/m4-gnulib-libio.patch b/gnu/packages/patches/m4-gnulib-libio.patch new file mode 100644 index 0000000000..a26622ccf3 --- /dev/null +++ b/gnu/packages/patches/m4-gnulib-libio.patch @@ -0,0 +1,128 @@ +Adjust the bundled gnulib to cope with removal of libio interface in +glibc 2.28. + +Based on this upstream patch, without hunks that do not apply to m4: +https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e + +diff --git a/lib/fflush.c b/lib/fflush.c +index 983ade0..a6edfa1 100644 +--- a/lib/fflush.c ++++ b/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, Minix 3, 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/lib/fpending.c b/lib/fpending.c +index c84e3a5..789f50e 100644 +--- a/lib/fpending.c ++++ b/lib/fpending.c +@@ -32,7 +32,7 @@ __fpending (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->_IO_write_ptr - fp->_IO_write_base; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ +diff --git a/lib/fpurge.c b/lib/fpurge.c +index b1d417c..3aedcc3 100644 +--- a/lib/fpurge.c ++++ b/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/lib/freadahead.c b/lib/freadahead.c +index c2ecb5b..23ec76e 100644 +--- a/lib/freadahead.c ++++ b/lib/freadahead.c +@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *); + 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/lib/freading.c b/lib/freading.c +index 73c28ac..c24d0c8 100644 +--- a/lib/freading.c ++++ b/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/lib/fseeko.c b/lib/fseeko.c +index 0101ab5..193f4e8 100644 +--- a/lib/fseeko.c ++++ b/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/lib/stdio-impl.h b/lib/stdio-impl.h +index 78d896e..05c5752 100644 +--- a/lib/stdio-impl.h ++++ b/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. */ + -- cgit v1.2.3 From c7b87eeda272fcc6c9212452355ad5b4f780bb36 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 Aug 2018 13:54:44 +0200 Subject: gnu: gzip: Fix FTBFS with glibc >= 2.28. * gnu/packages/compression.scm (gzip)[arguments]: Add phase 'patch-for-glibc-2.28'. --- gnu/packages/compression.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index bdae21ff64..95cf533327 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -225,6 +225,21 @@ adding and extracting files to/from a tar archive.") '(#:tests? #f #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-for-glibc-2.28 + (lambda _ + ;; Adjust the bundled gnulib to work with glibc 2.28. See e.g. + ;; "m4-gnulib-libio.patch". This is a phase rather than patch + ;; or snippet to work around . + (substitute* (find-files "lib" "\\.c$") + (("#if defined _IO_ftrylockfile") + "#if defined _IO_EOF_SEEN")) + (substitute* "lib/stdio-impl.h" + (("^/\\* BSD stdio derived implementations") + (string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n" + "# define _IO_IN_BACKUP 0x100\n" + "#endif\n\n" + "/* BSD stdio derived implementations"))) + #t)) (add-after 'unpack 'use-absolute-name-of-gzip (lambda* (#:key outputs #:allow-other-keys) (substitute* "gunzip.in" -- cgit v1.2.3 From a8dcf6cec7c5ded4bd0967f00b9b502d7d66e5ef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Aug 2018 16:14:07 +0200 Subject: gnu: coreutils: Update to 8.30. * gnu/packages/base.scm (coreutils): Update to 8.30. [arguments]: Add phase to skip broken test. --- gnu/packages/base.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c073672473..114413bafc 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -326,14 +326,14 @@ used to apply commands with arbitrarily long arguments.") (define-public coreutils (package (name "coreutils") - (version "8.29") + (version "8.30") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/coreutils/coreutils-" version ".tar.xz")) (sha256 (base32 - "0plm1zs9il6bb5mk881qvbghq4glc8ybbgakk2lfzb0w64fgml4j")))) + "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8")))) (build-system gnu-build-system) (inputs `(("acl" ,acl) ; TODO: add SELinux ("gmp" ,gmp) ;bignums in 'expr', yay! @@ -364,7 +364,17 @@ used to apply commands with arbitrarily long arguments.") (substitute* (find-files "gnulib-tests" "\\.c$") (("/bin/sh") (which "sh"))) (substitute* (find-files "tests" "\\.sh$") - (("#!/bin/sh") (which "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))) ;; Work around a cross-compilation bug whereby libcoreutils.a would -- cgit v1.2.3 From 8c8ded2cc9201e69e87999bb40ef09c6c868deb8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Aug 2018 16:37:50 +0200 Subject: gnu: grep: Work around test failure with glibc 2.28. * gnu/packages/base.scm (grep)[arguments]: Add phase 'disable-failing-tests'. --- gnu/packages/base.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 114413bafc..1c652bcce4 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -102,6 +102,15 @@ command-line arguments, multiple languages, and so on.") (arguments `(#:phases (modify-phases %standard-phases + (add-before 'check 'disable-failing-tests + (lambda _ + ;; These tests are expected to fail due to a glibc bug which has + ;; been fixed in 2.28, so they are unexpectedly passing. They + ;; should be fixed for grep versions > 3.1. + (substitute* "tests/Makefile.in" + (("^[[:blank:]]+backref-alt[[:blank:]]+\\\\") "\\") + (("^[[:blank:]]+triple-backref[[:blank:]]+\\\\") "\\")) + #t)) (add-after 'install 'fix-egrep-and-fgrep ;; Patch 'egrep' and 'fgrep' to execute 'grep' via its ;; absolute file name instead of searching for it in $PATH. -- cgit v1.2.3 From 2fa4066c0a7c44ec5686a6197542e56c9e47fa45 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Aug 2018 17:24:51 +0200 Subject: gnu: findutils: Fix build with glibc 2.28. * gnu/packages/patches/findutils-gnulib-libio.patch, gnu/packages/patches/findutils-makedev.patch: New files. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/base.scm (findutils)[source](patches): Use them. --- gnu/local.mk | 2 + gnu/packages/base.scm | 2 + gnu/packages/patches/findutils-gnulib-libio.patch | 114 ++++++++++++++++++++++ gnu/packages/patches/findutils-makedev.patch | 22 +++++ 4 files changed, 140 insertions(+) create mode 100644 gnu/packages/patches/findutils-gnulib-libio.patch create mode 100644 gnu/packages/patches/findutils-makedev.patch diff --git a/gnu/local.mk b/gnu/local.mk index ab21d6b28e..e98973be07 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -671,7 +671,9 @@ 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/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 \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 1c652bcce4..3a1186673e 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -298,7 +298,9 @@ interactive means to merge two files.") (base32 "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y")) (patches (search-patches + "findutils-gnulib-libio.patch" "findutils-localstatedir.patch" + "findutils-makedev.patch" "findutils-test-xargs.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/findutils-gnulib-libio.patch b/gnu/packages/patches/findutils-gnulib-libio.patch new file mode 100644 index 0000000000..79f9fd914d --- /dev/null +++ b/gnu/packages/patches/findutils-gnulib-libio.patch @@ -0,0 +1,114 @@ +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 new file mode 100644 index 0000000000..2f16c625d8 --- /dev/null +++ b/gnu/packages/patches/findutils-makedev.patch @@ -0,0 +1,22 @@ +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, -- cgit v1.2.3 From 34f4c214b63c46ee609bbaa15b063e20bc739ce3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 15:34:59 +0200 Subject: gnu: flex: Update bison-for-tests to 3.0.5. * gnu/packages/flex.scm (flex)[inputs]: Make BISON-FOR-TESTS inherit source from BISON, and disable tests on it since they require flex. --- gnu/packages/flex.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index 29c5c92766..e08b0c13db 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -45,22 +45,10 @@ (build-system gnu-build-system) (inputs (let ((bison-for-tests - ;; Work around an incompatibility with Bison 3.0: - ;; . (package (inherit bison) - (version "2.7.1") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://gnu/bison/" - "bison-" version ".tar.xz")) - (sha256 - (base32 - "1yx7isx67sdmyijvihgyra1f59fwdz7sqriginvavfj5yb5ss2dl")))) - - ;; Unlike Bison 3.0, this version did not need Flex for its - ;; tests, so it allows us to break the cycle. + ;; Disable tests, since they require flex. + (arguments '(#:tests? #f)) (inputs (alist-delete "flex" (package-inputs bison)))))) `(("bison" ,bison-for-tests) ("indent" ,indent)))) -- cgit v1.2.3 From cf59c62853c079938f3e415a2fb0c5821df7c607 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 15:37:35 +0200 Subject: gnu: Remove bison@2.7. * gnu/packages/bison.scm (bison-2.7): Remove variable. --- gnu/packages/bison.scm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 3e47a2a1b2..71de47762d 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -53,15 +53,3 @@ deterministic or generalized LR parser from an annotated, context-free grammar. It is versatile enough to have many applications, from parsers for simple tools through complex programming languages.") (license gpl3+))) - -(define-public bison-2.7 - (package (inherit bison) - (version "2.7") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/bison/bison-" - version ".tar.xz")) - (sha256 - (base32 - "1zd77ilmpv5mi3kr55jrj6ncqlcnyhpianhrwzak2q28cv2cbn23")))))) -- cgit v1.2.3 From 27c1df05a866b639a61e16d48b3f2da8fa5eb767 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 16:27:46 +0200 Subject: gnu: linux-libre-headers: Update to 4.14.67. * gnu/packages/linux.scm (linux-libre-headers): Update to 4.14.67. --- 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 cbb8f8f01f..0dbbbe3f60 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -163,13 +163,13 @@ defconfig. Return the appropriate make target if applicable, otherwise return (define-public linux-libre-headers (package (name "linux-libre-headers") - (version "4.14.26") + (version "4.14.67") (source (origin (method url-fetch) (uri (linux-libre-urls version)) (sha256 (base32 - "1m2zr17wpasg5riysbaa4g5i492jzr93py2jm088ki818s4a9cm3")))) + "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) (arguments -- cgit v1.2.3 From 65ba72d74954e85412144b4737fccfa914ff107b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 16:57:35 +0200 Subject: gnu: libx11: Remove graft for 1.6.6. * gnu/packages/xorg.scm (libx11): Update to 1.6.6. [replacement]: Remove field. (libx11-1.6.6): Remove variable. --- gnu/packages/xorg.scm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3875765d25..787a508ab5 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5238,8 +5238,7 @@ draggable titlebars and borders.") (define-public libx11 (package (name "libx11") - (version "1.6.5") - (replacement libx11-1.6.6) + (version "1.6.6") (source (origin (method url-fetch) @@ -5249,7 +5248,7 @@ draggable titlebars and borders.") ".tar.bz2")) (sha256 (base32 - "0pa3cfp6h9rl2vxmkph65250gfqyki0ccqyaan6bl9d25gdr0f2d")))) + "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;8 MiB of man pages + XML @@ -5269,20 +5268,6 @@ draggable titlebars and borders.") (description "Xorg Core X11 protocol client library.") (license license:x11))) -;; Replacement package to fix multiple security bugs: -;; . -(define-public libx11-1.6.6 - (package - (inherit libx11) - (version "1.6.6") - (source (origin - (method url-fetch) - (uri (string-append "mirror://xorg/individual/lib/libX11-" - version ".tar.bz2")) - (sha256 - (base32 - "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5")))))) - ;; packages of height 5 in the propagated-inputs tree (define-public libxcursor -- cgit v1.2.3 From c37e932764f42df90b77b97af4dd71e5b485800b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 19:23:35 +0200 Subject: gnu: gdb: Remove obsolete patch. * gnu/packages/patches/gdb-python-3.7.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/gdb.scm (gdb)[source](patches): Remove field. --- gnu/local.mk | 1 - gnu/packages/gdb.scm | 1 - gnu/packages/patches/gdb-python-3.7.patch | 52 ------------------------------- 3 files changed, 54 deletions(-) delete mode 100644 gnu/packages/patches/gdb-python-3.7.patch diff --git a/gnu/local.mk b/gnu/local.mk index aac3a66577..bacfc28c6e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -716,7 +716,6 @@ dist_patch_DATA = \ %D%/packages/patches/gd-CVE-2018-5711.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ - %D%/packages/patches/gdb-python-3.7.patch \ %D%/packages/patches/gdm-CVE-2018-14424.patch \ %D%/packages/patches/gemma-intel-compat.patch \ %D%/packages/patches/geoclue-config.patch \ diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index d7b194685c..f0c4c8b804 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -42,7 +42,6 @@ (method url-fetch) (uri (string-append "mirror://gnu/gdb/gdb-" version ".tar.xz")) - (patches (search-patches "gdb-python-3.7.patch")) (sha256 (base32 "0g6hv9xk12aa58w77fydaldqr9a6b0a6bnwsq87jfc6lkcbc7p4p")))) diff --git a/gnu/packages/patches/gdb-python-3.7.patch b/gnu/packages/patches/gdb-python-3.7.patch deleted file mode 100644 index c51442c8b2..0000000000 --- a/gnu/packages/patches/gdb-python-3.7.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build failure with Python 3.7 and newer. - -Taken from this upstream commit, sans ChangeLog update: - -https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=aeab512851bf6ed623d1c6c4305b6ce05e51a10c - -diff --git a/gdb/python/python.c b/gdb/python/python.c -index 1805c90..20fc674 100644 ---- a/gdb/python/python.c -+++ b/gdb/python/python.c -@@ -1667,6 +1667,17 @@ finalize_python (void *ignore) - restore_active_ext_lang (previous_active); - } - -+#ifdef IS_PY3K -+/* This is called via the PyImport_AppendInittab mechanism called -+ during initialization, to make the built-in _gdb module known to -+ Python. */ -+PyMODINIT_FUNC -+init__gdb_module (void) -+{ -+ return PyModule_Create (&python_GdbModuleDef); -+} -+#endif -+ - static bool - do_start_initialization () - { -@@ -1707,6 +1718,9 @@ do_start_initialization () - remain alive for the duration of the program's execution, so - it is not freed after this call. */ - Py_SetProgramName (progname_copy); -+ -+ /* Define _gdb as a built-in module. */ -+ PyImport_AppendInittab ("_gdb", init__gdb_module); - #else - Py_SetProgramName (progname.release ()); - #endif -@@ -1716,9 +1730,7 @@ do_start_initialization () - PyEval_InitThreads (); - - #ifdef IS_PY3K -- gdb_module = PyModule_Create (&python_GdbModuleDef); -- /* Add _gdb module to the list of known built-in modules. */ -- _PyImport_FixupBuiltin (gdb_module, "_gdb"); -+ gdb_module = PyImport_ImportModule ("_gdb"); - #else - gdb_module = Py_InitModule ("_gdb", python_GdbMethods); - #endif --- -2.9.3 - -- cgit v1.2.3 From fa2146f769fd5323081561141073108964524062 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Aug 2018 20:13:08 +0200 Subject: gnu: xkeyboard-config: Update to 2.24. * gnu/packages/xorg.scm (xkeyboard-config): Update to 2.24. --- 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 787a508ab5..5de3becf79 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3834,7 +3834,7 @@ extension to the X11 protocol. It includes: (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.23.1") + (version "2.24") (source (origin (method url-fetch) @@ -3844,7 +3844,7 @@ extension to the X11 protocol. It includes: ".tar.bz2")) (sha256 (base32 - "1wq27cs1c9y7d1d7zp5yhq29paj9smajdb68lyvm28d2zq2vqjra")))) + "1my4786pd7iv5x392r9skj3qclmbd26nqzvh2fllwkkbyj08bcci")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 7d01ee66d46c30152f1a8c855c20042e376d207c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 18 Jul 2018 14:11:16 -0400 Subject: gnu: Add avogadro. * gnu/packages/chemistry.scm (avogadro): New variable. * gnu/packages/patches/avogadro-boost148.patch, gnu/packages/patches/avogadro-eigen3-update.patch, gnu/packages/patches/avogadro-python-eigen-lib.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. --- gnu/local.mk | 3 + gnu/packages/chemistry.scm | 80 +++ gnu/packages/patches/avogadro-boost148.patch | 69 +++ gnu/packages/patches/avogadro-eigen3-update.patch | 603 +++++++++++++++++++++ .../patches/avogadro-python-eigen-lib.patch | 161 ++++++ 5 files changed, 916 insertions(+) create mode 100644 gnu/packages/patches/avogadro-boost148.patch create mode 100644 gnu/packages/patches/avogadro-eigen3-update.patch create mode 100644 gnu/packages/patches/avogadro-python-eigen-lib.patch diff --git a/gnu/local.mk b/gnu/local.mk index 60db25a60c..b1bd1c089c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -584,6 +584,9 @@ dist_patch_DATA = \ %D%/packages/patches/audacity-build-with-system-portaudio.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \ %D%/packages/patches/avahi-localstatedir.patch \ + %D%/packages/patches/avogadro-boost148.patch \ + %D%/packages/patches/avogadro-eigen3-update.patch \ + %D%/packages/patches/avogadro-python-eigen-lib.patch \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/azr3.patch \ diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 2d7cb7aad1..03120aaeee 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -23,16 +23,96 @@ #:use-module (guix download) #:use-module (gnu packages) #:use-module (gnu packages algebra) + #:use-module (gnu packages boost) #:use-module (gnu packages compression) + #:use-module (gnu packages documentation) + #:use-module (gnu packages gl) #:use-module (gnu packages gv) #:use-module (gnu packages maths) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages qt) #:use-module (gnu packages xml) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) +(define-public avogadro + (package + (name "avogadro") + (version "1.2.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/cryos/avogadro/archive/" + version ".tar.gz")) + (sha256 + (base32 + "02v4h6hi1m7ilv0apdf74a8l1cm6dxnxyqp0rdaidrp3i9pf6lv4")) + (file-name (string-append name "-" version ".tar.gz")) + (patches + (search-patches "avogadro-eigen3-update.patch" + "avogadro-python-eigen-lib.patch" + "avogadro-boost148.patch")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f + #:configure-flags + (list "-DENABLE_GLSL=ON" + (string-append "-DPYTHON_LIBRARIES=" + (assoc-ref %build-inputs "python") + "/lib") + (string-append "-DPYTHON_INCLUDE_DIRS=" + (assoc-ref %build-inputs "python") + "/include/python2.7")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-python-lib-path + (lambda* (#:key outputs #:allow-other-keys) + ;; This is necessary to install the Python module in the correct + ;; directory. + (substitute* "libavogadro/src/python/CMakeLists.txt" + (("^EXECUTE_PROCESS.*$") "") + (("^.*from sys import stdout.*$") "") + (("^.*OUTPUT_VARIABLE.*") + (string-append "set(PYTHON_LIB_PATH \"" + (assoc-ref outputs "out") + "/lib/python2.7/site-packages\")"))) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Make sure 'avogadro' runs with the correct PYTHONPATH. + (let* ((out (assoc-ref outputs "out"))) + (setenv "PYTHONPATH" + (string-append + (assoc-ref outputs "out") + "/lib/python2.7/site-packages:" + (getenv "PYTHONPATH"))) + (wrap-program (string-append out "/bin/avogadro") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))) + #t))))) + (native-inputs + `(("doxygen" ,doxygen) + ("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost) + ("eigen" ,eigen) + ("glew" ,glew) + ("openbabel" ,openbabel) + ("python" ,python-2) + ("python-numpy" ,python2-numpy) + ("python-pyqt" ,python2-pyqt-4) + ("python-sip" ,python2-sip) + ("qt" ,qt-4) + ("zlib" ,zlib))) + (home-page "https://avogadro.cc") + (synopsis "Advanced molecule editor") + (description + "Avogadro is an advanced molecule editor and visualizer designed for use +in computational chemistry, molecular modeling, bioinformatics, materials +science, and related areas. It offers flexible high quality rendering and a +powerful plugin architecture.") + (license license:gpl2+))) + (define-public domainfinder (package (name "domainfinder") diff --git a/gnu/packages/patches/avogadro-boost148.patch b/gnu/packages/patches/avogadro-boost148.patch new file mode 100644 index 0000000000..f244f14674 --- /dev/null +++ b/gnu/packages/patches/avogadro-boost148.patch @@ -0,0 +1,69 @@ +Index: avogadro-1.2.0/libavogadro/src/pythonengine_p.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythonengine_p.h ++++ avogadro-1.2.0/libavogadro/src/pythonengine_p.h +@@ -31,7 +31,9 @@ + + #include + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + namespace Avogadro { + +Index: avogadro-1.2.0/libavogadro/src/pythonextension_p.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythonextension_p.h ++++ avogadro-1.2.0/libavogadro/src/pythonextension_p.h +@@ -33,7 +33,9 @@ + #include + #include + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: avogadro-1.2.0/libavogadro/src/pythontool_p.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythontool_p.h ++++ avogadro-1.2.0/libavogadro/src/pythontool_p.h +@@ -31,7 +31,9 @@ + + #include + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +Index: avogadro-1.2.0/libavogadro/src/pythoninterpreter.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythoninterpreter.h ++++ avogadro-1.2.0/libavogadro/src/pythoninterpreter.h +@@ -26,7 +26,9 @@ + #define PYTHONINTERPRETER_H + + #include ++#ifndef Q_MOC_RUN + #include ++#endif + #include + #include + +Index: avogadro-1.2.0/libavogadro/src/pythonscript.h +=================================================================== +--- avogadro-1.2.0.orig/libavogadro/src/pythonscript.h ++++ avogadro-1.2.0/libavogadro/src/pythonscript.h +@@ -27,6 +27,8 @@ + #define PYTHONSCRIPT_H + + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "pythonerror.h" diff --git a/gnu/packages/patches/avogadro-eigen3-update.patch b/gnu/packages/patches/avogadro-eigen3-update.patch new file mode 100644 index 0000000000..a5f669292f --- /dev/null +++ b/gnu/packages/patches/avogadro-eigen3-update.patch @@ -0,0 +1,603 @@ +From 43af3c117b0b3220b15c2fe2895b94bbd83d3a60 Mon Sep 17 00:00:00 2001 +From: Claudio Fernandes +Date: Sun, 15 Jan 2017 21:23:39 -0200 +Subject: [PATCH] Adapt Avogadro to Eigen 3.3 + +--- + CMakeLists.txt | 9 +------ + avogadro/src/mainwindow.cpp | 5 ++-- + libavogadro/src/camera.cpp | 10 ++++---- + libavogadro/src/camera.h | 14 +++++------ + libavogadro/src/engines/wireengine.cpp | 4 ++-- + .../crystallography/crystallographyextension.cpp | 2 +- + .../crystallography/ui/ceviewoptionswidget.cpp | 2 +- + .../src/extensions/orca/orcaanalysedialog.cpp | 1 - + .../src/extensions/orca/orcainputdialog.cpp | 1 - + .../src/extensions/qtaim/qtaimmathutilities.cpp | 1 + + .../qtaim/qtaimwavefunctionevaluator.cpp | 28 +++++++++++----------- + .../extensions/surfaces/openqube/gamessukout.cpp | 1 + + .../src/extensions/surfaces/openqube/slaterset.cpp | 6 +++-- + libavogadro/src/glpainter_p.cpp | 14 +++++------ + libavogadro/src/glwidget.cpp | 4 ++-- + libavogadro/src/molecule.cpp | 26 ++++++++++++++++++-- + libavogadro/src/navigate.cpp | 2 +- + libavogadro/src/tools/bondcentrictool.cpp | 28 +++++++++++----------- + libavogadro/src/tools/manipulatetool.cpp | 17 +++++++------ + libavogadro/src/tools/navigatetool.cpp | 3 ++- + libavogadro/src/tools/skeletontree.cpp | 7 +++--- + libavogadro/src/tools/skeletontree.h | 2 +- + 22 files changed, 102 insertions(+), 85 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -231,14 +231,7 @@ if(NOT Linguist_FOUND) + message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations") + endif() + +-find_package(Eigen3) # find and setup Eigen3 if available +-if(NOT EIGEN3_FOUND) +- message(STATUS "Cannot find Eigen3, trying Eigen2") +- find_package(Eigen2 REQUIRED) # Some version is required +-else() +-# Use Stage10 Eigen3 support +- set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE) +-endif() ++find_package(Eigen3 REQUIRED) # find and setup Eigen3 if available + + find_package(ZLIB REQUIRED) + find_package(OpenBabel2 REQUIRED) # find and setup OpenBabel +--- a/avogadro/src/mainwindow.cpp ++++ b/avogadro/src/mainwindow.cpp +@@ -115,7 +115,6 @@ + #include + + #include +-#include + #define USEQUAT + // This is a "hidden" exported Qt function on the Mac for Qt-4.x. + #ifdef Q_WS_MAC +@@ -2775,7 +2774,7 @@ protected: + linearGoal.row(1) = linearGoal.row(2).cross(linearGoal.row(0)); + + // calculate the translation matrix +- Transform3d goal(linearGoal); ++ Projective3d goal(linearGoal); + + goal.pretranslate(- 3.0 * (d->glWidget->radius() + CAMERA_NEAR_DISTANCE) * Vector3d::UnitZ()); + +@@ -2840,7 +2839,7 @@ protected: + Matrix3d linearGoal = Matrix3d::Identity(); + + // calculate the translation matrix +- Transform3d goal(linearGoal); ++ Projective3d goal(linearGoal); + + goal.pretranslate(- 3.0 * (d->glWidget->radius() + CAMERA_NEAR_DISTANCE) * Vector3d::UnitZ()); + +--- a/libavogadro/src/camera.cpp ++++ b/libavogadro/src/camera.cpp +@@ -47,7 +47,7 @@ namespace Avogadro + + CameraPrivate() {}; + +- Eigen::Transform3d modelview, projection; ++ Eigen::Projective3d modelview, projection; + const GLWidget *parent; + double angleOfViewY; + double orthoScale; +@@ -169,20 +169,20 @@ namespace Avogadro + + double Camera::distance(const Eigen::Vector3d & point) const + { +- return ( d->modelview * point ).norm(); ++ return ( d->modelview * point.homogeneous() ).head<3>().norm(); + } + +- void Camera::setModelview(const Eigen::Transform3d &matrix) ++ void Camera::setModelview(const Eigen::Projective3d &matrix) + { + d->modelview = matrix; + } + +- const Eigen::Transform3d & Camera::modelview() const ++ const Eigen::Projective3d & Camera::modelview() const + { + return d->modelview; + } + +- Eigen::Transform3d & Camera::modelview() ++ Eigen::Projective3d & Camera::modelview() + { + return d->modelview; + } +--- a/libavogadro/src/camera.h ++++ b/libavogadro/src/camera.h +@@ -101,16 +101,16 @@ namespace Avogadro { + double angleOfViewY() const; + /** Sets 4x4 "modelview" matrix representing the camera orientation and position. + * @param matrix the matrix to copy from +- * @sa Eigen::Transform3d & modelview(), applyModelview() */ +- void setModelview(const Eigen::Transform3d &matrix); ++ * @sa Eigen::Projective3d & modelview(), applyModelview() */ ++ void setModelview(const Eigen::Projective3d &matrix); + /** @return a constant reference to the 4x4 "modelview" matrix representing + * the camera orientation and position +- * @sa setModelview(), Eigen::Transform3d & modelview() */ +- const Eigen::Transform3d & modelview() const; ++ * @sa setModelview(), Eigen::Projective3d & modelview() */ ++ const Eigen::Projective3d & modelview() const; + /** @return a non-constant reference to the 4x4 "modelview" matrix representing + * the camera orientation and position +- * @sa setModelview(), const Eigen::Transform3d & modelview() const */ +- Eigen::Transform3d & modelview(); ++ * @sa setModelview(), const Eigen::Projective3d & modelview() const */ ++ Eigen::Projective3d & modelview(); + /** Calls gluPerspective() or glOrtho() with parameters automatically chosen + * for rendering the GLWidget's molecule with this camera. Should be called + * only in GL_PROJECTION matrix mode. Example code is given +@@ -342,7 +342,7 @@ namespace Avogadro { + * @return {x/w, y/w, z/w} vector + */ + Eigen::Vector3d V4toV3DivW(const Eigen::Vector4d & v4) { +- return v4.start<3>()/v4.w(); ++ return v4.head<3>()/v4.w(); + } + }; + +--- a/libavogadro/src/engines/wireengine.cpp ++++ b/libavogadro/src/engines/wireengine.cpp +@@ -109,7 +109,7 @@ namespace Avogadro { + const Camera *camera = pd->camera(); + + // perform a rough form of frustum culling +- Eigen::Vector3d transformedPos = pd->camera()->modelview() * v; ++ Eigen::Vector3d transformedPos = (pd->camera()->modelview() * v.homogeneous()).head<3>(); + double dot = transformedPos.z() / transformedPos.norm(); + if(dot > -0.8) + return true; +@@ -167,7 +167,7 @@ namespace Avogadro { + map = pd->colorMap(); // fall back to global color map + + // perform a rough form of frustum culling +- Eigen::Vector3d transformedEnd1 = pd->camera()->modelview() * v1; ++ Eigen::Vector3d transformedEnd1 = (pd->camera()->modelview() * v1.homogeneous()).head<3>(); + double dot = transformedEnd1.z() / transformedEnd1.norm(); + if(dot > -0.8) + return true; // i.e., don't bother rendering +--- a/libavogadro/src/extensions/crystallography/crystallographyextension.cpp ++++ b/libavogadro/src/extensions/crystallography/crystallographyextension.cpp +@@ -1989,7 +1989,7 @@ namespace Avogadro + // fix coordinates + // Apply COB matrix: + Eigen::Matrix3d invCob; +- cob.computeInverse(&invCob); ++ invCob = cob.inverse(); + for (QList::iterator + it = fcoords.begin(), + it_end = fcoords.end(); +--- a/libavogadro/src/extensions/crystallography/ui/ceviewoptionswidget.cpp ++++ b/libavogadro/src/extensions/crystallography/ui/ceviewoptionswidget.cpp +@@ -139,7 +139,7 @@ namespace Avogadro + { + // View into a Miller plane + Camera *camera = m_glWidget->camera(); +- Eigen::Transform3d modelView; ++ Eigen::Projective3d modelView; + modelView.setIdentity(); + + // OK, so we want to rotate to look along the normal at the plane +--- a/libavogadro/src/extensions/orca/orcaanalysedialog.cpp ++++ b/libavogadro/src/extensions/orca/orcaanalysedialog.cpp +@@ -41,7 +41,6 @@ + #include + + #include +-#include + + #include + +--- a/libavogadro/src/extensions/orca/orcainputdialog.cpp ++++ b/libavogadro/src/extensions/orca/orcainputdialog.cpp +@@ -33,7 +33,6 @@ + #include + + #include +-#include + + #include + +--- a/libavogadro/src/extensions/qtaim/qtaimmathutilities.cpp ++++ b/libavogadro/src/extensions/qtaim/qtaimmathutilities.cpp +@@ -28,6 +28,7 @@ + + #include + #include ++#include + + namespace Avogadro { + namespace QTAIMMathUtilities { +--- a/libavogadro/src/extensions/qtaim/qtaimwavefunctionevaluator.cpp ++++ b/libavogadro/src/extensions/qtaim/qtaimwavefunctionevaluator.cpp +@@ -35,21 +35,21 @@ namespace Avogadro + m_nprim=wfn.numberOfGaussianPrimitives(); + m_nnuc=wfn.numberOfNuclei(); + +- m_nucxcoord=Map >(wfn.xNuclearCoordinates(),m_nnuc); +- m_nucycoord=Map >(wfn.yNuclearCoordinates(),m_nnuc); +- m_nuczcoord=Map >(wfn.zNuclearCoordinates(),m_nnuc); +- m_nucz=Map >(wfn.nuclearCharges(),m_nnuc); +- m_X0=Map >(wfn.xGaussianPrimitiveCenterCoordinates(),m_nprim,1); +- m_Y0=Map >(wfn.yGaussianPrimitiveCenterCoordinates(),m_nprim,1); +- m_Z0=Map >(wfn.zGaussianPrimitiveCenterCoordinates(),m_nprim,1); +- m_xamom=Map >(wfn.xGaussianPrimitiveAngularMomenta(),m_nprim,1); +- m_yamom=Map >(wfn.yGaussianPrimitiveAngularMomenta(),m_nprim,1); +- m_zamom=Map >(wfn.zGaussianPrimitiveAngularMomenta(),m_nprim,1); +- m_alpha=Map >(wfn.gaussianPrimitiveExponentCoefficients(),m_nprim,1); ++ m_nucxcoord=Map >(const_cast(wfn.xNuclearCoordinates()),m_nnuc); ++ m_nucycoord=Map >(const_cast(wfn.yNuclearCoordinates()),m_nnuc); ++ m_nuczcoord=Map >(const_cast(wfn.zNuclearCoordinates()),m_nnuc); ++ m_nucz=Map >(const_cast(wfn.nuclearCharges()),m_nnuc); ++ m_X0=Map >(const_cast(wfn.xGaussianPrimitiveCenterCoordinates()),m_nprim,1); ++ m_Y0=Map >(const_cast(wfn.yGaussianPrimitiveCenterCoordinates()),m_nprim,1); ++ m_Z0=Map >(const_cast(wfn.zGaussianPrimitiveCenterCoordinates()),m_nprim,1); ++ m_xamom=Map >(const_cast(wfn.xGaussianPrimitiveAngularMomenta()),m_nprim,1); ++ m_yamom=Map >(const_cast(wfn.yGaussianPrimitiveAngularMomenta()),m_nprim,1); ++ m_zamom=Map >(const_cast(wfn.zGaussianPrimitiveAngularMomenta()),m_nprim,1); ++ m_alpha=Map >(const_cast(wfn.gaussianPrimitiveExponentCoefficients()),m_nprim,1); + // TODO Implement screening for unoccupied molecular orbitals. +- m_occno=Map >(wfn.molecularOrbitalOccupationNumbers(),m_nmo,1); +- m_orbe=Map >(wfn.molecularOrbitalEigenvalues(),m_nmo,1); +- m_coef=Map >(wfn.molecularOrbitalCoefficients(),m_nmo,m_nprim); ++ m_occno=Map >(const_cast(wfn.molecularOrbitalOccupationNumbers()),m_nmo,1); ++ m_orbe=Map >(const_cast(wfn.molecularOrbitalEigenvalues()),m_nmo,1); ++ m_coef=Map >(const_cast(wfn.molecularOrbitalCoefficients()),m_nmo,m_nprim); + m_totalEnergy=wfn.totalEnergy(); + m_virialRatio=wfn.virialRatio(); + +--- a/libavogadro/src/extensions/surfaces/openqube/gamessukout.cpp ++++ b/libavogadro/src/extensions/surfaces/openqube/gamessukout.cpp +@@ -19,6 +19,7 @@ + using Eigen::Vector3d; + using std::vector; + ++#include + #include + + namespace OpenQube +--- a/libavogadro/src/extensions/surfaces/openqube/slaterset.cpp ++++ b/libavogadro/src/extensions/surfaces/openqube/slaterset.cpp +@@ -25,9 +25,9 @@ + + #include "cube.h" + +-#include + #include + #include ++#include + + #include + +@@ -250,7 +250,9 @@ bool SlaterSet::initialize() + + SelfAdjointEigenSolver s(m_overlap); + MatrixXd p = s.eigenvectors(); +- MatrixXd m = p * s.eigenvalues().cwise().inverse().cwise().sqrt().asDiagonal() * p.inverse(); ++ // TODO check if this is correct ++ MatrixXd m1 = (s.eigenvalues().array().inverse().sqrt()); ++ MatrixXd m = p.array()*(m1.diagonal().array())*p.inverse().array(); + m_normalized = m * m_eigenVectors; + + if (!(m_overlap*m*m).isIdentity()) +--- a/libavogadro/src/glpainter_p.cpp ++++ b/libavogadro/src/glpainter_p.cpp +@@ -789,13 +789,13 @@ namespace Avogadro + } else { + points[theta-1] = Eigen::AngleAxisd(theta * (M_PI / 180.0) / 2, n) * u; + } +- points[theta-1] = d->widget->camera()->modelview() * (origin + points[theta-1]); ++ points[theta-1] = (d->widget->camera()->modelview() * (origin + points[theta-1]).homogeneous()).head<3>(); + } + + // Get vectors representing the points' positions in terms of the model view. +- Eigen::Vector3d _origin = d->widget->camera()->modelview() * origin; +- Eigen::Vector3d _direction1 = d->widget->camera()->modelview() * (origin+u); +- Eigen::Vector3d _direction2 = d->widget->camera()->modelview() * (origin+v); ++ Eigen::Vector3d _origin = (d->widget->camera()->modelview() * origin.homogeneous()).head<3>(); ++ Eigen::Vector3d _direction1 = (d->widget->camera()->modelview() * (origin+u).homogeneous()).head<3>(); ++ Eigen::Vector3d _direction2 = (d->widget->camera()->modelview() * (origin+v).homogeneous()).head<3>(); + + glPushAttrib(GL_ALL_ATTRIB_BITS); + glPushMatrix(); +@@ -880,12 +880,12 @@ namespace Avogadro + } else { + points[theta-1] = Eigen::AngleAxisd(theta * (M_PI / 180.0) / 2, n) * u; + } +- points[theta-1] = d->widget->camera()->modelview() * (origin + points[theta-1]); ++ points[theta-1] = (d->widget->camera()->modelview() * (origin + points[theta-1]).homogeneous()).head<3>(); + } + + // Get vectors representing the points' positions in terms of the model view. +- Eigen::Vector3d _direction1 = d->widget->camera()->modelview() * (origin + u); +- Eigen::Vector3d _direction2 = d->widget->camera()->modelview() * (origin + v); ++ Eigen::Vector3d _direction1 = (d->widget->camera()->modelview() * (origin + u).homogeneous()).head<3>(); ++ Eigen::Vector3d _direction2 = (d->widget->camera()->modelview() * (origin + v).homogeneous()).head<3>(); + + glPushAttrib(GL_ALL_ATTRIB_BITS); + glPushMatrix(); +--- a/libavogadro/src/glwidget.cpp ++++ b/libavogadro/src/glwidget.cpp +@@ -765,7 +765,7 @@ namespace Avogadro { + GLfloat fogColor[4]= {static_cast(d->background.redF()), static_cast(d->background.greenF()), + static_cast(d->background.blueF()), static_cast(d->background.alphaF())}; + glFogfv(GL_FOG_COLOR, fogColor); +- Vector3d distance = camera()->modelview() * d->center; ++ Vector3d distance = (camera()->modelview() * d->center.homogeneous()).head<3>(); + double distanceToCenter = distance.norm(); + glFogf(GL_FOG_DENSITY, 1.0); + glHint(GL_FOG_HINT, GL_NICEST); +@@ -1711,7 +1711,7 @@ namespace Avogadro { + + if (d->renderModelViewDebug) { + // Model view matrix: +- const Eigen::Transform3d &modelview = d->camera->modelview(); ++ const Eigen::Projective3d &modelview = d->camera->modelview(); + y += d->pd->painter()->drawText + (x, y, tr("ModelView row 1: %L1 %L2 %L3 %L4") + .arg(modelview(0, 0), 6, 'f', 2, ' ') +--- a/libavogadro/src/molecule.cpp ++++ b/libavogadro/src/molecule.cpp +@@ -38,7 +38,7 @@ + #include "zmatrix.h" + + #include +-#include ++#include + + #include + +@@ -1907,7 +1907,29 @@ namespace Avogadro{ + } + d->center /= static_cast(nAtoms); + Eigen::Hyperplane planeCoeffs; +- Eigen::fitHyperplane(numAtoms(), atomPositions, &planeCoeffs); ++ //Eigen::fitHyperplane(numAtoms(), atomPositions, &planeCoeffs); ++ ++ // TODO check if this is OK ++ /************************/ ++ typedef Eigen::Matrix CovMatrixType; ++ typedef Eigen::Vector3d VectorType; ++ ++ VectorType mean = d->center; ++ int size=3; ++ int numPoints=numAtoms(); ++ VectorType ** points=atomPositions; ++ CovMatrixType covMat = CovMatrixType::Zero(size, size); ++ VectorType remean = VectorType::Zero(size); ++ for(int i = 0; i < numPoints; ++i) ++ { ++ VectorType diff = (*(points[i]) - mean).conjugate(); ++ covMat += diff * diff.adjoint(); ++ } ++ Eigen::SelfAdjointEigenSolver eig(covMat); ++ planeCoeffs.normal() = eig.eigenvectors().col(0); ++ /************************/ ++ ++ + delete[] atomPositions; + d->normalVector = planeCoeffs.normal(); + } +--- a/libavogadro/src/navigate.cpp ++++ b/libavogadro/src/navigate.cpp +@@ -40,7 +40,7 @@ namespace Avogadro { + void Navigate::zoom(GLWidget *widget, const Eigen::Vector3d &goal, + double delta) + { +- Vector3d transformedGoal = widget->camera()->modelview() * goal; ++ Vector3d transformedGoal = (widget->camera()->modelview() * goal.homogeneous()).head<3>(); + double distanceToGoal = transformedGoal.norm(); + + double t = ZOOM_SPEED * delta; +--- a/libavogadro/src/tools/bondcentrictool.cpp ++++ b/libavogadro/src/tools/bondcentrictool.cpp +@@ -578,8 +578,8 @@ namespace Avogadro { + + Vector3d clicked = *m_clickedAtom->pos(); + +- Vector3d axis = Vector3d(0, 0, ((widget->camera()->modelview() * other).z() >= +- (widget->camera()->modelview() * center).z() ? -1 : 1)); ++ Vector3d axis = Vector3d(0, 0, ((widget->camera()->modelview() * other.homogeneous()).z() >= ++ (widget->camera()->modelview() * center.homogeneous()).z() ? -1 : 1)); + + Vector3d centerProj = widget->camera()->project(center); + centerProj -= Vector3d(0,0,centerProj.z()); +@@ -673,8 +673,8 @@ namespace Avogadro { + + Vector3d clicked = *m_clickedAtom->pos(); + +- Vector3d axis = Vector3d(0, 0, ((widget->camera()->modelview() * other).z() >= +- (widget->camera()->modelview() * center).z() ? -1 : 1)); ++ Vector3d axis = Vector3d(0, 0, ((widget->camera()->modelview() * other.homogeneous()).z() >= ++ (widget->camera()->modelview() * center.homogeneous()).z() ? -1 : 1)); + + Vector3d centerProj = widget->camera()->project(center); + centerProj -= Vector3d(0,0,centerProj.z()); +@@ -1362,10 +1362,10 @@ namespace Avogadro { + + planeVec = length * (planeVec / planeVec.norm()); + +- Vector3d topLeft = widget->camera()->modelview() * (left + planeVec); +- Vector3d topRight = widget->camera()->modelview() * (right + planeVec); +- Vector3d botRight = widget->camera()->modelview() * (right - planeVec); +- Vector3d botLeft = widget->camera()->modelview() * (left - planeVec); ++ Vector3d topLeft = (widget->camera()->modelview() * (left + planeVec).homogeneous()).head<3>(); ++ Vector3d topRight = (widget->camera()->modelview() * (right + planeVec).homogeneous()).head<3>(); ++ Vector3d botRight = (widget->camera()->modelview() * (right - planeVec).homogeneous()).head<3>(); ++ Vector3d botLeft = (widget->camera()->modelview() * (left - planeVec).homogeneous()).head<3>(); + + float alpha = 0.4; + double lineWidth = 1.5; +@@ -1444,10 +1444,10 @@ namespace Avogadro { + C = D + ((C-D).normalized() * minWidth); + } + +- Vector3d topLeft = widget->camera()->modelview() * D; +- Vector3d topRight = widget->camera()->modelview() * C; +- Vector3d botRight = widget->camera()->modelview() * B; +- Vector3d botLeft = widget->camera()->modelview() * A; ++ Vector3d topLeft = (widget->camera()->modelview() * D.homogeneous()).head<3>(); ++ Vector3d topRight = (widget->camera()->modelview() * C.homogeneous()).head<3>(); ++ Vector3d botRight = (widget->camera()->modelview() * B.homogeneous()).head<3>(); ++ Vector3d botLeft = (widget->camera()->modelview() * A.homogeneous()).head<3>(); + + float alpha = 0.4; + double lineWidth = 1.5; +@@ -1506,12 +1506,12 @@ namespace Avogadro { + Vector3d positionVector) + { + //Rotate skeleton around a particular axis and center point +- Eigen::Transform3d rotation; ++ Eigen::Projective3d rotation; + rotation = Eigen::AngleAxisd(angle, rotationVector); + rotation.pretranslate(centerVector); + rotation.translate(-centerVector); + +- return rotation*positionVector; ++ return (rotation*positionVector.homogeneous()).head<3>(); + } + + // ########## showAnglesChanged ########## +--- a/libavogadro/src/tools/manipulatetool.cpp ++++ b/libavogadro/src/tools/manipulatetool.cpp +@@ -40,7 +40,6 @@ + #include + + using Eigen::Vector3d; +-using Eigen::Transform3d; + using Eigen::AngleAxisd; + + namespace Avogadro { +@@ -138,7 +137,7 @@ namespace Avogadro { + double yRotate = m_settingsWidget->yRotateSpinBox->value() * DEG_TO_RAD; + double zRotate = m_settingsWidget->zRotateSpinBox->value() * DEG_TO_RAD; + +- Eigen::Transform3d rotation; ++ Eigen::Projective3d rotation; + rotation.matrix().setIdentity(); + rotation.translation() = center; + rotation.rotate(AngleAxisd(xRotate, Vector3d::UnitX()) +@@ -152,12 +151,12 @@ namespace Avogadro { + if (p->type() == Primitive::AtomType) { + Atom *atom = static_cast(p); + tempPos = translate + *(atom->pos()); +- atom->setPos(rotation * tempPos); ++ atom->setPos((rotation * tempPos.homogeneous()).head<3>()); + } + } else { + foreach(Atom *atom, widget->molecule()->atoms()) { + tempPos = translate + *(atom->pos()); +- atom->setPos(rotation * tempPos); ++ atom->setPos((rotation * tempPos.homogeneous()).head<3>()); + } + } + +@@ -199,7 +198,7 @@ namespace Avogadro { + widget->setCursor(Qt::SizeVerCursor); + + // Move the selected atom(s) in to or out of the screen +- Vector3d transformedGoal = widget->camera()->modelview() * *goal; ++ Vector3d transformedGoal = (widget->camera()->modelview() * goal->homogeneous()).head<3>(); + double distanceToGoal = transformedGoal.norm(); + + double t = ZOOM_SPEED * delta; +@@ -255,7 +254,7 @@ namespace Avogadro { + + // Rotate the selected atoms about the center + // rotate only selected primitives +- Transform3d fragmentRotation; ++ Eigen::Projective3d fragmentRotation; + fragmentRotation.matrix().setIdentity(); + fragmentRotation.translation() = *center; + fragmentRotation.rotate( +@@ -266,7 +265,7 @@ namespace Avogadro { + + foreach(Primitive *p, widget->selectedPrimitives()) + if (p->type() == Primitive::AtomType) +- static_cast(p)->setPos(fragmentRotation * *static_cast(p)->pos()); ++ static_cast(p)->setPos((fragmentRotation * static_cast(p)->pos()->homogeneous()).head<3>()); + widget->molecule()->update(); + } + +@@ -274,7 +273,7 @@ namespace Avogadro { + double delta) const + { + // Tilt the selected atoms about the center +- Transform3d fragmentRotation; ++ Eigen::Projective3d fragmentRotation; + fragmentRotation.matrix().setIdentity(); + fragmentRotation.translation() = *center; + fragmentRotation.rotate(AngleAxisd(delta * ROTATION_SPEED, widget->camera()->backTransformedZAxis())); +@@ -282,7 +281,7 @@ namespace Avogadro { + + foreach(Primitive *p, widget->selectedPrimitives()) + if (p->type() == Primitive::AtomType) +- static_cast(p)->setPos(fragmentRotation * *static_cast(p)->pos()); ++ static_cast(p)->setPos((fragmentRotation * static_cast(p)->pos()->homogeneous()).head<3>()); + widget->molecule()->update(); + } + +--- a/libavogadro/src/tools/navigatetool.cpp ++++ b/libavogadro/src/tools/navigatetool.cpp +@@ -92,7 +92,8 @@ namespace Avogadro { + double sumOfWeights = 0.; + QList atoms = widget->molecule()->atoms(); + foreach (Atom *atom, atoms) { +- Vector3d transformedAtomPos = widget->camera()->modelview() * *atom->pos(); ++ Vector3d transformedAtomPos = (widget->camera()->modelview() * ++ atom->pos()->homogeneous()).head<3>(); + double atomDistance = transformedAtomPos.norm(); + double dot = transformedAtomPos.z() / atomDistance; + double weight = exp(-30. * (1. + dot)); +--- a/libavogadro/src/tools/skeletontree.cpp ++++ b/libavogadro/src/tools/skeletontree.cpp +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + using namespace Eigen; + using namespace std; +@@ -221,7 +222,7 @@ namespace Avogadro { + { + if (m_rootNode) { + //Rotate skeleton around a particular axis and center point +- Eigen::Transform3d rotation; ++ Eigen::Projective3d rotation; + rotation = Eigen::AngleAxisd(angle, rotationAxis); + rotation.pretranslate(centerVector); + rotation.translate(-centerVector); +@@ -248,11 +249,11 @@ namespace Avogadro { + // ########## recursiveRotate ########## + + void SkeletonTree::recursiveRotate(Node* n, +- const Eigen::Transform3d &rotationMatrix) ++ const Eigen::Projective3d &rotationMatrix) + { + // Update the root node with the new position + Atom* a = n->atom(); +- a->setPos(rotationMatrix * (*a->pos())); ++ a->setPos((rotationMatrix * (*a->pos()).homogeneous()).head<3>()); + a->update(); + + // Now update the children +--- a/libavogadro/src/tools/skeletontree.h ++++ b/libavogadro/src/tools/skeletontree.h +@@ -230,6 +230,6 @@ namespace Avogadro { + * @param centerVector Center location to rotate around. + */ + void recursiveRotate(Node* n, +- const Eigen::Transform3d &rotationMatrix); ++ const Eigen::Projective3d &rotationMatrix); + + }; + } // End namespace Avogadro \ No newline at end of file diff --git a/gnu/packages/patches/avogadro-python-eigen-lib.patch b/gnu/packages/patches/avogadro-python-eigen-lib.patch new file mode 100644 index 0000000000..ac9f2e30af --- /dev/null +++ b/gnu/packages/patches/avogadro-python-eigen-lib.patch @@ -0,0 +1,161 @@ +From 2d4be7ede177a8df7340fe3b209698d591ee8a04 Mon Sep 17 00:00:00 2001 +From: Claudio Fernandes +Date: Mon, 16 Jan 2017 19:48:23 -0200 +Subject: [PATCH] Adapt libavogadro/python to Eigen 3.3 + +--- + libavogadro/src/python/camera.cpp | 2 +- + libavogadro/src/python/eigen.cpp | 60 +++++++++++++++++++-------------------- + 2 files changed, 31 insertions(+), 31 deletions(-) + +diff --git a/libavogadro/src/python/camera.cpp b/libavogadro/src/python/camera.cpp +index 69ca87bf8..30b32af7d 100644 +--- a/libavogadro/src/python/camera.cpp ++++ b/libavogadro/src/python/camera.cpp +@@ -10,7 +10,7 @@ using namespace Avogadro; + void export_Camera() + { + +- const Eigen::Transform3d& (Camera::*modelview_ptr)() const = &Camera::modelview; ++ const Eigen::Projective3d& (Camera::*modelview_ptr)() const = &Camera::modelview; + Eigen::Vector3d (Camera::*unProject_ptr1)(const Eigen::Vector3d&) const = &Camera::unProject; + Eigen::Vector3d (Camera::*unProject_ptr2)(const QPoint&, const Eigen::Vector3d&) const = &Camera::unProject; + Eigen::Vector3d (Camera::*unProject_ptr3)(const QPoint&) const = &Camera::unProject; +diff --git a/libavogadro/src/python/eigen.cpp b/libavogadro/src/python/eigen.cpp +index c1faedbcc..20b4e719d 100644 +--- a/libavogadro/src/python/eigen.cpp ++++ b/libavogadro/src/python/eigen.cpp +@@ -305,9 +305,9 @@ template <> struct ScalarTraits + struct innerclass + { + // +- // Eigen::Transform3d --> python array (4x4) ++ // Eigen::Projective3d --> python array (4x4) + // +- static PyObject* convert(Eigen::Transform3d const &trans) ++ static PyObject* convert(Eigen::Projective3d const &trans) + { + npy_intp dims[2] = { 4, 4 }; + PyObject *result = PyArray_SimpleNew(2, dims, PyArray_DOUBLE); +@@ -321,9 +321,9 @@ template <> struct ScalarTraits + return incref(result); + } + // +- // Eigen::Transform3d* --> python array (4x4) ++ // Eigen::Projective3d* --> python array (4x4) + // +- static PyObject* convert(Eigen::Transform3d *trans) ++ static PyObject* convert(Eigen::Projective3d *trans) + { + npy_intp dims[2] = { 4, 4 }; + PyObject *result = PyArray_SimpleNew(2, dims, PyArray_DOUBLE); +@@ -337,9 +337,9 @@ template <> struct ScalarTraits + return incref(result); + } + // +- // const Eigen::Transform3d* --> python array (4x4) ++ // const Eigen::Projective3d* --> python array (4x4) + // +- static PyObject* convert(const Eigen::Transform3d *trans) ++ static PyObject* convert(const Eigen::Projective3d *trans) + { + npy_intp dims[2] = { 4, 4 }; + PyObject *result = PyArray_SimpleNew(2, dims, PyArray_DOUBLE); +@@ -358,10 +358,10 @@ template <> struct ScalarTraits + Transform3d_to_python_array() + { + #ifndef WIN32 +- to_python_converter(); ++ to_python_converter(); + #endif +- to_python_converter(); +- to_python_converter(); ++ to_python_converter(); ++ to_python_converter(); + } + + }; +@@ -373,17 +373,17 @@ template <> struct ScalarTraits + // Insert an rvalue from_python converter at the tail of the + // chain. Used for implicit conversions + // +- // python array --> Eigen::Transform3d ++ // python array --> Eigen::Projective3d + // + // used for: + // +- // void function(Eigen::Transform3d vec) +- // void function(Eigen::Transform3d & vec) +- // void function(const Eigen::Transform3d & vec) ++ // void function(Eigen::Projective3d vec) ++ // void function(Eigen::Projective3d & vec) ++ // void function(const Eigen::Projective3d & vec) + // +- converter::registry::push_back( &convertible, &construct, type_id() ); ++ converter::registry::push_back( &convertible, &construct, type_id() ); + +- converter::registry::insert( &convert, type_id() ); ++ converter::registry::insert( &convert, type_id() ); + } + + static void* convert(PyObject *obj_ptr) +@@ -401,7 +401,7 @@ template <> struct ScalarTraits + throw_error_already_set(); // the 1D array does not have exactly 3 elements + + double *values = reinterpret_cast(array->data); +- Eigen::Transform3d *c_obj = new Eigen::Transform3d(); ++ Eigen::Projective3d *c_obj = new Eigen::Projective3d(); + double *dataPtr = c_obj->data(); + + for (int i = 0; i < 16; ++i) +@@ -432,7 +432,7 @@ template <> struct ScalarTraits + // I think this is a better way to get at the double array, where is this + // deleted though? Does Boost::Python do it? + double *values = reinterpret_cast(array->data); +- Eigen::Transform3d *storage = new Eigen::Transform3d(); ++ Eigen::Projective3d *storage = new Eigen::Projective3d(); + double *dataPtr = storage->data(); + + for (int i = 0; i < 16; ++i) +@@ -467,21 +467,21 @@ class EigenUnitTestHelper + void set_vector3d_ptr(Eigen::Vector3d* vec) { m_vector3d = *vec; } + void set_const_vector3d_ptr(const Eigen::Vector3d* const vec) { m_vector3d = *vec; } + +- //Eigen::Transform3d transform3d() { return m_transform3d; } +- //Eigen::Transform3d& transform3d_ref() { return m_transform3d; } +- const Eigen::Transform3d& const_transform3d_ref() { return m_transform3d; } +- Eigen::Transform3d* transform3d_ptr() { return &m_transform3d; } +- const Eigen::Transform3d* const_transform3d_ptr() { return &m_transform3d; } +- +- //void set_transform3d(Eigen::Transform3d vec) { m_transform3d = vec; } +- //void set_transform3d_ref(Eigen::Transform3d& vec) { m_transform3d = vec; } +- void set_const_transform3d_ref(const Eigen::Transform3d& vec) { m_transform3d = vec; } +- void set_transform3d_ptr(Eigen::Transform3d* vec) { m_transform3d = *vec; } +- void set_const_transform3d_ptr(const Eigen::Transform3d* const vec) { m_transform3d = *vec; } ++ //Eigen::Projective3d transform3d() { return m_transform3d; } ++ //Eigen::Projective3d& transform3d_ref() { return m_transform3d; } ++ const Eigen::Projective3d& const_transform3d_ref() { return m_transform3d; } ++ Eigen::Projective3d* transform3d_ptr() { return &m_transform3d; } ++ const Eigen::Projective3d* const_transform3d_ptr() { return &m_transform3d; } ++ ++ //void set_transform3d(Eigen::Projective3d vec) { m_transform3d = vec; } ++ //void set_transform3d_ref(Eigen::Projective3d& vec) { m_transform3d = vec; } ++ void set_const_transform3d_ref(const Eigen::Projective3d& vec) { m_transform3d = vec; } ++ void set_transform3d_ptr(Eigen::Projective3d* vec) { m_transform3d = *vec; } ++ void set_const_transform3d_ptr(const Eigen::Projective3d* const vec) { m_transform3d = *vec; } + + private: + Eigen::Vector3d m_vector3d; +- Eigen::Transform3d m_transform3d; ++ Eigen::Projective3d m_transform3d; + + }; + #endif +@@ -529,6 +529,6 @@ void export_Eigen() + Vector3x_to_python_array(); + Vector3x_from_python_array(); + +- // Eigen::Transform3d ++ // Eigen::Projective3d + Transform3d_to_python_array(); + Transform3d_from_python_array(); -- cgit v1.2.3 From 8ad65841030759797bf3fd39261ca17a561ec51f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 01:04:45 +0200 Subject: gnu: mesa: Update to 18.1.7. * gnu/packages/gl.scm (mesa): Update to 18.1.7. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 5592e5fe67..7c9e20e2ee 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -224,7 +224,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "18.1.5") + (version "18.1.7") (source (origin (method url-fetch) @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1sldv7l3g6jfx0yn16kvxlik1qiy037lypdqpvsqc0v6lvqydnv9")) + "01kk42m2sjyc4k1nfw6k1lnzipjbbmp5js47drgdvp9vrqr3npk5")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 8a9e0b6ebf23d737443b3767c6d6322a012d7808 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Fri, 24 Aug 2018 23:30:33 -0400 Subject: gnu: emacs-recent-addresses: Add missing words to description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-recent-addresses)[description]: Add missing words. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2322581a30..54170b91ab 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11392,9 +11392,9 @@ wiki.") (build-system emacs-build-system) (synopsis "Record recently-used email addressed and auto-complete them") (description - "@code{recent-addresses} is an Emacs allows you to quickly look up -previously used email addresses. It can be used alongside the Gnus email -client.") + "@code{recent-addresses} is an Emacs package that allows you to quickly +look up previously used email addresses. It can be used alongside the Gnus +email client.") (license license:gpl2+)))) (define-public emacs-fold-dwim -- cgit v1.2.3 From bff861ece5c5b4d5f8058893c6206f794c5072bf Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 25 Aug 2018 02:37:45 -0400 Subject: gnu: Add emacs-git-annex. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-git-annex): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 54170b91ab..11a1774ad9 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11643,3 +11643,30 @@ comments and Org files in the Magit status buffer. Activating an item jumps to it in its file. By default, it uses keywords from @code{hl-todo}, minus a few (like NOTE).") (license license:gpl3)))) + +(define-public emacs-git-annex + ;; Unreleased version has a fontification fix. + (let ((commit "ebdb44aef1883f1b2b8058e05d30fb9315b03707") + (revision "1")) + (package + (name "emacs-git-annex") + (version (string-append "1.1-" revision "." (string-take commit 8))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jwiegley/git-annex-el") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1mzv40gj7k10h7h5s43my8msgzjpj680qprqa9pp8nbyhl49v3wh")))) + (build-system emacs-build-system) + (home-page "https://github.com/jwiegley/git-annex-el") + (synopsis "Emacs integration for git-annex") + (description "Enhances Dired and buffers visiting annex files with +git-annex functionality. In Dired, the names of annex files are shortened by +hiding the symbolic links and fontified based on whether content is present. +Commands for performing some common operations (e.g., unlocking and adding +files) are provided.") + (license license:gpl2+)))) -- cgit v1.2.3 From 8a928aa729f31d3409cee8371894fd9a50e9fe8f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 26 Aug 2018 00:10:51 +0200 Subject: cve: Update feed URL. * guix/cve.scm (yearly-feed-uri): Remove "static." from the URL since the web site now redirects to the URL without "static.". --- guix/cve.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/cve.scm b/guix/cve.scm index 070acfeb3e..99754fa1f6 100644 --- a/guix/cve.scm +++ b/guix/cve.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,7 +61,7 @@ (define (yearly-feed-uri year) "Return the URI for the CVE feed for YEAR." (string->uri - (string-append "https://static.nvd.nist.gov/feeds/xml/cve/nvdcve-2.0-" + (string-append "https://nvd.nist.gov/feeds/xml/cve/nvdcve-2.0-" (number->string year) ".xml.gz"))) (define %current-year-ttl -- cgit v1.2.3 From 64daf2177fca3b08727fbfaea5e8cd0b916bddbc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 26 Aug 2018 00:32:03 +0200 Subject: gnu: emacs-recent-addresses: Switch to a branch that works with Helm. * gnu/packages/emacs.scm (emacs-recent-addresses)[source]: Change URL and update to afbbfdc. --- gnu/packages/emacs.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 11a1774ad9..18aac36f02 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11374,8 +11374,8 @@ wiki.") (license license:expat))) (define-public emacs-recent-addresses - (let ((commit "d9da58db542089a1ceb5ef29e420dbfbc4a36373") - (revision "0")) + (let ((commit "afbbfdc43b81e620acf827ca20d297e0c517b6eb") + (revision "1")) (package (name "emacs-recent-addresses") (home-page "http://nschum.de/src/emacs/recent-addresses/") @@ -11383,11 +11383,13 @@ wiki.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nschum/recent-addresses.el") + ;; Note: Use a branch that works with Helm. Submitted + ;; at . + (url "https://github.com/civodul/recent-addresses.el") (commit commit))) (sha256 (base32 - "175rvcwmkb5z7ss7q2y5178mvdvp5bhn39irz80qinlvaz8fm4nk")) + "0ajrq0galjmdyjdjyxazykjyax3gh6hvfk4s7l657pi11g0q5zax")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (synopsis "Record recently-used email addressed and auto-complete them") -- cgit v1.2.3 From 032712f6217ce1dca1b198b279e295e8ca5a4db1 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 26 Aug 2018 00:35:30 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.152. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.152. --- 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 9b9cf01560..4d51ce5aec 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -451,8 +451,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.151" - "0irzdq4p8a6dxyx5basgrc7af7w48hmyjwbk5hff8wn8jy71p9zm" + (make-linux-libre "4.4.152" + "082aajyr363ca95pxlg9iascf5d7k2gbw9ggsbsa1hj6nhspsxw6" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 8d55adfa6771551f9b46d93f499177679bc3660c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 26 Aug 2018 00:36:11 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.124. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.124. --- 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 4d51ce5aec..fe50482add 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -445,8 +445,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.123" - "1rljdp3vzhmdc6qha6b9dq0d1a3xz06rn51pb4ad3a2y61mph9sv" + (make-linux-libre "4.9.124" + "0p78gx5jiqvaf2cadf5jp40lzgarrg0m0ybf9w2499v28vjsp30q" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From fabe2c73548e88004b01f5218d1110141a2114d5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 26 Aug 2018 00:36:42 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.67. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.67. (%linux-libre-4.14-hash): 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 fe50482add..b29ac23f6a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -435,8 +435,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.66") -(define %linux-libre-4.14-hash "1sf18m6xjyg535yviz3yjbislf57s180y67z7mzbcl5pq9352bg9") +(define %linux-libre-4.14-version "4.14.67") +(define %linux-libre-4.14-hash "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From cfb15a51631b7e7a4cf84b7aac452dd24dc8023e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 26 Aug 2018 00:38:41 -0400 Subject: gnu: linux-libre: Update to 4.18.5. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.5. (%linux-libre-hash): 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 b29ac23f6a..9ef695c4b2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -404,8 +404,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.4") -(define %linux-libre-hash "1q3bndhwxwcrlyi0qcgxjsp5fl92wkfgk4y41qwrrywfv9xj3sl7") +(define %linux-libre-version "4.18.5") +(define %linux-libre-hash "1y52ns34vh9p4pfj08xsycv8p0xywm6dbpdi0wwpkll1xgpqikvf") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 3c30054290b743c134c19ce7c1eb73b90089b734 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 26 Aug 2018 10:37:06 +0530 Subject: gnu: ghc-optparse-applicative: Update to 0.14.2.0. * gnu/packages/haskell.scm (ghc-optparse-applicative): Update to 0.14.2.0. [arguments]: Enable tests. --- gnu/packages/haskell.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 759ca6044e..540c2e9ce7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4256,7 +4256,7 @@ simple general-purpose data structure\".") (define-public ghc-optparse-applicative (package (name "ghc-optparse-applicative") - (version "0.13.0.0") + (version "0.14.2.0") (source (origin (method url-fetch) @@ -4265,15 +4265,8 @@ simple general-purpose data structure\".") "/optparse-applicative-" version ".tar.gz")) (sha256 (base32 - "1b0c5fdq8bd070g24vrjrwlq979r8dk8mys6aji9hy1l9pcv3inf")))) + "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71")))) (build-system haskell-build-system) - ;; These tests fail because the package doesn't come with all needed test - ;; files: - ;; - prop_drops_back_contexts - ;; - prop_context_carry - ;; - prop_help_on_empty - ;; - prop_help_on_empty_sub - (arguments `(#:tests? #f)) (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat) ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint))) -- cgit v1.2.3 From b625f3a5fbfa3badc294cdb7bc0c0399d8ca1839 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 24 Aug 2018 12:30:16 +0530 Subject: gnu: ghc-smallcheck: Update to 1.1.5. * gnu/packages/haskell.scm (ghc-smallcheck): Update to 1.1.5. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 540c2e9ce7..eefc1dc0a6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -3268,7 +3268,7 @@ This is a better maintained fork of the \"temporary\" package.") (define-public ghc-smallcheck (package (name "ghc-smallcheck") - (version "1.1.1") + (version "1.1.5") (source (origin (method url-fetch) @@ -3278,7 +3278,7 @@ This is a better maintained fork of the \"temporary\" package.") ".tar.gz")) (sha256 (base32 - "1ygrabxh40bym3grnzqyfqn96lirnxspb8cmwkkr213239y605sd")))) + "195fj7w3v03d1y1nm2ylavzrwxjcdbq0lb6zsw1dwyx5jmwfc84h")))) (build-system haskell-build-system) (inputs `(("ghc-logict" ,ghc-logict) -- cgit v1.2.3 From 7550f4b0ef250268af7b5cc97ea9e1215371cec4 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 24 Aug 2018 12:18:27 +0530 Subject: gnu: ghc-integer-logarithms: Update to 1.0.2.1. * gnu/packages/haskell.scm (ghc-integer-logarithms): Update to 1.0.2.1. [inputs]: Move ghc-quickcheck, ghc-smallcheck, ghc-tasty, ghc-tasty-hunit, ghc-tasty-quickcheck, ghc-tasty-smallcheck ... [native-inputs]: ... to here. [home-page]: Update URI. --- gnu/packages/haskell.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index eefc1dc0a6..cb4c0efef6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5054,7 +5054,7 @@ occurrences of a substring (the first in case of overlaps) with another.") (define-public ghc-integer-logarithms (package (name "ghc-integer-logarithms") - (version "1.0.2") + (version "1.0.2.1") (source (origin (method url-fetch) @@ -5063,16 +5063,16 @@ occurrences of a substring (the first in case of overlaps) with another.") version ".tar.gz")) (sha256 (base32 - "0w5mhak181zi6qr5h2zbcs9ymaqacisp9jwk99naz6s8zz5rq1ii")))) + "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j")))) (build-system haskell-build-system) - (inputs - `(("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-smallcheck" ,ghc-smallcheck) + ("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-smallcheck" ,ghc-smallcheck))) - (home-page "https://github.com/phadej/integer-logarithms") + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck))) + (home-page "https://github.com/Bodigrim/integer-logarithms") (synopsis "Integer logarithms") (description "This package provides the following modules: -- cgit v1.2.3 From 2cad58ca6f1b1dfe23a1ca6f608df75935459b33 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 24 Aug 2018 12:43:52 +0530 Subject: gnu: ghc-scientific: Update to 0.3.6.2. * gnu/packages/haskell.scm (ghc-scientific): Update to 0.3.6.2. [inputs]: Move ghc-tasty ... [native-inputs]: ... to here. --- gnu/packages/haskell.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index cb4c0efef6..7d7d85f951 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5086,7 +5086,7 @@ in migrated modules.") (define-public ghc-scientific (package (name "ghc-scientific") - (version "0.3.5.2") + (version "0.3.6.2") (source (origin (method url-fetch) @@ -5096,14 +5096,15 @@ in migrated modules.") ".tar.gz")) (sha256 (base32 - "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w")))) + "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397")))) (build-system haskell-build-system) (inputs `(("ghc-integer-logarithms" ,ghc-integer-logarithms) ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable) - ("ghc-primitive" ,ghc-primitive) - ("ghc-tasty" ,ghc-tasty) + ("ghc-primitive" ,ghc-primitive))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-ant-xml" ,ghc-tasty-ant-xml) ("ghc-tasty-hunit" ,ghc-tasty-hunit) ("ghc-tasty-smallcheck" ,ghc-tasty-smallcheck) -- cgit v1.2.3 From 1d8d69c863ae88d5fc20e52e49a22f68c531c1db Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 12:42:52 +0200 Subject: nls: Update 'fr' translation. --- doc/contributing.fr.texi | 27 +- doc/guix.fr.texi | 8770 +++++----- po/doc/guix-manual.fr.po | 5740 +++--- po/guix/fr.po | 42592 ++++----------------------------------------- 4 files changed, 10756 insertions(+), 46373 deletions(-) diff --git a/doc/contributing.fr.texi b/doc/contributing.fr.texi index bd2fa6555d..1bba7f7d5e 100644 --- a/doc/contributing.fr.texi +++ b/doc/contributing.fr.texi @@ -110,14 +110,14 @@ changement localement sans les installer pour de vrai. Pour pouvoir distinguer votre rôle « d'utilisateur final » de celui parfois haut en couleur de « développeur ». -Pour cela, tous les outils en ligne de commande sont utilisables même sans -avoir lancé @code{make install}. Vous devez pour cela préfixer chaque -commande par @command{./pre-inst-env} (le script @file{pre-inst-env} se -trouve dans le répertoire de plus haut niveau de l'arborescence des sources -de Guix) comme cela@footnote{L'option @option{-E} de @command{sudo} garantie -que @code{GUILE_LOAD_PATH} est bien paramétré pour @command{guix-daemon} et -les outils qu'il utilise puissent trouver les modules Guile dont ils ont -besoin.} : +To that end, all the command-line tools can be used even if you have not run +@code{make install}. To do that, you first need to have an environment with +all the dependencies available (@pxref{Construire depuis Git}), and then simply +prefix each command with @command{./pre-inst-env} (the @file{pre-inst-env} +script lives in the top build tree of Guix), as in@footnote{The @option{-E} +flag to @command{sudo} guarantees that @code{GUILE_LOAD_PATH} is correctly +set such that @command{guix-daemon} and the tools it uses can find the Guile +modules they need.}: @example $ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild @@ -213,11 +213,12 @@ variables @var{yas-snippet-dirs} d'Emacs. (add-to-list 'yas-snippet-dirs "~/src/guix/etc/snippets")) @end lisp -Les extraits de messages de commit dépendent de @url{https://magit.vc/, -Magit} pour afficher les fichiers sélectionnés. Lors de la modification -d'un message de commit, tapez @code{add} suivi de @kbd{TAB} pour insérer un -modèle de message de commit pour ajouter un paquet ; tapez @code{update} -suivi de @kbd{TAB} pour insérer un modèle pour la mise à jour d'un paquet. +The commit message snippets depend on @url{https://magit.vc/, Magit} to +display staged files. When editing a commit message type @code{add} +followed by @kbd{TAB} to insert a commit message template for adding a +package; type @code{update} followed by @kbd{TAB} to insert a template for +updating a package; type @code{https} followed by @kbd{TAB} to insert a +template for changing the home page URI of a package to HTTPS. L'extrait principal pour @code{scheme-mode} est lancé en tapant @code{package…} suivi par @kbd{TAB}. Cet extrait insère aussi la chaîne de diff --git a/doc/guix.fr.texi b/doc/guix.fr.texi index 6dc7f90555..b70806eccb 100644 --- a/doc/guix.fr.texi +++ b/doc/guix.fr.texi @@ -200,7 +200,7 @@ Définition des paquets -* Référence de paquet :: Le type de donnée des paquets. +* Référence de paquet:: Le type de donnée des paquets. * Référence d'origine:: Le type de données d'origine. Utilitaires @@ -3596,7 +3596,7 @@ dérivation est stockée dans un fichier @code{.drv} dans @file{/gnu/store}. Les actions de construction qu'il prescrit peuvent ensuite être réalisées par la procédure @code{build-derivation} (@pxref{Le dépôt}). -@deffn {Procédure Scheme} package-derivation @var{dépôt} @var{paquet} [@var{système}] +@deffn {Procédure Scheme} package-derivation @var{store} @var{package} [@var{system}] Renvoie l'objet @code{} du @var{paquet} pour le @var{système} (@pxref{Dérivations}). @@ -3611,7 +3611,7 @@ connexion au démon, qui opère sur les dépôt (@pxref{Le dépôt}). De manière identique, il est possible de calculer une dérivation qui effectue une compilation croisée d'un paquet pour un autre système : -@deffn {Procédure Scheme} package-cross-derivation @var{dépôt} @ +@deffn {Procédure Scheme} package-cross-derivation @var{store} @ @var{paquet} @var{cible} [@var{système}] renvoie l'objet @code{} duof @var{paquet} construit depuis @var{système} pour @var{cible}. @@ -3629,7 +3629,7 @@ utile est par exemple la @dfn{réécriture d'entrées} où l'arbre des dépendances d'un paquet est réécrit en replaçant des entrées spécifiques par d'autres : -@deffn {Procédure Scheme} package-input-rewriting @var{remplacements} @ +@deffn {Procédure Scheme} package-input-rewriting @var{replacements} @ [@var{nom-réécrit}] Renvoie une procédure qui, lorsqu'on lui donne un paquet, remplace des dépendances directes et indirectes (mais pas ses entrées implicites) en fonction de @var{remplacements}. @var{remplacements} @@ -3673,7 +3673,7 @@ arrête la récursion là où @var{cut?} renvoie vrai pour un paquet donné. @end deffn @menu -* Référence de paquet :: Le type de donnée des paquets. +* Référence de paquet:: Le type de donnée des paquets. * Référence d'origine:: Le type de données d'origine. @end menu @@ -3684,7 +3684,7 @@ arrête la récursion là où @var{cut?} renvoie vrai pour un paquet donné. Cette section résume toutes les options disponibles dans les déclarations @code{package} (@pxref{Définition des paquets}). -@deftp {Type de donnée} package +@deftp {Type de données} package C'est le type de donnée représentant une recette de paquets @table @asis @@ -3814,7 +3814,7 @@ corrigé. Cette section résume toutes les options disponibles dans le déclarations @code{origin} (@pxref{Définition des paquets}). -@deftp {Type de donnée} origin +@deftp {Type de données} origin C'est le type de donnée qui représente l'origine d'un code source. @table @asis @@ -4648,7 +4648,7 @@ un objet serveur. l'emplacement normal en fonction des options données à @command{configure}. @end deffn -@deffn {Procédure Scheme} close-connection @var{serveur} +@deffn {Procédure Scheme} close-connection @var{server} Ferme la connexion au @var{serveur}. @end deffn @@ -4661,7 +4661,7 @@ journaux de construction et d'erreur envoyés par le démon devraient être Les procédures qui font des RPC prennent toutes un objet serveur comme premier argument. -@deffn {Scheme Procedure} valid-path? @var{server} @var{path} +@deffn {Procédure Scheme} valid-path? @var{server} @var{path} @cindex éléments du dépôt invalides Renvoie @code{#t} lorsque @var{path} désigne un élément du dépôt valide et @code{#f} sinon (un élément invalide peut exister sur le disque mais rester @@ -8600,51 +8600,53 @@ comme gestionnaire de paquets par dessus un système GNU/Linux déjà installé (@pxref{Installation}). Pour distinguer ces deux cas, on appelle la distribution autonome « Distribution Système Guix » ou GuixSD. -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{Invoquer guix package}): +la distribution fournit les paquets cœur de GNU comme la GNU libc, GCC et +Binutils, ainsi que de nombreuses applications GNU et non-GNU. La liste +complète des paquets disponibles se trouve +@url{http://www.gnu.org/software/guix/packages,en ligne} ou en lançant +@command{guix package} (@pxref{Invoquer guix package}) : @example guix package --list-available @end example -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. +Notre but est de fournir une distribution logicielle entièrement libre de +GNU/Linux et d'autres variantes de GNU, en se concentrant sur la promotion +et l'intégration étroite des composants GNU en insistant sur les programmes +et les outils qui aident l'utilisateur à exercer ses libertés. -Packages are currently available on the following platforms: +Les paquets sont actuellement disponibles pour les plateformes suivantes : @table @code @item x86_64-linux -Intel/AMD @code{x86_64} architecture, Linux-Libre kernel; +l'architecture Intel et AMD @code{x86_64} avec le noyau Linux-libre ; @item i686-linux -Intel 32-bit architecture (IA32), Linux-Libre kernel; +l'architecture Intel 32-bits (IA32) avec le noyau Linux-libre ; @item armhf-linux -ARMv7-A architecture with hard float, Thumb-2 and NEON, using the EABI -hard-float application binary interface (ABI), and Linux-Libre kernel. +l'architecture ARMv7-A avec gestion des flottants matérielle, Thumb-2 et +NEON, avec l'interface binaire applicative (ABI) EABI hard-float et le noyau +Linux-libre ; @item aarch64-linux -little-endian 64-bit ARMv8-A processors, Linux-Libre kernel. This is -currently in an experimental stage, with limited support. -@xref{Contribuer}, for how to help! +les processeurs ARMv8-A 64-bits en little-endian avec le noyau Linux-libre. +Le support est actuellement expérimental et limité. @xref{Contribuer}, +pour savoir comment aider ! @item mips64el-linux -little-endian 64-bit MIPS processors, specifically the Loongson series, n32 -ABI, and Linux-Libre kernel. +les processeurs MIPS 64-bits little-endian, spécifiquement la série +Loongson, ABI n32, avec le noyau Linux-libre. @end table -GuixSD itself is currently only available on @code{i686} and @code{x86_64}. +GuixSD lui-même est actuellement disponible sur @code{i686} et +@code{x86_64}. @noindent -For information on porting to other architectures or kernels, -@pxref{Porter}. +Pour des informations sur comment porter vers d'autres architectures et +d'autres noyau, @pxref{Porter}. @menu * Installation du système:: Installer le système d'exploitation complet. @@ -8660,29 +8662,30 @@ For information on porting to other architectures or kernels, * Porter:: Cibler une autre plateforme ou un autre noyau. @end menu -Building this distribution is a cooperative effort, and you are invited to -join! @xref{Contribuer}, for information about how you can help. +La construction de cette distribution est un effort collaboratif et nous +vous invitons à nous rejoindre ! @xref{Contribuer}, pour des informations +sur la manière de nous aider. @node Installation du système @section Installation du système -@cindex installing GuixSD +@cindex installer GuixSD @cindex Distribution Système Guix -This section explains how to install the Guix System Distribution (GuixSD) -on a machine. The Guix package manager can also be installed on top of a -running GNU/Linux system, @pxref{Installation}. +Cette section explique comment installer la distribution système Guix +(GuixSD) sur votre machine. Le gestionnaire de paquets Guix peut aussi être +installé sur un système GNU/Linux déjà installé, @pxref{Installation}. @ifinfo @quotation Remarque @c This paragraph is for people reading this from tty2 of the @c installation image. -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. +Vous lisez cette documentation avec un lecteur Info. Pour des détails sur +son utilisation, appuyez sur la touche @key{ENTRÉE} (« Entrée » ou « à la +ligne ») sur le lien suivant : @pxref{Top, Info reader,, info-stnd, +Stand-alone GNU Info}. Appuyez ensuite sur @kbd{l} pour revenir ici. -Alternately, run @command{info info} in another tty to keep the manual -available. +Autrement, lancez @command{info info} dans un autre tty pour garder ce +manuel ouvert. @end quotation @end ifinfo @@ -8700,79 +8703,83 @@ available. @node Limitations @subsection Limitations -As of version @value{VERSION}, the Guix System Distribution (GuixSD) is not -production-ready. It may contain bugs and lack important features. Thus, -if you are looking for a stable production system that respects your freedom -as a computer user, a good solution at this point is to consider -@url{http://www.gnu.org/distros/free-distros.html, one of the more -established GNU/Linux distributions}. We hope you can soon switch to the -GuixSD without fear, of course. In the meantime, you can also keep using -your distribution and try out the package manager on top of it -(@pxref{Installation}). +À la version @value{VERSION}, la distribution système Guix (GuixSD) n'est +pas prête pour la production. Elle peut contenir des bogues et ne pas avoir +certaines fonctionnalités importantes. Ainsi, si vous cherche un système de +production stable qui respecte votre liberté en tant qu'utilisateur, une +bonne solution consiste à utiliser +@url{http://www.gnu.org/distros/free-distros.html, une des distributions +GNU/Linux mieux établie}. Nous espérons que vous pourrez bientôt passer à +GuixSD sans peur, bien sûr. Pendant ce temps, vous pouvez aussi utiliser +votre distribution actuelle et essayer le gestionnaire de paquet par dessus +celle-ci (@pxref{Installation}). -Before you proceed with the installation, be aware of the following -noteworthy limitations applicable to version @value{VERSION}: +Avant de procéder à l'installation, soyez conscient de ces limitations les +plus importantes qui s'appliquent à la version @value{VERSION} : @itemize @item -The installation process does not include a graphical user interface and -requires familiarity with GNU/Linux (see the following subsections to get a -feel of what that means.) +Le procédé d'installation n'a pas d'interface utilisateur graphique et +requiert une certaine familiarité avec GNU/Linux (voir les sous-sections +suivantes pour avoir un aperçu de ce que cela signifie). @item -Support for the Logical Volume Manager (LVM) is missing. +LVM (gestionnaire de volumes logiques) n'est pas supporté. @item -More and more system services are provided (@pxref{Services}), but some may -be missing. +De plus en plus de services systèmes sont fournis (@pxref{Services}) mais +certains manquent toujours cruellement. @item More than 7,500 packages are available, but you might occasionally find that a useful package is missing. @item -GNOME, Xfce, LXDE, and Enlightenment are available (@pxref{Services de bureaux}), as well as a number of X11 window managers. However, some -graphical applications may be missing, as well as KDE. +GNOME, Xfce, LXDE et Enlightenment sont disponibles (@pxref{Services de bureaux}), ainsi qu'un certain nombre de gestionnaires de fenêtres X11. +cependant, certaines applications graphiques peuvent manquer, ainsi que KDE. @end itemize -You have been warned! But more than a disclaimer, this is an invitation to -report issues (and success stories!), and to join us in improving it. -@xref{Contribuer}, for more info. +Vous êtes avertis ! Mais plus qu'un avertissement, c'est une invitation à +rapporter les problèmes (et vos succès !) et à nous rejoindre pour améliorer +la distribution. @xref{Contribuer}, pour plus d'info. @node Considérations matérielles @subsection Considérations matérielles -@cindex hardware support on GuixSD -GNU@tie{}GuixSD 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 +@cindex support matériel sur GuixSD +GNU@tie{}GuixSD se concentre sur le respect des libertés de ses +utilisateurs. Il est construit autour du noyau Linux-libre, ce qui signifie +que seuls les matériels pour lesquels des pilotes logiciels et des +microgiciels libres sont disponibles sont supportés. De nos jours, une +grande gamme de matériel qu'on peut acheter est supporté par GNU/Linux-libre +— des claviers aux cartes graphiques en passant par les scanners et les +contrôleurs Ethernet. Malheureusement, il reste des produit dont les +fabriquants refusent de laisser le contrôle aux utilisateurs sur leur propre +utilisation de l'ordinateur, et ces matériels ne sont pas supportés par GuixSD. -@cindex WiFi, hardware support -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 GuixSD, as -part of @var{%base-firmware} (@pxref{Référence de système d'exploitation, +@cindex WiFi, support matériel +L'un des types de matériels où les pilotes ou les microgiciels sont le moins +disponibles sont les appareils WiFi. Les appareils WiFi connus pour +fonctionner sont ceux qui utilisent des puces Atheros (AR9271 et AR7010) qui +correspondent au pilote @code{ath9k} de Linux-libre, et ceux qui utilisent +des puces Broadcom/AirForce (BCM43xx avec la révision Wireless-Core 5), qui +correspondent au pilote @code{b43-open} de Linux-libre. Des microgiciels +libres existent pour les deux et sont disponibles directement sur GuixSD, +dans @var{%base-firmware} (@pxref{Référence de système d'exploitation, @code{firmware}}). @cindex RYF, Respects Your Freedom -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. +La @uref{https://www.fsf.org/, Free Software Foundation} a un programme de +certification nommé @uref{https://www.fsf.org/ryf, @dfn{Respects Your +Freedom}} (RYF), pour les produits matériels qui respectent votre liberté et +votre vie privée en s'assurant que vous avez le contrôle sur l'appareil. +Nous vous encourageons à vérifier la liste des appareils certifiés par RYF. -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. +Une autre ressource utile est le site web @uref{https://www.h-node.org/, +H-Node}. Il contient un catalogue d'appareils avec des informations sur +leur support dans GNU/Linux. @node Installation depuis une clef USB ou un DVD @@ -8785,15 +8792,15 @@ where @var{system} is one of: @table @code @item x86_64-linux -for a GNU/Linux system on Intel/AMD-compatible 64-bit CPUs; +pour un système GNU/Linux sur un CPU compatible Intel/AMD 64-bits ; @item i686-linux -for a 32-bit GNU/Linux system on Intel-compatible CPUs. +pour un système GNU/Linux sur un CPU compatible Intel 32-bits ; @end table @c start duplication of authentication part from ``Binary Installation'' -Make sure to download the associated @file{.sig} file and to verify the -authenticity of the image against it, along these lines: +Assurez-vous de télécharger les fichiers @file{.sig} associés et de vérifier +l'authenticité de l'image avec, de cette manière : @example $ wget https://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{system}.iso.xz.sig @@ -8811,222 +8818,231 @@ $ gpg --keyserver pgp.mit.edu --recv-keys @value{OPENPGP-SIGNING-KEY-ID} @c end duplication et relancez la commande @code{gpg --verify}. -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. +Cette image contient les outils nécessaires à l'installation. Elle est +faite pour être copiée @emph{telle quelle} sur une clef USB assez grosse ou +un DVD. -@unnumberedsubsubsec Copying to a USB Stick +@unnumberedsubsubsec Copie sur une clef USB -To copy the image to a USB stick, follow these steps: +Pour copier l'image sur une clef USB, suivez ces étapes : @enumerate @item -Decompress the image using the @command{xz} command: +Décompressez l'image avec la commande @command{xz} : @example -xz -d guixsd-install-@value{VERSION}.@var{system}.iso.xz +xz -d guixsd-install-@value{VERSION}.@var{système}.iso.xz @end example @item -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: +Insérez la clef USB de 1@tie{}Gio ou plus dans votre machine et déterminez +son nom d'appareil. En supposant que la clef usb est connue sous le nom de +@file{/dev/sdX}, copiez l'image avec : @example dd if=guixsd-install-@value{VERSION}.x86_64-linux.iso of=/dev/sdX sync @end example -Access to @file{/dev/sdX} usually requires root privileges. +Accéder à @file{/dev/sdX} requiert généralement les privilèges +super-utilisateur. @end enumerate -@unnumberedsubsubsec Burning on a DVD +@unnumberedsubsubsec Graver sur un DVD -To copy the image to a DVD, follow these steps: +Pour copier l'image sur un DVD, suivez ces étapes : @enumerate @item -Decompress the image using the @command{xz} command: +Décompressez l'image avec la commande @command{xz} : @example -xz -d guixsd-install-@value{VERSION}.@var{system}.iso.xz +xz -d guixsd-install-@value{VERSION}.@var{système}.iso.xz @end example @item -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: +Insérez un DVD vierge dans votre machine et déterminez son nom d'appareil. +En supposant que le DVD soit connu sont le nom de @file{/dev/srX}, copiez +l'image avec : @example growisofs -dvd-compat -Z /dev/srX=guixsd-install-@value{VERSION}.x86_64.iso @end example -Access to @file{/dev/srX} usually requires root privileges. +Accéder à @file{/dev/srX} requiert généralement les privilèges +super-utilisateur. @end enumerate -@unnumberedsubsubsec Booting +@unnumberedsubsubsec Démarrage -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. +Une fois que c'est fait, vous devriez pouvoir redémarrer le système et +démarrer depuis la clef USB ou le DVD. Pour cela, vous devrez généralement +entrer dans le menu de démarrage BIOS ou UEFI, où vous pourrez choisir de +démarrer sur la clef USB. -@xref{Installer GuixSD dans une VM}, if, instead, you would like to install -GuixSD in a virtual machine (VM). +@xref{Installer GuixSD dans une VM}, si, à la place, vous souhaitez installer +GuixSD dans une machine virtuelle (VM). @node Préparer l'installation @subsection Préparer l'installation -Once you have successfully booted your computer using the installation -medium, you should end up with a root prompt. Several console TTYs are -configured and can be used to run commands as root. TTY2 shows this -documentation, 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. +Une fois que vous avez démarré votre ordinateur sur le média d'installation, +vous devriez vous retrouver sur un prompt en root. Plusieurs TTY sont +configurées et peuvent être utilisés pour lancer des commandes en root. Le +TTY2 affiche cette documentation, dans la quelle vous pouvez naviguer avec +les commandes du lecteur Info (@pxref{Top,,, info-stnd, Stand-alone GNU +Info}). Le démon de souris GPM tourne sur le système d'installation, ce qui +vous permet de sélectionner du texte avec le bouton gauche de la souris et +de le coller en appuyant sur la molette. @quotation Remarque -Installation requires access to the Internet so that any missing -dependencies of your system configuration can be downloaded. See the -``Networking'' section below. +L'installation nécessite un accès au réseau pour que les dépendances +manquantes de votre configuration système puissent être téléchargées. Voyez +la section « réseau » plus bas. @end quotation -The installation system includes many common tools needed for this task. -But it is also a full-blown GuixSD system, which means that you can install -additional packages, should you need it, using @command{guix package} -(@pxref{Invoquer guix package}). +Le système d'installation inclus plusieurs outils usuels pour requis pour +cette tâche. Mais c'est aussi un système GuixSD complet, ce qui signifie +que vous pouvez installer des paquets supplémentaires si vous en avez +besoin, avec @command{guix package} (@pxref{Invoquer guix package}). -@subsubsection Keyboard Layout +@subsubsection Disposition du clavier -@cindex keyboard layout -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: +@cindex disposition du clavier +L'image d'installation utilise la disposition clavier qwerty (US). Si vous +voulez la changer, vous pouvez utiliser la commande @command{loadkeys}. Par +exemple, la commande suivante sélectionne la disposition Dvorak : @example loadkeys dvorak @end example -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. +Consultez les fichiers dans @file{/run/current-system/profile/share/keymaps} +pour trouver une liste des dispositions disponibles. Lancez @command{man +loadkey} pour plus d'informations. -@subsubsection Networking +@subsubsection Réseau -Run the following command see what your network interfaces are called: +Run the following command to see what your network interfaces are called: @example ifconfig -a @end example @noindent -@dots{} or, using the GNU/Linux-specific @command{ip} command: +@dots{} ou, avec la commande spécifique à GNU/Linux @command{ip} : @example ip a @end example @c http://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c#n20 -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}. +Les interfaces filaires ont un nom qui commence par @samp{e} ; par exemple, +l'interface qui correspond au premier contrôleur Ethernet sur la carte mère +est appelé @samp{eno1}. Les interfaces sans-fil ont un nom qui commence par +@samp{w}, comme @samp{w1p2s0}. @table @asis -@item Wired connection -To configure a wired network run the following command, substituting -@var{interface} with the name of the wired interface you want to use. +@item Connexion filaire +Pour configure une connexion filaire, lancez la commande suivante, en +remplaçant @var{interface} par le nom de l'interface filaire que vous voulez +utiliser. @example ifconfig @var{interface} up @end example -@item Wireless connection -@cindex wireless +@item Connexion sans-fil +@cindex sans-fil @cindex WiFi -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}: +Pour configurer le réseau sans-fil, vous pouvez créer un fichier de +configuration pour l'outil de configuration @command{wpa_supplicant} (son +emplacement importe peu) avec l'un des éditeurs de texte disponibles comme +@command{nano} : @example nano wpa_supplicant.conf @end example -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: +Par exemple, la déclaration qui suit peut aller dans ce fichier et +fonctionnera pour plusieurs réseaux sans-fil, si vous donnez le vrai SSID et +la phrase de passe pour le réseau auquel vous vous connectez : @example network=@{ - ssid="@var{my-ssid}" + ssid="@var{mon-ssid}" key_mgmt=WPA-PSK - psk="the network's secret passphrase" + psk="la phrase de passe secrète du réseau" @} @end example -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): +Démarrez le service sans-file et lancez-le en tache de fond avec la commande +suivante (en remplaçant @var{interface} par le nom de l'interface réseau que +vous voulez utiliser) : @example wpa_supplicant -c wpa_supplicant.conf -i @var{interface} -B @end example -Run @command{man wpa_supplicant} for more information. +Lancez @command{man wpa_supplicant} pour plus d'informations. @end table @cindex DHCP -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: +À partir de ce moment, vous avez besoin d'une adresse IP. Sur les réseaux +où les IP sont automatiquement attribuée par DHCP, vous pouvez lancer : @example dhclient -v @var{interface} @end example -Try to ping a server to see if networking is up and running: +Essayez de pinger un serveur pour voir si le réseau fonctionne : @example ping -c 3 gnu.org @end example -Setting up network access is almost always a requirement because the image -does not contain all the software and tools that may be needed. +Mettre en place un accès réseau est presque toujours une nécessité parce que +l'image ne contient pas tous les logiciels et les outils dont vous pourriez +avoir besoin. -@cindex installing over SSH -If you want to, you can continue the installation remotely by starting an -SSH server: +@cindex installer par SSH +Si vous le souhaitez, vous pouvez continuer l'installation à distance en +démarrant un serveur SSH : @example herd start ssh-daemon @end example -Make sure to either set a password with @command{passwd}, or configure -OpenSSH public key authentication before logging in. +Assurez-vous soit de définir un mot de passe avec @command{passwd}, soit de +configurer l'authentification par clef OpenSSH avant de vous connecter. -@subsubsection Disk Partitioning +@subsubsection Partitionnement -Unless this has already been done, the next step is to partition, and then -format the target partition(s). +À moins que vous ne l'ayez déjà fait, l'étape suivante consiste à +partitionner le disque puis à formater les partitions cibles. -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: +L'image d'installation inclus plusieurs outils de partitionnement, dont +Parted (@pxref{Overview,,, parted, GNU Parted User Manual}), +@command{fdisk}, et @command{cfdisk}. Lancez-en un et paramétrez votre +disque avec le partitionnement qui vous convient : @example cfdisk @end example -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}). +Si votre disque utilise le format des tables de partitions GUID (GPT) et que +vous souhaitez installer un GRUB pour système BIOS (c'est le cas par +défaut), assurez-vous de créer qu'une partition de démarrage BIOS soit bien +disponible (@pxref{BIOS installation,,, grub, GNU GRUB manual}). @cindex EFI, installation @cindex UEFI, installation -@cindex ESP, EFI system partition -If you instead wish to use EFI-based GRUB, a FAT32 @dfn{EFI System -Partition} (ESP) is required. This partition should be mounted at -@file{/boot/efi} and must have the @code{esp} flag set. E.g., for -@command{parted}: +@cindex ESP, partition système EFI +Si vous souhaitez à la place utilise GRUB pour système EFI, vous devrez +avoir une @dfn{partition système EFI} (ESP) en FAT32. Cette partition +devrait être montée dans @file{/boot/efi} et doit avoir le drapeau +@code{esp}. P.@: ex.@: pour @command{parted} : @example parted /dev/sda set 1 esp on @@ -9064,7 +9080,7 @@ with: mkfs.ext4 -L my-root /dev/sda2 @end example -@cindex encrypted disk +@cindex chiffrement du disque 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}}, @@ -9078,18 +9094,18 @@ cryptsetup open --type luks /dev/sda2 my-partition mkfs.ext4 -L my-root /dev/mapper/my-partition @end example -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): +Une fois cela effectué, montez le système de fichier cible dans @file{/mnt} +avec une commande comme (de nouveau, en supposant que @code{my-root} est +l'étiquette du système de fichiers racine) : @example mount LABEL=my-root /mnt @end example -Also mount any other file systems you would like to use on the target system -relative to this path. If you have @file{/boot} on a separate partition for -example, mount it at @file{/mnt/boot} now so it is found by @code{guix -system init} afterwards. +Montez aussi tous les systèmes de fichiers que vous voudriez utiliser sur le +système cible relativement à ce chemin. Si vous avez un @file{/boot} sur +une partition séparé par exemple, montez-le sur @file{/mnt/boot} maintenant +pour qu'il puisse être trouvé par @code{guix system init} ensuite. 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 @@ -9101,57 +9117,63 @@ mkswap /dev/sda3 swapon /dev/sda3 @end example -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}.}: +Autrement, vous pouvez utiliser un fichier de swap. Par exemple, en +supposant que dans le nouveau système vous voulez utiliser le fichier +@file{/swapfile} comme fichier de swap, vous lanceriez@footnote{Cet exemple +fonctionnera sur plusieurs types de systèmes de fichiers (p.@: ex.@: ext4). +Cependant, pour les systèmes de fichiers qui utilisent la copie sur écriture +(COW) comme btrfs, les étapes requises peuvent varier. Pour plus de +détails, regardez les pages de manuel de @command{mkswap} et +@command{swapon}.} : @example -# This is 10 GiB of swap space. Adjust "count" to change the size. +# Cela représente 10 Gio d'espace d'échange. Ajustez « count » pour changer la taille. dd if=/dev/zero of=/mnt/swapfile bs=1MiB count=10240 -# For security, make the file readable and writable only by root. +# Par sécurité, laissez le fichier en lecture et en écriture uniquement pour root. chmod 600 /mnt/swapfile mkswap /mnt/swapfile swapon /mnt/swapfile @end example -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. +Remarquez que si vous avez chiffré la partition racine et créé un fichier +d'échange dans son système de fichier comme décrit ci-dessus, alors le +chiffrement protégera aussi le fichier d'échange, comme n'importe quel +fichier de ce système de fichiers. @node Effectuer l'installation @subsection Effectuer l'installation -With the target partitions ready and the target root mounted on @file{/mnt}, -we're ready to go. First, run: +Lorsque la partition cible est prête et que les autres partitions sont +montées, on est prêt à commencer l'installation. Commencez par : @example herd start cow-store /mnt @end example -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. - -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. +Cela rend @file{/gnu/store} capable de faire de la copie sur écriture, de +sorte que les paquets ajoutés pendant l'installation sont écrits sur le +disque cible sur @file{/mnt} plutôt que gardés en mémoire. Cela est +nécessaire parce que la première phase de la commande @command{guix system +init} (voir plus bas) implique de télécharger ou de construire des éléments +de @file{/gnu/store} qui est initialement un système de fichiers en mémoire. + +Ensuite, vous devrez modifier un fichier et fournir la déclaration du +système à installer. Pour cela, le système d'installation propose trois +éditeurs de texte. Nous recommandons GNU nano (@pxref{Top,,, nano, GNU nano +Manual}), qui supporte la coloration syntaxique la correspondance de +parenthèses ; les autres éditeurs sont GNU Zile (un clone d'Emacs) et nvi +(un clone de l'éditeur @command{vi} original de BSD). Nous recommandons +vivement de stocker ce fichier sur le système de fichier racine cible, +disons en tant que @file{/mnt/etc/config.scm}. Sinon, vous perdrez votre +fichier de configuration une fois que vous aurez redémarré sur votre nouveau +système. -@xref{Utiliser le système de configuration}, 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: +@xref{Utiliser le système de configuration}, pour un aperçu de comment créer votre +fichier de configuration. Les exemples de configuration dont on parle dans +cette section sont disponibles dans @file{/etc/configuration} sur l'image +d'installation. Ainsi, pour commencer avec une configuration du système qui +fournit un serveur d'affichage graphique (un système de « bureau »), vous +pouvez lancer ce qui suit : @example # mkdir /mnt/etc @@ -9159,93 +9181,97 @@ started with a system configuration providing a graphical display server (a # nano /mnt/etc/config.scm @end example -You should pay attention to what your configuration file contains, and in -particular: +Vous devriez faire attention à ce que contient votre fichier de +configuration, en particulier : @itemize @item -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}, and do make sure the path is actually -mounted. +Assurez-vous que la forme @code{bootloader-configuration} se réfère à la +cible où vous voulez installer GRUB. Elle devrait aussi mentionner +@code{grub-bootloader} si vous installer GRUB en mode BIOS (ou « legacy ») +ou @code{grub-efi-bootloader} pour les système UEFI plus récents. Pour les +anciens systèmes, le champs @code{target} contient un périphérique comme +@code{/dev/sda} ; pour les systèmes UEFI il contient un chemin vers une +partition EFI montée, comme @code{/boot/efi}, et assurez-vous que ce chemin +est bien monté. @item 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 sets the value of @code{title} to -@code{'label}. +@code{file-system} configuration uses the @code{file-system-label} procedure +in its @code{device} field. @item -If there are encrypted or RAID partitions, make sure to add a -@code{mapped-devices} field to describe them (@pxref{Périphériques mappés}). +Si vous avez des partitions RAID ou chiffrées, assurez-vous d'ajouter un +champ @code{mapped-device} pour les décrire (@pxref{Périphériques mappés}). @end itemize -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}): +Une fois que vous avez fini les préparatifs sur le fichier de configuration, +le nouveau système peut être initialisé (rappelez-vous que le système de +fichiers racine cible est dans @file{/mnt}) : @example guix system init /mnt/etc/config.scm /mnt @end example @noindent -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{Invoquer guix system}. This command may trigger downloads or builds -of missing packages, which can take some time. - -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}). - -@cindex upgrading GuixSD -From then on, you can update GuixSD whenever you want by running -@command{guix pull} as @code{root} (@pxref{Invoquer guix pull}), and then -running @command{guix system reconfigure} to build a new system generation -with the latest packages and services (@pxref{Invoquer guix system}). We -recommend doing that regularly so that your system includes the latest -security updates (@pxref{Mises à jour de sécurité}). - -Join us on @code{#guix} on the Freenode IRC network or on -@file{guix-devel@@gnu.org} to share your experience---good or not so good. +Cela copie tous les fichiers nécessaires et installe GRUB sur +@file{/dev/sdX} à moins que vous ne passiez l'option +@option{--no-bootloader}. Pour plus d'informations, @pxref{Invoquer guix system}. Cette commande peut engendrer des téléchargements ou des +constructions pour les paquets manquants, ce qui peut prendre du temps. + +Une fois que cette commande a terminée — et on l'espère réussi ! — vous +pouvez lancer @command{reboot} et démarrer sur votre nouveau système. Le +mot de passe @code{root} est d'abord vide ; les mots de passe des autres +utilisateurs doivent être initialisés avec la commande @command{passwd} en +tant que @code{root}, à mois que votre configuration ne spécifie autre chose +(@pxref{user-account-password, mot de passe des comptes utilisateurs}). + +@cindex mettre à jour GuixSD +À partir de maintenant, vous pouvez mettre à jour GuixSD lorsque vous le +souhaitez en lançant @command{guix pull} en tant que @code{root} +(@pxref{Invoquer guix pull}), puis en lançant @command{guix system +reconfigure} pour construire une nouvelle génération du système avec les +derniers paquets et les derniers services (@pxref{Invoquer guix system}). +Nous vous recommandons de le faire régulièrement pour que votre système +inclus les dernières mises à jour de sécurité (@pxref{Mises à jour de sécurité}). + +Rejoignez-nous sur @code{#guix} sur le réseau IRC Freenode ou sur +@file{guix-devel@@gnu.org} pour partager votre expérience — bonne ou +mauvaise. @node Installer GuixSD dans une VM -@subsection Installing GuixSD in a Virtual Machine +@subsection Installer GuixSD sur une machine virtuelle -@cindex virtual machine, GuixSD installation -@cindex virtual private server (VPS) -@cindex VPS (virtual private server) -If you'd like to install GuixSD in a virtual machine (VM) or on a virtual -private server (VPS) rather than on your beloved machine, this section is -for you. +@cindex machine virtuelle, installation de GuixSD +@cindex serveur privé virtuel (VPS) +@cindex VPS (serveur privé virtuel) +Si vous souhaitez installer GuixSD sur une machine virtuelle (VM) ou un +serveur privé virtuel (VPS) plutôt que sur votre machine chérie, cette +section est faite pour vous. -To boot a @uref{http://qemu.org/,QEMU} VM for installing GuixSD in a disk -image, follow these steps: +Pour démarrer une VM @uref{http://qemu.org/,QEMU} pour installer GuixSD sur +une image disque, suivez ces étapes : @enumerate @item -First, retrieve and decompress the GuixSD installation image as described -previously (@pxref{Installation depuis une clef USB ou un DVD}). +Tout d'abord récupérez et décompressez l'image d'installation de GuixSD +comme décrit précédemment (@pxref{Installation depuis une clef USB ou un DVD}). @item -Create a disk image that will hold the installed system. To make a -qcow2-formatted disk image, use the @command{qemu-img} command: +Créez une image disque qui contiendra le système installé. Pour créer une +image qcow2, utilise la commande @command{qemu-img} : @example qemu-img create -f qcow2 guixsd.img 50G @end example -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. +Le fichier qui en résulte sera bien plus petit que les 50 Go (habituellement +moins de 1 Mo) mais il grossira au fur et à mesure que le stockage virtuel +grossira. @item -Boot the USB installation image in an VM: +Démarrez l'image d'installation USB dans une VM : @example qemu-system-x86_64 -m 1024 -smp 1 \ @@ -9254,74 +9280,80 @@ qemu-system-x86_64 -m 1024 -smp 1 \ -drive file=guixsd.img @end example -The ordering of the drives matters. +L'ordre des périphérique est important -In the VM console, quickly press the @kbd{F12} key to enter the boot menu. -Then press the @kbd{2} key and the @kbd{RET} key to validate your selection. +Dans la console de la VM, appuyez rapidement sur @kbd{F12} pour entrer dans +le menu de démarrage. Ensuite appuyez sur @kbd{2} et la touche @kbd{Entrée} +pour valider votre choix. @item -You're now root in the VM, proceed with the installation process. -@xref{Préparer l'installation}, and follow the instructions. +Vous êtes maintenant root dans la VM, continuez en suivant la procédure +d'installation. @xref{Préparer l'installation}, et suivez les +instructions. @end enumerate -Once installation is complete, you can boot the system that's on your -@file{guixsd.img} image. @xref{Lancer GuixSD dans une VM}, for how to do that. +Une fois l'installation terminée, vous pouvez démarrer le système dans votre +image @file{guixsd.img}. @xref{Lancer GuixSD dans une VM}, pour une manière de +faire. @node Construire l'image d'installation @subsection Construire l'image d'installation -@cindex installation image -The installation image described above was built using the @command{guix -system} command, specifically: +@cindex image d'installation +L'image d'installation décrite plus haut a été construite avec la commande +@command{guix system}, plus précisément : @example guix system disk-image gnu/system/install.scm @end example -Have a look at @file{gnu/system/install.scm} in the source tree, and see -also @ref{Invoquer guix system} for more information about the installation -image. +Regardez le fichier @file{gnu/system/install.scm} dans l'arborescence des +sources et regardez aussi @ref{Invoquer guix system} pour plus +d'informations sur l'image d'installation. @subsection Construire l'image d'installation pour les cartes ARM -Many ARM boards require a specific variant of the -@uref{http://www.denx.de/wiki/U-Boot/, U-Boot} bootloader. +De nombreuses cartes ARM requièrent une variante spécifique du chargeur +d'amorçage @uref{http://www.denx.de/wiki/U-Boot/, U-Boot}. -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: +Si vous construisez une image disque et que le chargeur d'amorçage n'est pas +disponible autrement (sur un autre périphérique d'amorçage etc), il est +recommandé de construire une image qui inclus le chargeur d'amorçage, plus +précisément : @example guix system disk-image --system=armhf-linux -e '((@@ (gnu system install) os-with-u-boot) (@@ (gnu system install) installation-os) "A20-OLinuXino-Lime2")' @end example -@code{A20-OLinuXino-Lime2} is the name of the board. If you specify an -invalid board, a list of possible boards will be printed. +@code{A20-OLinuXino-Lime2} est le nom de la carte. Si vous spécifiez une +carte invalide, une liste de cartes possibles sera affichée. @node Configuration système @section Configuration système -@cindex system configuration -The Guix System Distribution 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. +@cindex configuration du système +La distribution système Guix utilise un mécanisme de configuration du +système cohérent. On veut dire par là que tous les aspects de la +configuration globale du système — comme la disponibilité des services +système, des fuseaux horaires, des paramètres linguistiques, des comptes +utilisateurs — sont déclarés à un seul endroit. Une telle +@dfn{configuration système} peut être @dfn{instanciée}, c'est-à-dire entrer +en vigueur. @c Yes, we're talking of Puppet, Chef, & co. here. ↑ -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{Fonctionnalités}). 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. - -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. +L'un des avantages de placer toute la configuration du système sous le +contrôle de Guix est de permettre les mises à jour transactionnelles du +système ce qui rend possible le fait de revenir en arrière à une +instanciation précédent du système, si quelque chose se passait mal avec le +nouveau (@pxref{Fonctionnalités}). Un autre avantage est de rendre facile la +réplication de la même configuration sur plusieurs machines différentes ou à +différents moments dans le temps, sans avoir à recourir à des outils +d'administrations supplémentaires au-dessus des outils du système. + +Cette section décrit ce mécanisme. Tout d'abord nous nous concentrons sur +le point de vue de l'administrateur système en expliquant comment le système +est configuré et instancié. Ensuite nous montrons comment ce mécanisme peut +être étendu, par exemple pour supporter de nouveaux services systèmes. @menu * Utiliser le système de configuration:: Personnaliser votre système @@ -9351,26 +9383,27 @@ to support new system services. @node Utiliser le système de configuration @subsection Utiliser le système de configuration -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{Invoquer guix system}). A simple setup, with the default -system services, the default Linux-Libre kernel, initial RAM disk, and boot -loader looks like this: +Le système d'exploitation est configuré en fournissant une déclaration +@code{operating-system} dans un fichier qui peut être passé à la command +@command{guix system} (@pxref{Invoquer guix system}). Une configuration +simple, avec les services systèmes par défaut, le noyau Linux-Libre par +défaut, un disque de RAM initial et un chargeur d'amorçage ressemble à ceci +: @findex operating-system @lisp @include os-config-bare-bones.texi @end lisp -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. +Cet exemple devrait se comprendre de lui-même. Certains champs définis +ci-dessus, comme @code{host-name} et @code{bootloader} sont obligatoires. +D'autres comme @code{packages} et @code{services} peuvent être omis auquel +cas ils ont une valeur par défaut. -Below we discuss the effect of some of the most important fields -(@pxref{Référence de système d'exploitation}, for details about all the available -fields), and how to @dfn{instantiate} the operating system using -@command{guix system}. +Ci-dessous nous discutons des effets de certains des champs les plus +importants (@pxref{Référence de système d'exploitation}, pour des détails sur tous +les champs disponibles) et comment @dfn{instancier} le système +d'exploitation avec @command{guix system}. @unnumberedsubsubsec Bootloader @@ -9394,19 +9427,20 @@ lines: @xref{Configuration du chargeur d'amorçage}, for more information on the available configuration options. -@unnumberedsubsubsec Globally-Visible Packages +@unnumberedsubsubsec Paquets visibles sur tout le système @vindex %base-packages -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{Invoquer guix package}). The @var{%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 and OpenSSH to those, taken from the @code{(gnu packages -screen)} and @code{(gnu packages ssh)} modules (@pxref{Modules de paquets}). -The @code{(list package output)} syntax can be used to add a specific output -of a package: +Le champ @code{packages} liste les paquets qui seront visibles sur tout le +système, pour tous les comptes utilisateurs — c.-à-d.@: dans la variable +d'environnement @code{PATH} de tous les utilisateurs — en plus des paquets +par profil (@pxref{Invoquer guix package}). La variable +@var{%base-packages} fournit tous les outils qu'on pourrait attendre pour +les taches de base de l'administrateur et de l'utilisateur — dont les GNU +Core Utilities, les GNU Networking Utilities, l'éditeur de texte léger GNU +Zile, @command{find}, @command{grep}, etc. L'exemple au-dessus ajout +GNU@tie{}Screen et OpenSSH à ces paquets, récupérés depuis les modules +@code{(gnu packages screen)} et @code{(gnu packages ssh)} (@pxref{Modules de paquets}). La syntaxe @code{(list paquet sortie)} peut être utilisée pour +ajouter une sortie spécifique d'un paquet : @lisp (use-modules (gnu packages)) @@ -9419,13 +9453,14 @@ of a package: @end lisp @findex specification->package -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: +Se référer aux paquets par le nom de leur variable, comme @code{bind} +ci-dessus, a l'avantage d'être sans ambiguïté ; cela permet aussi de se +rendre rapidement compte de coquilles quand on a des « variables non liées +». L'inconvénient est qu'on a besoin de savoir dans quel module est défini +le paquet, et de modifier la ligne @code{use-package-modules} en +conséquence. Pour éviter cela, on peut utiliser la procédure +@code{specification->package} du module @code{(gnu packages)}, qui renvoie +le meilleur paquet pour un nom donné ou un nom et une version : @lisp (use-modules (gnu packages)) @@ -9437,32 +9472,34 @@ which returns the best package for a given name or name and version: %base-packages))) @end lisp -@unnumberedsubsubsec System Services +@unnumberedsubsubsec Services systèmes @cindex services @vindex %base-services -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 @command{lshd} secure shell daemon listening on port 2222 -(@pxref{Services réseau, @code{lsh-service}}). Under the hood, -@code{lsh-service} arranges so that @code{lshd} is started with the right -command-line options, possibly with supporting configuration files generated -as needed (@pxref{Définir des services}). - -@cindex customization, of services +Le champ @code{services} liste les @dfn{services système} à rendre +disponible lorsque le système démarre (@pxref{Services}). La déclaration +@code{operating-system} au-dessus spécifie que, en plus des services de +base, on veut que le démon ssh @command{lshd} écoute sur le port 2222 +(@pxref{Services réseau, @code{lsh-service}}). Sous le capot, +@code{lsh-service} s'arrange pour que @code{lshd} soit lancé avec les bonnes +options de la ligne de commande, éventuellement en générant des fichiers de +configuration (@pxref{Définir des services}). + +@cindex personnalisation des services @findex modify-services -Occasionally, instead of using the base services as is, you will want to -customize them. To do this, use @code{modify-services} (@pxref{Référence de service, @code{modify-services}}) to modify the list. +Parfois, plutôt que d'utiliser les services de base tels-quels, on peut +vouloir les personnaliser. Pour cela, utilisez @code{modify-services} +(@pxref{Référence de service, @code{modify-services}}) pour modifier la liste. -For example, suppose you want to modify @code{guix-daemon} and Mingetty (the -console log-in) in the @var{%base-services} list (@pxref{Services de base, -@code{%base-services}}). To do that, you can write the following in your -operating system declaration: +Par exemple, supposons que vous souhaitiez modifier @code{guix-daemon} et +Mingetty (l'écran de connexion en console) dans la liste +@var{%base-services} (@pxref{Services de base, @code{%base-services}}). Pour +cela, vous pouvez écrire ce qui suit dans votre déclaration de système +d'exploitation : @lisp (define %my-services - ;; My very own list of services. + ;; Ma propre liste de services. (modify-services %base-services (guix-service-type config => (guix-configuration @@ -9472,28 +9509,27 @@ operating system declaration: (mingetty-service-type config => (mingetty-configuration (inherit config))))) - (operating-system ;; @dots{} (services %my-services)) @end lisp -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 @var{%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. - -@cindex encrypted disk -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: +Cela modifie la configuration — c.-à-d.@: les paramètres du service — de +l'instance de @code{guix-service-type}, et de toutes les instances de +@code{mingetty-service-type} dans la liste @var{%base-services}. Remarquez +comment on fait cela : d'abord, on s'arrange pour que la configuration de +départ soit liée à l'identifiant @code{config} dans @var{body} puis on écrit +@var{body} pour qu'il s'évalue en la configuration désirée. En particulier, +remarquez comment on utilise @code{inherit} pour créer une nouvelle +configuration qui a les même valeurs que l'ancienne configuration, avec +seulement quelques modifications. + +@cindex chiffrement du disque +La configuration pour une utilisation de « bureau » typique, avec une +partition racine chiffrée, le serveur d'affichage X11, GNOME et Xfce (les +utilisateurs peuvent choisir l'environnement de bureau sur l'écran de +connexion en appuyant sur @kbd{F1}), la gestion du réseau, la gestion de +l'énergie, et bien plus, ressemblerait à ceci : @lisp @include os-config-desktop.texi @@ -9506,20 +9542,20 @@ full-blown desktop environments would look like this: @include os-config-lightweight-desktop.texi @end lisp -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. +Cet exemple se réfère au système de fichier @file{/boot/efi} par son UUID, +@code{1234-ABCD}. Remplacez cet UUID par le bon UUID de votre système, +renvoyé par la commande @command{blkid}. -@xref{Services de bureaux}, for the exact list of services provided by -@var{%desktop-services}. @xref{Certificats X.509}, for background -information about the @code{nss-certs} package that is used here. +@xref{Services de bureaux}, pour la liste exacte des services fournis par +@var{%desktop-services}. @xref{Certificats X.509}, pour des informations +sur le paquet @code{nss-certs} utilisé ici. -Again, @var{%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 @var{%desktop-services} minus the Avahi -service: +Encore une fois, @var{%desktop-services} n'est qu'une liste d'objets +service. Si vous voulez en supprimer des services, vous pouvez le faire +avec des procédures pour les listes (@pxref{SRFI-1 Filtering and +Partitioning,,, guile, GNU Guile Reference Manual}). Par exemple, +l'expression suivante renvoie une liste qui contient tous les services dans +@var{%desktop-services} sauf le service Avahi : @example (remove (lambda (service) @@ -9527,136 +9563,141 @@ service: %desktop-services) @end example -@unnumberedsubsubsec Instantiating the System - -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{Invoquer guix system}). - -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. - -@cindex roll-back, of the operating system -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}. - -Although the command @command{guix system reconfigure} will not modify -previous generations, must take care when the current generation is not the -latest (e.g., after invoking @command{guix system roll-back}), since the +@unnumberedsubsubsec Instancier le système + +En supposant que la déclaration @code{operating-system} est stockée dans le +fichier @file{my-system-config.scm}, la commande @command{guix system +reconfigure my-system-config.scm} instancie cette configuration et en fait +l'entrée par défaut dans GRUB (@pxref{Invoquer guix system}). + +Pour changer la configuration du système, on met normalement à jour ce +fichier et on relance @command{guix system reconfigure}. On ne devrait +jamais avoir à modifier de fichiers dans @file{/etc} ou à lancer des +commandes qui modifient l'état du système comme @command{useradd} ou +@command{grub-install}. En fait, vous devez les éviter parce que non +seulement ça annulerait vos garanties, mais ça empêcherait aussi de revenir +à des versions précédents du système, si vous en avez besoin. + +@cindex revenir en arrière dans la configuration du système +En parlant de revenir en arrière, à chaque fois que vous lancez +@command{guix system reconfigure}, une nouvelle @dfn{génération} du système +est crée — sans modifier ou supprimer les générations précédentes. Les +anciennes générations du système ont une entrée dans le menu du chargeur +d'amorçage, ce qui vous permet de démarrer dessus au cas où quelque chose se +serait mal passé avec la dernière génération. C'est rassurant, non ? La +commande @command{guix system list-generations} liste les générations du +système disponibles sur le disque. Il est possible de revenir à une +ancienne génération via les commandes @command{guix system roll-back} et +@command{guix system switch-generation}. + +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{Invoquer guix system}). -@unnumberedsubsubsec The Programming Interface +@unnumberedsubsubsec L'interface de programmation -At the Scheme level, the bulk of an @code{operating-system} declaration is -instantiated with the following monadic procedure (@pxref{La monad du dépôt}): +Au niveau Scheme, la grosse déclaration @code{operating-system} est +instanciée avec la procédure monadique suivante (@pxref{La monad du dépôt}) : -@deffn {Monadic Procedure} operating-system-derivation os -Return a derivation that builds @var{os}, an @code{operating-system} object -(@pxref{Dérivations}). +@deffn {Procédure Monadique} operating-system-derivation os +Renvoie une dérivation qui construit @var{os}, un objet +@code{operating-system} (@pxref{Dérivations}). -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}. +La sortie de la dérivation est un répertoire qui se réfère à tous les +paquets et d'autres fichiers supports requis pour instancier @var{os}. @end deffn -This procedure is provided by the @code{(gnu system)} module. Along with -@code{(gnu services)} (@pxref{Services}), this module contains the guts of -GuixSD. Make sure to visit it! +Cette procédure est fournie par le module @code{(gnu system)}. Avec +@code{(gnu srevices)} (@pxref{Services}), ce module contient les entrailles +de GuixSD. Ouvrez-le un jour ! @node Référence de système d'exploitation -@subsection @code{operating-system} Reference +@subsection Référence de @code{operating-system} -This section summarizes all the options available in @code{operating-system} -declarations (@pxref{Utiliser le système de configuration}). +Cette section résume toutes les options disponibles dans les déclarations +@code{operating-system} (@pxref{Utiliser le système de configuration}). -@deftp {Data Type} operating-system -This is the data type representing an operating system configuration. By -that, we mean all the global system configuration, not per-user -configuration (@pxref{Utiliser le système de configuration}). +@deftp {Type de données} operating-system +C'est le type de données représentant une configuration d'un système +d'exploitation. On veut dire par là toute la configuration globale du +système, mais pas la configuration par utilisateur (@pxref{Utiliser le système de configuration}). @table @asis -@item @code{kernel} (default: @var{linux-libre}) -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.}. - -@item @code{kernel-arguments} (default: @code{'()}) -List of strings or gexps representing additional arguments to pass on the -command-line of the kernel---e.g., @code{("console=ttyS0")}. +@item @code{kernel} (par défaut : @var{linux-libre}) +L'objet paquet d'un noyau de système d'exploitation à +utiliser@footnote{Actuellement seul le noyau Linux-libre est supporté. Dans +le futur, il sera possible d'utiliser GNU@tie{}Hurd.}. + +@item @code{kernel-arguments} (par défaut : @code{'()}) +Liste de chaînes ou de gexps représentant des arguments supplémentaires à +passer sur la ligne de commande du noyau — p.@: ex.@: +@code{("console=ttyS0")}. @item @code{bootloader} -The system bootloader configuration object. @xref{Configuration du chargeur d'amorçage}. +L'objet de configuration du chargeur d'amorçage. @xref{Configuration du chargeur d'amorçage}. -@item @code{initrd-modules} (default: @code{%base-initrd-modules}) +@item @code{initrd-modules} (par défaut : @code{%base-initrd-modules}) @cindex initrd -@cindex initial RAM disk -The list of Linux kernel modules that need to be available in the initial -RAM disk. @xref{Disque de RAM initial}. +@cindex disque de RAM initial +La liste des modules du noyau linux requis dans l'image disque de RAM +initiale. @xref{Disque de RAM initial}. -@item @code{initrd} (default: @code{base-initrd}) -A monadic 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{Disque de RAM initial}. +@item @code{initrd} (par défaut : @code{base-initrd}) +Une procédure monadique qui renvoie un disque de RAM initial pour le noyau +Linux. Ce champ est fournit pour pouvoir personnaliser son système à +bas-niveau et n'est que rarement utile dans le cas général. @xref{Disque de RAM initial}. -@item @code{firmware} (default: @var{%base-firmware}) +@item @code{firmware} (par défaut : @var{%base-firmware}) @cindex firmware -List of firmware packages loadable by the operating system kernel. +Liste les paquets de microgiciels chargeables pour le noyau de système +d'exploitation. -The default includes firmware needed for Atheros- and Broadcom-based WiFi -devices (Linux-libre modules @code{ath9k} and @code{b43-open}, -respectively). @xref{Considérations matérielles}, for more info on supported -hardware. +La valeur par défaut contient les microgiciels requis pour les périphériques +WiFi Atheros et Broadcom (modules @code{ath9k} et @code{b43-open} de +Linux-libre, respectivement). @xref{Considérations matérielles}, pour plus +d'info sur les périphériques supportés. @item @code{host-name} -The host name. +Le nom d'hôte. @item @code{hosts-file} -@cindex hosts file -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}. +@cindex fichier hosts +Un objet simili-fichier (@pxref{G-Expressions, file-like objects}) à +utiliser comme @file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C +Library Reference Manual}). La valeur par défaut est un fichier avec des +entrées pour @code{localhost} et @var{host-name}. -@item @code{mapped-devices} (default: @code{'()}) -A list of mapped devices. @xref{Périphériques mappés}. +@item @code{mapped-devices} (par défaut : @code{'()}) +Une liste de périphériques mappés. @xref{Périphériques mappés}. @item @code{file-systems} -A list of file systems. @xref{Systèmes de fichiers}. +Une liste de systèmes de fichiers. @xref{Systèmes de fichiers}. -@item @code{swap-devices} (default: @code{'()}) -@cindex swap devices -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{Périphériques mappés} and @ref{Systèmes de fichiers}. +@item @code{swap-devices} (par défaut : @code{'()}) +@cindex espaces d'échange +Une liste de chaînes identifiant les périphériques ou les fichiers utilisé +pour « l'espace d'échange » (@pxref{Memory Concepts,,, libc, The GNU C +Library Reference Manual}). Par exemple, @code{'("/dev/sda3")} ou +@code{'("/swapfile")}. Il est possible de spécifier un fichier d'échange +sur un périphérique mappé, tant que le périphérique nécessaire et le système +de fichiers sont aussi spécifiés. @xref{Périphériques mappés} et @ref{Systèmes de fichiers}. -@item @code{users} (default: @code{%base-user-accounts}) -@itemx @code{groups} (default: @var{%base-groups}) -List of user accounts and groups. @xref{Comptes utilisateurs}. +@item @code{users} (par défaut : @code{%base-user-accounts}) +@itemx @code{groups} (par défaut : @var{%base-groups}) +Liste les comptes utilisateurs et les groupes. @xref{Comptes utilisateurs}. -If the @code{users} list lacks a user account with UID@tie{}0, a ``root'' -account with UID@tie{}0 is automatically added. +Si la liste @code{users} n'a pas de compte lié à l'UID@tie{}0, un compte « +root » avec l'UID@tie{}0 est automatiquement ajouté. -@item @code{skeletons} (default: @code{(default-skeletons)}) -A list target file name/file-like object tuples (@pxref{G-Expressions, -file-like objects}). These are the skeleton files that will be added to the -home directory of newly-created user accounts. +@item @code{skeletons} (par défaut : @code{(default-skeletons)}) +Une liste de couples composés d'un nom de fichier cible et d'un objet +simili-fichier (@pxref{G-Expressions, file-like objects}). Ce sont les +fichiers squelettes qui seront ajoutés au répertoire personnel des comptes +utilisateurs nouvellement créés. -For instance, a valid value may look like this: +Par exemple, un valeur valide ressemblerait à cela : @example `((".bashrc" ,(plain-file "bashrc" "echo Hello\n")) @@ -9665,63 +9706,66 @@ For instance, a valid value may look like this: (activate-readline)"))) @end example -@item @code{issue} (default: @var{%default-issue}) -A string denoting the contents of the @file{/etc/issue} file, which is -displayed when users log in on a text console. +@item @code{issue} (par défaut : @var{%default-issue}) +Une chaîne qui dénote le contenu du fichier @file{/etc/issue} qui est +affiché lorsqu'un utilisateur se connecte sur la console. -@item @code{packages} (default: @var{%base-packages}) -The set of packages installed in the global profile, which is accessible at -@file{/run/current-system/profile}. +@item @code{packages} (par défaut : @var{%base-packages}) +L'ensemble des paquets installés dans le profil global, qui est accessible à +partir de @file{/run/current-system/profile}. -The default set includes core utilities and it is good practice to install -non-core utilities in user profiles (@pxref{Invoquer guix package}). +L'ensemble par défaut contient les utilitaires de base et c'est une bonne +pratique d'installer les utilitaires non essentiels dans les profils +utilisateurs (@pxref{Invoquer guix package}). @item @code{timezone} -A timezone identifying string---e.g., @code{"Europe/Paris"}. +Une chaîne identifiant un fuseau horaire — p.@: ex.@: @code{"Europe/Paris"}. -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. +Vous pouvez lancer la commande @command{tzselect} pour trouver le fuseau +horaire correspondant à votre région. Si vous choisissez un nom de fuseau +horaire invalide, @command{guix system} échouera. -@item @code{locale} (default: @code{"en_US.utf8"}) -The name of the default locale (@pxref{Locale Names,,, libc, The GNU C -Library Reference Manual}). @xref{Régionalisation}, for more information. +@item @code{locale} (par défaut : @code{"en_US.utf8"}) +Le nom du paramètre régional par défaut (@pxref{Locale Names,,, libc, The +GNU C Library Reference Manual}). @xref{Régionalisation}, pour plus d'informations. -@item @code{locale-definitions} (default: @var{%default-locale-definitions}) -The list of locale definitions to be compiled and that may be used at run -time. @xref{Régionalisation}. +@item @code{locale-definitions} (par défaut : @var{%default-locale-definitions}) +La liste des définitions de locales à compiler et qui devraient être +utilisées à l'exécution. @xref{Régionalisation}. -@item @code{locale-libcs} (default: @code{(list @var{glibc})}) -The list of GNU@tie{}libc packages whose locale data and tools are used to -build the locale definitions. @xref{Régionalisation}, for compatibility -considerations that justify this option. +@item @code{locale-libcs} (par défaut : @code{(list @var{glibc})}) +La liste des paquets GNU@tie{}libc dont les données des paramètres +linguistiques sont utilisées pour construire les définitions des paramètres +linguistiques. @xref{Régionalisation}, pour des considérations sur la compatibilité +qui justifient cette option. -@item @code{name-service-switch} (default: @var{%default-nss}) -Configuration of the libc name service switch (NSS)---a -@code{} object. @xref{Name Service Switch}, for -details. +@item @code{name-service-switch} (par défaut : @var{%default-nss}) +La configuration de NSS de la libc (name service switch) — un objet +@code{}. @xref{Name Service Switch}, pour des détails. -@item @code{services} (default: @var{%base-services}) -A list of service objects denoting system services. @xref{Services}. +@item @code{services} (par défaut : @var{%base-services}) +Une liste d'objets services qui dénotent les services du système. +@xref{Services}. -@item @code{pam-services} (default: @code{(base-pam-services)}) +@item @code{pam-services} (par défaut : @code{(base-pam-services)}) @cindex PAM @cindex pluggable authentication modules @c FIXME: Add xref to PAM services section. -Linux @dfn{pluggable authentication module} (PAM) services. +Services PAM (@dfn{pluggable authentication module}) Linux. -@item @code{setuid-programs} (default: @var{%setuid-programs}) -List of string-valued G-expressions denoting setuid programs. @xref{Programmes setuid}. +@item @code{setuid-programs} (par défaut : @var{%setuid-programs}) +Liste de G-expressions qui s'évaluent en chaînes de caractères qui dénotent +les programmes setuid. @xref{Programmes setuid}. -@item @code{sudoers-file} (default: @var{%sudoers-specification}) -@cindex sudoers file -The contents of the @file{/etc/sudoers} file as a file-like object -(@pxref{G-Expressions, @code{local-file} and @code{plain-file}}). +@item @code{sudoers-file} (par défaut : @var{%sudoers-specification}) +@cindex fichier sudoers +Le contenu du fichier @file{/etc/sudoers} comme un objet simili-fichier +(@pxref{G-Expressions, @code{local-file} et @code{plain-file}}). -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}. +Ce fichier spécifier quels utilisateurs peuvent utiliser la commande +@command{sudo}, ce qu'ils ont le droit de faire, et quels privilèges ils +peuvent gagner. La valeur par défaut est que seul @code{root} et les +membres du groupe @code{wheel} peuvent utiliser @code{sudo}. @end table @end deftp @@ -9729,9 +9773,10 @@ that only @code{root} and members of the @code{wheel} group may use @node Systèmes de fichiers @subsection Systèmes de fichiers -The list of file systems to be mounted is specified in the -@code{file-systems} field of the operating system declaration (@pxref{Utiliser le système de configuration}). Each file system is declared using the -@code{file-system} form, like this: +La liste des systèmes de fichiers à monter est spécifiée dans le champ +@code{file-systems} de la déclaration de système d'exploitation +(@pxref{Utiliser le système de configuration}). Chaque système de fichier est +déclaré avec la forme @code{file-system}, comme ceci : @example (file-system @@ -9740,36 +9785,39 @@ The list of file systems to be mounted is specified in the (type "ext4")) @end example -As usual, some of the fields are mandatory---those shown in the example -above---while others can be omitted. These are described below. +Comme d'habitude, certains de ces champs sont obligatoire — comme le montre +l'exemple au-dessus — alors que d'autres peuvent être omis. Ils sont +décrits plus bas. -@deftp {Data Type} file-system -Objects of this type represent file systems to be mounted. They contain the -following members: +@deftp {Type de données} file-system +Les objets de ce type représentent des systèmes de fichiers à monter. Ils +contiennent les membres suivants : @table @asis @item @code{type} -This is a string specifying the type of the file system---e.g., -@code{"ext4"}. +C'est une chaîne de caractères spécifiant le type du système de fichier — +p.@: ex.@: @code{"ext4"}. @item @code{mount-point} -This designates the place where the file system is to be mounted. +Désigne l'emplacement où le système de fichier sera monté. @item @code{device} -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.}. +Ce champ nomme le système de fichier « source ». il peut être l'une de ces +trois choses : une étiquette de système de fichiers, un UUID de système de +fichier ou le nom d'un nœud dans @file{/dev}. Les étiquettes et les UUID +offrent une manière de se référer à des systèmes de fichiers sans avoir à +coder en dur le nom de périphérique@footnote{Remarquez que, s'il est tentant +d'utiliser @file{/dev/disk/by-uuid} et autres chemins similaires pour +obtenir le même résultat, ce n'est pas recommandé : ces nœuds de +périphériques spéciaux sont créés par le démon udev et peuvent ne pas être +disponibles au moment de monter le périphérique.}. @findex file-system-label -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: +Les étiquettes de systèmes de fichiers sont crées avec la procédure +@code{file-system-label}, les UUID avec @code{uuid} et les nœuds de +@file{/dev} sont de simples chaînes de caractères. Voici un exemple d'un +système de fichiers référencé par son étiquette, donnée par la commande +@command{e2label} : @example (file-system @@ -9779,13 +9827,14 @@ shown by the @command{e2label} command: @end example @findex uuid -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: +Les UUID sont convertis à partir de leur représentation en chaîne de +caractères (montrée par la command @command{tune2fs -l}) en utilisant la +forme @code{uuid}@footnote{La forme @code{uuid} s'attend à des UUID sur 16 +octets définis dans la @uref{https://tools.ietf.org/html/rfc4122, +RFC@tie{}4122}. C'est la forme des UUID utilisées par la famille de +systèmes de fichiers ext2 et d'autres, mais ce n'est pas le même type d'UUID +que ceux qui se trouvent sur les systèmes de fichiers FAT par exemple}, +comme ceci : @example (file-system @@ -9794,165 +9843,179 @@ this: (device (uuid "4dab5feb-d176-45de-b287-9b0a6e4c01cb"))) @end example -When the source of a file system is a mapped device (@pxref{Périphériques mappés}), 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. - -@item @code{flags} (default: @code{'()}) -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), and -@code{no-exec} (disallow program execution.) - -@item @code{options} (default: @code{#f}) -This is either @code{#f}, or a string denoting mount options. - -@item @code{mount?} (default: @code{#t}) -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. - -@item @code{needed-for-boot?} (default: @code{#f}) -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. - -@item @code{check?} (default: @code{#t}) -This Boolean indicates whether the file system needs to be checked for -errors before being mounted. - -@item @code{create-mount-point?} (default: @code{#f}) -When true, the mount point is created if it does not exist yet. - -@item @code{dependencies} (default: @code{'()}) -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. - -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}. - -Another example is a file system that depends on a mapped device, for -example for an encrypted partition (@pxref{Périphériques mappés}). +Lorsque la source d'un système de fichiers est un périphérique mappé +(@pxref{Périphériques mappés}), sont champ @code{device} @emph{doit} se référer au +nom du périphérique mappé — p.@: ex.@: @file{"/dev/mapper/root-partition"}. +Cela est requis pour que le système sache que monter ce système de fichier +dépend de la présence du périphérique mappé correspondant. + +@item @code{flags} (par défaut : @code{'()}) +C'est une liste de symboles qui dénotent des drapeaux de montage. Les +drapeaux reconnus sont @code{read-only}, @code{bind-mount}, @code{no-dev} +(interdit l'accès aux fichiers spéciaux), @code{no-suid} (ignore les bits +setuid et setgid) et @code{no-exec} (interdit l'exécution de programmes). + +@item @code{options} (par défaut : @code{#f}) +C'est soit @code{#f} soit une chaîne de caractères dénotant des options de +montage. + +@item @code{mount?} (par défaut : @code{#t}) +Cette valeur indique s'il faut monter automatiquement le système de fichier +au démarrage du système. Lorsque la valeur est @code{#f}, le système de +fichier reçoit une entrée dans @file{/etc/fstab} (lue par la commande +@command{mount}) mais n'est pas monté automatiquement. + +@item @code{needed-for-boot?} (par défaut : @code{#f}) +Cette valeur booléenne indique si le système de fichier est nécessaire au +démarrage. Si c'est vrai alors le système de fichier est monté au +chargement du disque de RAM initial. C'est toujours le cas par exemple du +système de fichiers racine. + +@item @code{check?} (par défaut : @code{#t}) +Cette valeur booléenne indique si le système de fichier doit être vérifié +avant de le monter. + +@item @code{create-mount-point?} (par défaut : @code{#f}) +Lorsque cette valeur est vraie, le point de montage est créé s'il n'existe +pas déjà. + +@item @code{dependencies} (par défaut : @code{'()}) +C'est une liste d'objets @code{} ou @code{} qui +représentent les systèmes de fichiers qui doivent être montés ou les +périphériques mappés qui doivent être ouverts avant (et monté ou fermés +après) celui-ci. + +Par exemple, considérons une hiérarchie de montage : @file{/sys/fs/cgroup} +est une dépendance de @file{/sys/fs/cgroup/cpu} et +@file{/sys/fs/cgroup/memory}. + +Un autre exemple est un système de fichier qui dépend d'un périphérique +mappé, par exemple pour une partition chiffrée (@pxref{Périphériques mappés}). @end table @end deftp -The @code{(gnu system file-systems)} exports the following useful variables. +Le module @code{(gnu system file-systems)} exporte les variables utiles +suivantes. -@defvr {Scheme Variable} %base-file-systems -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. +@defvr {Variable Scheme} %base-file-systems +Ce sont les systèmes de fichiers essentiels qui sont requis sur les systèmes +normaux, comme @var{%pseudo-terminal-file-system} et @var{%immutable-store} +(voir plus bas). Les déclarations de systèmes d'exploitation devraient au +moins les contenir. @end defvr -@defvr {Scheme Variable} %pseudo-terminal-file-system -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}. +@defvr {Variable Scheme} %pseudo-terminal-file-system +C'est le système de fichier monté sur @file{/dev/pts}. Il supporte les +@dfn{pseudo-terminaux} créés via @code{openpty} et les fonctions similaires +(@pxref{Pseudo-Terminals,,, libc, The GNU C Library Reference Manual}). Les +pseudo-terminaux sont utilisés par les émulateurs de terminaux comme +@command{xterm}. @end defvr -@defvr {Scheme Variable} %shared-memory-file-system -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}). +@defvr {Variable Scheme} %shared-memory-file-system +Ce système de fichier est monté dans @file{/dev/shm} et est utilisé pour le +partage de mémoire entre processus (@pxref{Memory-mapped I/O, +@code{shm_open},, libc, The GNU C Library Reference Manual}). @end defvr -@defvr {Scheme Variable} %immutable-store -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. +@defvr {Variable Scheme} %immutable-store +Ce système de fichiers effectue un « montage lié » en lecture-seule de +@file{/gnu/store}, ce qui en fait un répertoire en lecture-seule pour tous +les utilisateurs dont @code{root}. Cela évite que des logiciels qui +tournent en @code{root} ou des administrateurs systèmes ne modifient +accidentellement le dépôt. -The daemon itself is still able to write to the store: it remounts it -read-write in its own ``name space.'' +Le démon lui-même est toujours capable d'écrire dans le dépôt : il est +remonté en lecture-écriture dans son propre « espace de nom ». @end defvr -@defvr {Scheme Variable} %binary-format-file-system -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. +@defvr {Variable Scheme} %binary-format-file-system +Le système de fichiers @code{binfmt_misc}, qui permet de gérer n'importe +quel type de fichiers exécutables à déléguer en espace utilisateur. Cela +demande que le module du noyau @code{binfmt.ko} soit chargé. @end defvr -@defvr {Scheme Variable} %fuse-control-file-system -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. +@defvr {Variable Scheme} %fuse-control-file-system +Le système de fichiers @code{fusectl}, qui permet à des utilisateurs non +privilégiés de monter et de démonter des systèmes de fichiers FUSE en espace +utilisateur. Cela requiert que le module du noyau @code{fuse.ko} soit +chargé. @end defvr @node Périphériques mappés @subsection Périphériques mappés -@cindex device mapping -@cindex mapped devices -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. - -Mapped devices are declared using the @code{mapped-device} form, defined as -follows; for examples, see below. - -@deftp {Data Type} mapped-device -Objects of this type represent device mappings that will be made when the -system boots up. +@cindex mappage de périphériques +@cindex périphériques mappés +Le noyau Linux a une notion de @dfn{mappage de périphériques} : un +périphérique bloc, comme une partition sur un disque dur, peut être +@dfn{mappé} sur un autre périphérique, typiquement dans @code{/dev/mapper}, +avec des calculs supplémentaires sur les données qui naviguent entre les +deux@footnote{Remarquez que le Hurd ne fait pas de différence entre le +concept de « périphérique mappé » et celle d'un système de fichiers : les +deux correspondent à la @emph{traduction} des opérations d'entrée-sortie +faites sur un fichier en des opérations sur ce qui le contient. Ainsi, le +Hurd implémente les périphériques mappés, comme les systèmes de fichiers, +avec le mécanisme des @dfn{traducteurs} générique (@pxref{Translators,,, +hurd, The GNU Hurd Reference Manual}).}. Un exemple typique est le mappage +de périphériques chiffrés : toutes les écritures sont sur le périphérique +mappé sont chiffrées, toutes les lectures déchiffrées, de manière +transparente. Guix étend cette notion en considérant que tout périphérique +ou ensemble de périphériques qui sont @dfn{transformés} d'une certaine +manière créent un nouveau périphérique ; par exemple, les périphériques RAID +sont obtenus en @dfn{assemblant} plusieurs autres périphériques, comme des +disque ou des partitions, en un nouveau périphérique en tant qu'unique +partition. Un autre exemple, qui n'est pas encore disponible, sont les +volumes logiques LVM. + +Les périphériques mappés sont déclarés avec la forme @code{mapped-device}, +définie comme suit ; par exemple, voir ci-dessous. + +@deftp {Type de données} mapped-device +Les objets de ce type représentent des mappages de périphériques qui seront +effectués au démarrage du système. @table @code @item source -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. +C'est soit une chaîne qui spécifie le nom d'un périphérique bloc à mapper, +comme @code{"/dev/sda3"}, soit une liste de plusieurs périphériques à +assembler pour en créer un nouveau. @item target -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. +Cette chaîne spécifie le nom du périphérique mappé qui en résulte. Pour les +mappeurs noyaux comme les périphériques chiffrés de type +@code{luks-device-mapping}, spécifier @code{"ma-partition"} crée le +périphérique @code{"/dev/mapper/ma-partition"}. Pour les périphériques RAID +de type @code{raid-device-mapping}, il faut donner le nom complet comme +@code{"/dev/md0"}. @item type -This must be a @code{mapped-device-kind} object, which specifies how -@var{source} is mapped to @var{target}. +Ce doit être un objets @code{mapped-device-kind}, qui spécifie comment +@var{source} est mappés sur @var{target}. @end table @end deftp -@defvr {Scheme Variable} luks-device-mapping -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. +@defvr {Variable Scheme} luks-device-mapping +Cela définie les périphériques blocs chiffrés en LUKS avec +@command{cryptsetup} du paquet du même nom. Elle s'appuie sur le module du +noyau Linux @code{dm-crypt}. @end defvr -@defvr {Scheme Variable} raid-device-mapping -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. +@defvr {Variable Scheme} raid-device-mapping +Cela définie un périphérique RAID qui est assemblé avec la commande +@code{mdadm} du paquet du même nom. Elle nécessite un module noyau Linux +approprié pour le niveau RAID chargé, comme @code{raid456} pour RAID-4, +RAID-5 et RAID-6 ou @code{raid10} pour RAID-10. @end defvr -@cindex disk encryption +@cindex chiffrement du disque @cindex LUKS -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{Systèmes de fichiers}). +L'exemple suivant spécifie un mappage de @file{/dev/sda3} vers +@file{/dev/mapper/home} avec LUKS — +@url{https://gitlab.com/cryptsetup/cryptsetup,Linux Unified Key Setup}, un +mécanisme standard pour chiffrer les disques. Le périphérique +@file{/dev/mapper/home} peut ensuite être utilisé comme @code{device} d'une +déclaration @code{file-system} (@pxref{Systèmes de fichiers}). @example (mapped-device @@ -9961,14 +10024,15 @@ can then be used as the @code{device} of a @code{file-system} declaration (type luks-device-mapping)) @end example -Alternatively, to become independent of device numbering, one may obtain the -LUKS UUID (@dfn{unique identifier}) of the source device by a command like: +Autrement, pour devenir indépendant du numéro de périphérique, on peut +obtenir l'UUID LUKS (@dfn{l'identifiant unique}) du périphérique source avec +une commande comme : @example cryptsetup luksUUID /dev/sda3 @end example -and use it as follows: +et l'utiliser ainsi : @example (mapped-device @@ -9977,14 +10041,16 @@ and use it as follows: (type luks-device-mapping)) @end example -@cindex swap encryption -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{Préparer l'installation,,Disk Partitioning}, for an example. +@cindex chiffrement de l'espace d'échange +Il est aussi désirable de chiffrer l'espace d'échange, puisque l'espace +d'échange peut contenir des données sensibles. Une manière de faire cela +est d'utiliser un fichier d'échange dans un système de fichiers sur un +périphérique mappé avec un chiffrement LUKS. De cette manière, le fichier +d'échange est chiffré parce que tout le périphérique est chiffré. +@xref{Préparer l'installation,,Disk Partitioning}, pour un exemple. -A RAID device formed of the partitions @file{/dev/sda1} and @file{/dev/sdb1} -may be declared as follows: +Un périphérique RAID formé des partitions @file{/dev/sda1} et +@file{/dev/sdb1} peut être déclaré ainsi : @example (mapped-device @@ -9993,172 +10059,182 @@ may be declared as follows: (type raid-device-mapping)) @end example -The @file{/dev/md0} device can then be used as the @code{device} of a -@code{file-system} declaration (@pxref{Systèmes de fichiers}). 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. +Le périphérique @file{/dev/md0} peut ensuite être utilisé comme +@code{device} d'une déclaration @code{file-system} (@pxref{Systèmes de fichiers}). +Remarquez que le niveau de RAID n'a pas besoin d'être donné ; il est choisi +pendant la création initiale du périphérique RAID et est ensuite déterminé +automatiquement. @node Comptes utilisateurs @subsection Comptes utilisateurs -@cindex users -@cindex accounts -@cindex user accounts -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: +@cindex utilisateurs +@cindex comptes +@cindex comptes utilisateurs +Les comptes utilisateurs et les groupes sont gérés entièrement par la +déclaration @code{operating-system}. Ils sont spécifiés avec les formes +@code{user-account} et @code{user-group} : @example (user-account (name "alice") (group "users") - (supplementary-groups '("wheel" ;allow use of sudo, etc. - "audio" ;sound card - "video" ;video devices such as webcams - "cdrom")) ;the good ol' CD-ROM + (supplementary-groups '("wheel" ;permet d'utiliser sudo, etc. + "audio" ;carte son + "video" ;périphériques réseaux comme les webcams + "cdrom")) ;le bon vieux CD-ROM (comment "Bob's sister") (home-directory "/home/alice")) @end example -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. +Lors du démarrage ou à la fin de @command{guix system reconfigure}, le +système s'assure que seuls les comptes utilisateurs et les groupes spécifiés +dans la déclaration @code{operating-system} existent, et avec les propriétés +spécifiées. Ainsi, les modifications ou les créations de comptes ou de +groupes effectuées directement en invoquant des commandes comme +@command{useradd} sont perdue à la reconfiguration ou au redémarrage. Cela +permet de s'assurer que le système reste exactement tel que déclaré. -@deftp {Data Type} user-account -Objects of this type represent user accounts. The following members may be -specified: +@deftp {Type de données} user-account +Les objets de se type représentent les comptes utilisateurs. Les membres +suivants peuvent être spécifiés : @table @asis @item @code{name} -The name of the user account. +Le nom du compte utilisateur. @item @code{group} -@cindex groups -This is the name (a string) or identifier (a number) of the user group this -account belongs to. +@cindex groupes +C'est le nom (une chaîne) ou un identifiant (un nombre) du groupe +utilisateur auquel ce compte appartient. -@item @code{supplementary-groups} (default: @code{'()}) -Optionally, this can be defined as a list of group names that this account -belongs to. +@item @code{supplementary-groups} (par défaut : @code{'()}) +Éventuellement, cela peut être définie comme une liste de noms de groupes +auxquels ce compte appartient. -@item @code{uid} (default: @code{#f}) -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. +@item @code{uid} (par défaut : @code{#f}) +C'est l'ID utilisateur de ce compte (un nombre) ou @code{#f}. Dans ce +dernier cas, le nombre est choisi automatiquement par le système à la +création du compte. -@item @code{comment} (default: @code{""}) -A comment about the account, such as the account owner's full name. +@item @code{comment} (par défaut : @code{""}) +Un commentaire à propos du compte, comme le nom complet de l'utilisateur. @item @code{home-directory} -This is the name of the home directory for the account. +C'est le nom du répertoire personnel du compte. -@item @code{create-home-directory?} (default: @code{#t}) -Indicates whether the home directory of this account should be created if it -does not exist yet. +@item @code{create-home-directory?} (par défaut : @code{#t}) +Indique si le répertoire personnel du compte devrait être créé s'il n'existe +pas déjà. -@item @code{shell} (default: Bash) -This is a G-expression denoting the file name of a program to be used as the -shell (@pxref{G-Expressions}). +@item @code{shell} (par défaut : Bash) +C'est une G-expression qui dénote un nom de fichier d'un programme utilisé +comme shell (@pxref{G-Expressions}). -@item @code{system?} (default: @code{#f}) -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. +@item @code{system?} (par défaut : @code{#f}) +C'est une valeur booléenne qui indique si le compte est un compte « système +». Les comptes systèmes sont parfois traités à part ; par exemple, les +gestionnaires de connexion graphiques ne les liste pas. @anchor{user-account-password} -@item @code{password} (default: @code{#f}) -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. - -If you @emph{do} want to have a preset password for an account, then this -field must contain the encrypted password, as a string. @xref{crypt,,, -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. +@item @code{password} (par défaut : @code{#f}) +Vous laisseriez normalement ce champ à @code{#f} et initialiseriez les mots +de passe utilisateurs en tant que @code{root} avec la commande +@command{passwd}, puis laisseriez l'utilisateur le changer avec +@command{passwd}. Les mots de passes définis avec @command{passwd} sont +bien sûr préservés après redémarrage et reconfiguration. + +Si vous voulez @emph{vraiment} définir un mot de passe pour un compte, alors +ce champ doit contenir le mot de passe chiffré, comme une chaîne de +caractère. @xref{crypt,,, libc, The GNU C Library Reference Manual}, pour +plus d'information sur le chiffrement des mots de passe et +@ref{Encryption,,, guile, GNU Guile Reference Manual}, pour des informations +sur la procédure @code{crypt} de Guile. @end table @end deftp -@cindex groups -User group declarations are even simpler: +@cindex groupes +Les déclarations de groupes sont encore plus simple : @example (user-group (name "students")) @end example -@deftp {Data Type} user-group -This type is for, well, user groups. There are just a few fields: +@deftp {Type de données} user-group +C'est le type pour, hé bien, les comptes utilisateurs. Il n'y a que +quelques champs : @table @asis @item @code{name} -The name of the group. +Le nom du groupe. -@item @code{id} (default: @code{#f}) -The group identifier (a number). If @code{#f}, a new number is -automatically allocated when the group is created. +@item @code{id} (par défaut : @code{#f}) +L'identifiant du groupe (un nombre). S'il est @code{#f}, un nouveau nombre +est alloué automatiquement lorsque le groupe est créé. -@item @code{system?} (default: @code{#f}) -This Boolean value indicates whether the group is a ``system'' group. -System groups have low numerical IDs. +@item @code{system?} (par défaut : @code{#f}) +Cette valeur booléenne indique si le groupe est un groupe « système ». les +groupes systèmes ont un numéro d'ID bas. -@item @code{password} (default: @code{#f}) -What, user groups can have a password? Well, apparently yes. Unless -@code{#f}, this field specifies the password of the group. +@item @code{password} (par défaut : @code{#f}) +Quoi, les groupes utilisateurs peuvent avoir des mots de passe ? On dirait +bien. À moins que la valeur ne soit @code{#f}, ce champ spécifie le mot de +passe du groupe. @end table @end deftp -For convenience, a variable lists all the basic user groups one may expect: +Par simplicité, une variable liste les groupes utilisateurs de base auxquels +on pourrait s'attendre : -@defvr {Scheme Variable} %base-groups -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''. +@defvr {Variable Scheme} %base-groups +C'est la liste des groupes utilisateur de base que les utilisateurs et les +paquets s'attendent à trouver sur le système. Cela comprend des groupes +comme « root », « wheel » et « users », ainsi que des groupes utilisés pour +contrôler l'accès à certains périphériques, comme « audio », « disk » et « +cdrom ». @end defvr -@defvr {Scheme Variable} %base-user-accounts -This is the list of basic system accounts that programs may expect to find -on a GNU/Linux system, such as the ``nobody'' account. +@defvr {Variable Scheme} %base-user-accounts +C'est la liste des compte du système de base que les programmes peuvent +s'attendre à trouver sur un système GNU/Linux, comme le compte « nobody ». -Note that the ``root'' account is not included here. It is a special-case -and is automatically added whether or not it is specified. +Remarquez que le compte « root » n'est pas défini ici. C'est un cas +particulier et il est automatiquement ajouté qu'il soit spécifié ou non. @end defvr @node Régionalisation @subsection Régionalisation -@cindex locale -A @dfn{locale} defines cultural conventions for a particular language and -region of the world (@pxref{Régionalisation,,, 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. - -@cindex locale definition -Usually, you will want to specify the default locale for the machine using -the @code{locale} field of the @code{operating-system} declaration -(@pxref{Référence de système d'exploitation, @code{locale}}). - -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. - -For instance, to add the North Frisian locale for Germany, the value of that -field may be: +@cindex paramètres linguistiques +Un @dfn{paramètre linguistique} définie les conventions culturelles d'une +langue et d'une région particulières (@pxref{Régionalisation,,, libc, The GNU C +Library Reference Manual}). Chaque paramètre linguistique a un nom de la +forme @code{@var{langue}_@var{territoire}.@var{jeudecaractères}} — p.@: +ex.@: @code{fr_LU.utf8} désigne le paramètre linguistique pour le français, +avec les conventions culturelles du Luxembourg, en utilisant l'encodage +UTF-8. + +@cindex définition des paramètres linguistiques +Normalement, vous voudrez spécifier les paramètres linguistiques par défaut +pour la machine en utilisant le champ @code{locale} de la déclaration +@code{operating-system} (@pxref{Référence de système d'exploitation, @code{locale}}). + +Les paramètres régionaux choisis sont automatiquement ajoutés aux +définitions des @dfn{paramètres régionaux} connues par le système au besoin, +avec le jeu de caractères inféré à partir de son nom, p.@: ex.@: +@code{bo_CN.utf8} supposera qu'il faut utiliser le jeu de caractères +@code{UTF-8}. Des définitions supplémentaires peuvent être spécifiées dans +le champ @code{locale-definitions} de @code{operating-system} — c'est utile +par exemple si le jeu de caractères n'a pas été inféré à partir du nom. +L'ensemble par défaut de définitions comprend certains paramètres +linguistiques parmi les plus utilisés, mais pas toutes les variantes +disponibles, pour gagner de la place. + +Par exemple, pour ajouter les paramètres pour le frison septentrional en +Allemagne, la valeur de ce champ serait : @example (cons (locale-definition @@ -10166,8 +10242,9 @@ field may be: %default-locale-definitions) @end example -Likewise, to save space, one might want @code{locale-definitions} to list -only the locales that are actually used, as in: +De me, pour gagner de la place, on peut vouloir lister dans +@code{locale-definitions} seulement les paramètres qui sont vraiment +utilisés, comme dans : @example (list (locale-definition @@ -10176,83 +10253,90 @@ only the locales that are actually used, as in: @end example @vindex LOCPATH -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}). +Les définitions des paramètres linguistiques compilées sont disponibles dans +@file{/run/current-system/locale/X.Y}, où @code{X.Y} est la version de la +libc, ce qui est l'emplacement par défaut où la GNU@tie{}libc fournie par +Guix cherche les données de régionalisation. Cet emplacement peut être +modifié avec la variable d'environnement @code{LOCPATH} +(@pxref{locales-and-locpath, @code{LOCPATH} and locale packages}). -The @code{locale-definition} form is provided by the @code{(gnu system -locale)} module. Details are given below. +La forme @code{locale-definition} est fournie par le module @code{(gnu +system locale)}. Des détails sont disponibles plus bas. -@deftp {Data Type} locale-definition -This is the data type of a locale definition. +@deftp {Type de données} locale-definition +C'est le type de données d'une définition de paramètres linguistiques. @table @asis @item @code{name} -The name of the locale. @xref{Locale Names,,, libc, The GNU C Library -Reference Manual}, for more information on locale names. +Le nom du paramètre linguistique. @xref{Locale Names,,, libc, The GNU C +Library Reference Manual}, pour en savoir plus sur les noms de paramètres +linguistiques. @item @code{source} -The name of the source for that locale. This is typically the -@code{@var{language}_@var{territory}} part of the locale name. +Le nom de la source pour ce paramètre linguistique. C'est typiquement la +partie @code{@var{langue}_@var{territoire}} du nom du paramètre. -@item @code{charset} (default: @code{"UTF-8"}) -The ``character set'' or ``code set'' for that locale, -@uref{http://www.iana.org/assignments/character-sets, as defined by IANA}. +@item @code{charset} (par défaut : @code{"UTF-8"}) +Le « jeu de caractères » d'un paramètre linguistique, +@uref{http://www.iana.org/assignments/character-sets, défini par l'IANA}. @end table @end deftp -@defvr {Scheme Variable} %default-locale-definitions -A list of commonly used UTF-8 locales, used as the default value of the -@code{locale-definitions} field of @code{operating-system} declarations. - -@cindex locale name -@cindex normalized codeset in locale names -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}. +@defvr {Variable Scheme} %default-locale-definitions +Une liste des paramètres linguistiques UTF-8 couramment utilisés, utilisée +comme valeur par défaut pour le champ @code{locale-definitions} des +déclarations @code{operating-system}. + +@cindex nom de paramètre linguistique +@cindex jeu de caractère normalisé dans les noms de paramètres linguistiques +Ces définitions de paramètres linguistiques utilisent le @dfn{jeu de +caractère normalisé} pour la partie qui suit le point dans le nom +(@pxref{Using gettextized software, normalized codeset,, libc, The GNU C +Library Reference Manual}). Donc par exemple il y a @code{uk_UA.utf8} mais +@emph{pas}, disons, @code{uk_UA.UTF-8}. @end defvr -@subsubsection Locale Data Compatibility Considerations +@subsubsection Considérations sur la compatibilité des données linguistiques -@cindex incompatibility, of locale data -@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{Référence de système d'exploitation}). ``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. +@cindex incompatibilité, des données linguistiques +Les déclaration @code{operating-system} fournissent un champ +@code{locale-libcs} pour spécifier les paquets GNU@tie{}libc à utiliser pour +compiler les déclarations de paramètres linguistiques +(@pxref{Référence de système d'exploitation}). « Pourquoi je devrais m'en soucier ? +», vous demandez-vous sûrement. Hé bien il se trouve que le format binaire +des données linguistique est parfois incompatible d'une version de la libc à +une autre. @c See @c and . -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. - -The ``problem'' in GuixSD 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. - -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}). - -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}: +Par exemple, un programme lié à la libc version 2.21 est incapable de lire +les données linguistiques produites par la libc 2.22 ; pire, ce programme +@emph{plante} plutôt que d'ignorer les données linguistiques +incompatibles@footnote{Les version 2.23 et supérieures de la GNU@tie{}libc +sauteront simplement les données linguistiques incompatibles, ce qui est +déjà mieux.}. De même, un programme lié à la libc 2.22 peut lire la plupart +mais pas toutes les données linguistiques de la libc 2.21 (spécifiquement +les données @code{LC_COLLATE} sont incompatibles) ; donc les appels à +@code{setlocale} peuvent échouer, mais les programmes ne plantent pas. + +Le « problème » avec GuixSD c'est que les utilisateurs ont beaucoup de +liberté : ils peuvent choisir s'ils veulent et quand ils veulent mettre à +jour les logiciels de leur profil, et peuvent utiliser une version +différente de la libc de celle que l'administrateur système utilise pour +construire les données linguistiques du système global. + +Heureusement, les utilisateurs non privilégiés peuvent aussi installer leur +propres données linguistiques et définir @var{GUIX_LOCPATH} comme il le faut +(@pxref{locales-and-locpath, @code{GUIX_LOCPATH} and locale packages}). + +Cependant, c'est encore mieux si les données linguistiques du système dans +@file{/run/current-system/locale} étaient construites avec les versions de +la libc utilisées sur le système, pour que tous les programmes puissent y +accéder — c'est surtout crucial sur un système multi-utilisateurs. Pour +cela, l'administrateur peut spécifier plusieurs paquets de la libc dans le +champ @code{locale-libcs} de @code{operating-system} : @example (use-package-modules base) @@ -10262,42 +10346,45 @@ can specify several libc packages in the @code{locale-libcs} field of (locale-libcs (list glibc-2.21 (canonical-package glibc)))) @end example -This example would lead to a system containing locale definitions for both -libc 2.21 and the current version of libc in +cet exemple créera un système contenant les définitions des paramètres +linguistiques pour la libc 2.21 et pour la version actuelle de la libc dans @file{/run/current-system/locale}. @node Services @subsection Services -@cindex system services -An important part of preparing an @code{operating-system} declaration is -listing @dfn{system services} and their configuration (@pxref{Utiliser le système de configuration}). System services are typically daemons launched when -the system boots, or other actions needed at that time---e.g., configuring -network access. - -GuixSD has a broad definition of ``service'' (@pxref{Composition de services}), -but many services are managed by the GNU@tie{}Shepherd (@pxref{Services Shepherd}). 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: +@cindex services systèmes +Une part importante de la préparation d'une déclaration +@code{operating-system} est la liste des @dfn{services systèmes} et de leur +configuration (@pxref{Utiliser le système de configuration}). Les services +systèmes sont typiquement des démons lancés au démarrage ou d'autres actions +requises à ce moment-là — p.@: ex.@: configurer les accès réseaux. + +GuixSD a une définition large de « service » (@pxref{Composition de services}), +mais beaucoup de services sont gérés par le GNU@tie{}Shepherd +(@pxref{Services Shepherd}). Sur un système lancé, la commande +@command{herd} vous permet de lister les services disponibles, montrer leur +statut, les démarrer et les arrêter, ou faire d'autres opérations +spécifiques (@pxref{Jump Start,,, shepherd, The GNU Shepherd Manual}). Par +exemple : @example # herd status @end example -The above command, run as @code{root}, lists the currently defined -services. The @command{herd doc} command shows a synopsis of the given -service: +La commande ci-dessus, lancée en @code{root}, liste les services +actuellement définis. La commande @command{herd doc} montre un synopsis du +service donné : @example # herd doc nscd Run libc's name service cache daemon (nscd). @end example -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: +Les sous-commandes @command{start}, @command{stop} et @command{restart} ont +l'effet auquel on s'attend. Par exemple, les commande suivantes stoppent le +service nscd et redémarrent le serveur d'affichage Xorg : @example # herd stop nscd @@ -10307,8 +10394,9 @@ Service xorg-server has been stopped. Service xorg-server has been started. @end example -The following sections document the available services, starting with the -core services, that may be used in an @code{operating-system} declaration. +Les sections suivantes documentent les services disponibles, en commençant +par les services de base qui peuvent être utilisés avec une déclaration +@code{operating-system}. @menu * Services de base:: Services systèmes essentiels. @@ -10344,58 +10432,64 @@ core services, that may be used in an @code{operating-system} declaration. @node Services de base @subsubsection Services de base -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. +Le module @code{(gnu services base)} fournit des définitions de services +poru les services de base qu'on peut attendre du système. Les services +exportés par ce module sort listés ci-dessous. -@defvr {Scheme Variable} %base-services -This variable contains a list of basic services (@pxref{Types service et 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. +@defvr {Variable Scheme} %base-services +Cette variable contient une liste de services de base (@pxref{Types service et services}, pour plus d'informations sur les objets service) qu'on peut +attendre du système : un service de connexion (mingetty) sur chaque tty, +syslogd, le démon de cache de noms de la libc (nscd), le gestionnaire de +périphériques udev, et plus. -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 @var{%base-services}, like this: +C'est la valeur par défaut du champ @code{services} des déclarations +@code{operating-system}. Habituellement, lors de la personnalisation d'un +système, vous voudrez ajouter des services à ceux de @var{%base-services}, +comme ceci : @example (cons* (avahi-service) (lsh-service) %base-services) @end example @end defvr -@defvr {Scheme Variable} special-files-service-type -This is the service that sets up ``special files'' such as @file{/bin/sh}; -an instance of it is part of @code{%base-services}. +@defvr {Variable Scheme} special-files-service-type +C'est le service qui met en place des « fichiers spéciaux » comme +@file{/bin/sh} ; une instance de ce service fait partie de +@code{%base-services}. -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: +La valeur associée avec les services @code{special-files-service-type} doit +être une liste de couples dont le premier élément est le « fichier spécial » +et le deuxième sa cible. Par défaut il s'agit de : @cindex @file{/bin/sh} -@cindex @file{sh}, in @file{/bin} +@cindex @file{sh}, dans @file{/bin} @example `(("/bin/sh" ,(file-append @var{bash} "/bin/sh"))) @end example @cindex @file{/usr/bin/env} -@cindex @file{env}, in @file{/usr/bin} -If you want to add, say, @code{/usr/bin/env} to your system, you can change -it to: +@cindex @file{env}, dans @file{/usr/bin} +Si vous voulez ajouter, disons, @code{/usr/bin/env} à votre système, vous +pouvez changer cela en : @example `(("/bin/sh" ,(file-append @var{bash} "/bin/sh")) ("/usr/bin/env" ,(file-append @var{coreutils} "/bin/env"))) @end example -Since this is part of @code{%base-services}, you can use -@code{modify-services} to customize the set of special files (@pxref{Référence de service, @code{modify-services}}). But the simple way to add a special -file is @i{via} the @code{extra-special-file} procedure (see below.) +Comme il fait parti de @code{%base-services}, vous pouvez utiliser +@code{modify-services} pour personnaliser l'ensemble des fichiers spéciaux +(@pxref{Référence de service, @code{modify-services}}). Mais une manière plus +simple d'ajouter un fichier spécial est d'utiliser la procédure +@code{extra-special-file} (voir plus bas). @end defvr -@deffn {Scheme Procedure} extra-special-file @var{file} @var{target} -Use @var{target} as the ``special file'' @var{file}. +@deffn {Procédure Scheme} extra-special-file @var{file} @var{target} +Utilise @var{target} comme « fichier spécial » @var{file}. -For example, adding the following lines to the @code{services} field of your -operating system declaration leads to a @file{/usr/bin/env} symlink: +Par exemple, ajouter l'une des lignes suivantes au champ @code{services} de +votre déclaration de système d'exploitation crée un lien symbolique +@file{/usr/bin/env} : @example (extra-special-file "/usr/bin/env" @@ -10403,345 +10497,366 @@ operating system declaration leads to a @file{/usr/bin/env} symlink: @end example @end deffn -@deffn {Scheme Procedure} host-name-service @var{name} -Return a service that sets the host name to @var{name}. +@deffn {Procédure Scheme} host-name-service @var{name} +Renvoie un service qui paramètre le nom d'hôte à @var{name}. @end deffn -@deffn {Scheme Procedure} login-service @var{config} -Return a service to run login according to @var{config}, a -@code{} object, which specifies the message of the day, -among other things. +@deffn {Procédure Scheme} login-service @var{config} +Renvoie un service pour lancer login en suivant @var{config}, un objet +@code{} qui spécifie le message du jour, entre autres +choses. @end deffn -@deftp {Data Type} login-configuration -This is the data type representing the configuration of login. +@deftp {Type de données} login-configuration +Le type de données qui représente la configuration de login. @table @asis @item @code{motd} -@cindex message of the day -A file-like object containing the ``message of the day''. +@cindex message du jour +Un objet simili-fichier contenant le « message du jour ». -@item @code{allow-empty-passwords?} (default: @code{#t}) -Allow empty passwords by default so that first-time users can log in when -the 'root' account has just been created. +@item @code{allow-empty-passwords?} (par défaut : @code{#t}) +Permet les mots de passes vides par défaut pour que les utilisateurs +puissent se connecter au compte « root » la première fois après sa création. @end table @end deftp -@deffn {Scheme Procedure} mingetty-service @var{config} -Return a service to run mingetty according to @var{config}, a -@code{} object, which specifies the tty to run, -among other things. +@deffn {Procédure Scheme} mingetty-service @var{config} +Renvoie un service qui lance mingetty en suivant @var{config}, un objet +@code{}, qui spécifie le tty à lancer entre autres +choses. @end deffn -@deftp {Data Type} mingetty-configuration -This is the data type representing the configuration of Mingetty, which -provides the default implementation of virtual console log-in. +@deftp {Type de données} mingetty-configuration +C'est le type de données représentant la configuration de Mingetty, qui +fournit l'implémentation par défaut de l'écran de connexion des consoles +virtuelles. @table @asis @item @code{tty} -The name of the console this Mingetty runs on---e.g., @code{"tty1"}. +Le nom de la console sur laquelle tourne ce Mingetty, p.@: ex.@: +@code{"tty1"}. -@item @code{auto-login} (default: @code{#f}) -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. +@item @code{auto-login} (par défaut : @code{#f}) +Lorsque la valeur est vraie, ce champ doit être une chaîne de caractère +dénotant le nom d'utilisateur pour lequel le système se connecte +automatiquement. Lorsque la valeur est @code{#f}, il faut entrer un nom +d'utilisateur et un mot de passe pour se connecter. -@item @code{login-program} (default: @code{#f}) -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. +@item @code{login-program} (par défaut : @code{#f}) +Ce doit être soit @code{#f}, auquel cas le programme de connexion par défaut +est utilisé (@command{login} de la suite d'outils Shadow), soit une gexp +dénotant le nom d'un programme de connexion. -@item @code{login-pause?} (default: @code{#f}) -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. +@item @code{login-pause?} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t} en plus de @var{auto-login}, l'utilisateur +devrai appuyer sur une touche avant que le shell de connexion ne soit lancé. -@item @code{mingetty} (default: @var{mingetty}) -The Mingetty package to use. +@item @code{mingetty} (par défaut : @var{mingetty}) +Le paquet Mingetty à utiliser. @end table @end deftp -@deffn {Scheme Procedure} agetty-service @var{config} -Return a service to run agetty according to @var{config}, an -@code{} object, which specifies the tty to run, among -other things. +@deffn {Procédure Scheme} agetty-service @var{config} +Renvoie un service pour lancer agetty en suivant @var{config}, un objet +@code{}, qui spécifie le tty à lancer, entre autres +choses. @end deffn -@deftp {Data Type} agetty-configuration -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. +@deftp {Type de données} agetty-configuration +Ce type de données représente la configuration de agetty, qui implémente +l'écran de connexion des consoles virtuelles et series. Voir la page de +manuel de @code{agetty(8)} pour plus d'informations. @table @asis @item @code{tty} -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. - -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. - -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. - -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. - -@item @code{baud-rate} (default: @code{#f}) -A string containing a comma-separated list of one or more baud rates, in -descending order. - -@item @code{term} (default: @code{#f}) -A string containing the value used for the @code{TERM} environment variable. - -@item @code{eight-bits?} (default: @code{#f}) -When @code{#t}, the tty is assumed to be 8-bit clean, and parity detection -is disabled. - -@item @code{auto-login} (default: @code{#f}) -When passed a login name, as a string, the specified user will be logged in -automatically without prompting for their login name or password. - -@item @code{no-reset?} (default: @code{#f}) -When @code{#t}, don't reset terminal cflags (control modes). - -@item @code{host} (default: @code{#f}) -This accepts a string containing the "login_host", which will be written -into the @file{/var/run/utmpx} file. - -@item @code{remote?} (default: @code{#f}) -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}. - -@item @code{flow-control?} (default: @code{#f}) -When set to @code{#t}, enable hardware (RTS/CTS) flow control. - -@item @code{no-issue?} (default: @code{#f}) -When set to @code{#t}, the contents of the @file{/etc/issue} file will not -be displayed before presenting the login prompt. - -@item @code{init-string} (default: @code{#f}) -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. - -@item @code{no-clear?} (default: @code{#f}) -When set to @code{#t}, agetty will not clear the screen before showing the -login prompt. - -@item @code{login-program} (default: (file-append shadow "/bin/login")) -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. - -@item @code{local-line} (default: @code{#f}) -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}. - -@item @code{extract-baud?} (default: @code{#f}) -When set to @code{#t}, instruct agetty to try to extract the baud rate from -the status messages produced by certain types of modems. - -@item @code{skip-login?} (default: @code{#f}) -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. - -@item @code{no-newline?} (default: @code{#f}) -When set to @code{#t}, do not print a newline before printing the -@file{/etc/issue} file. +Le nom de la console sur laquelle agetty est lancé p.@: ex.@: +@code{"ttyS0"}. Cet argument est facultatif, il aura par défaut une valeur +raisonnable d'un port série utilisé par le noyau Linux. + +Pour cela, s'il y a une valeur pour une option @code{agetty.tty} sur la +ligne de commande du noyau, agetty extraira le nom du périphérique du port +série à partir de cette option. + +Sinon et s'il y a une valeur pour une option @code{console} avec un tty sur +la ligne de commande du noyau Linux, agetty extraira le nom du périphérique +du port série et l'utilisera. + +Dans les deux cas, agetty laissera les autres paramètres du périphérique +série (baud, etc) sans y toucher — dans l'espoir que Linux leur a assigné +les bonnes valeurs. + +@item @code{baud-rate} (par défaut : @code{#f}) +Une chaîne qui contient une liste d'un ou plusieurs taux de baud séparés par +des virgules, en ordre décroissant. + +@item @code{term} (par défaut : @code{#f}) +Une chaîne contenant la valeur utilisée pour la variable d'environnement +@code{TERM}. + +@item @code{eight-bits?} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t}, le tty est supposé être propre pour les +caractères 8-bit et la détection de parité est désactivée. + +@item @code{auto-login} (par défaut : @code{#f}) +Lorsqu'un nom de connexion est passé comme une chaîne de caractères, +l'utilisateur spécifié sera automatiquement connecté sans demande du nom +d'utilisateur ni du mot de passe. + +@item @code{no-reset?} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t}, ne vide pas les cflags du terminal (modes +de contrôle). + +@item @code{host} (par défaut : @code{#f}) +Cette option accepte une chaîne contenant le « login_host », qui sera écrit +dans le fichier @file{/var/run/utmpx}. + +@item @code{remote?} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t} en plus de @var{host}, cette option ajoutera +une option fakehost @code{-r} à la ligne de commande du programme de +connexion spécifié dans @var{login-program}. + +@item @code{flow-control?} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t}, active le contrôle de flux matériel +(RTS/CTS). + +@item @code{no-issue?} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t}, le contenu du fichier @file{/etc/issue} ne +sera pas affiché avant de présenter l'écran de connexion. + +@item @code{init-string} (par défaut : @code{#f}) +Cette option accepte une chaîne de caractères qui sera envoyée au tty ou au +modem avant toute autre chose. Elle peut être utilisée pour initialiser un +modem. + +@item @code{no-clear?} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t}, agetty ne nettoiera pas l'écran avant de +montrer l'écran de connexion. + +@item @code{login-program} (par défaut : (file-append shadow "/bin/login")) +Cette option doit être soit une gexp dénotant le nom d'un programme de +connexion, soit non définie, auquel cas la valeur par défaut est la commande +@command{login} de la suite d'outils Shadow. + +@item @code{local-line} (par défaut : @code{#f}) +Contrôle le drapeau CLOCAL. Cette option accepte l'un des trois symboles +comme argument, @code{'auto}, @code{'always} ou @code{'never}. Si la valeur +est @code{#f}, la valeur par défaut choisie par agetty est @code{'auto}… + +@item @code{extract-baud?} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t}, dit à agetty d'essayer d'extraire la taux +de baud depuis les messages de statut produits par certains modems. + +@item @code{skip-login?} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t}, ne demande par de nom d'utilisateur. Elle +peut être utilisée avec le champ @var{login-program} pour utiliser des +systèmes de connexion non standards. + +@item @code{no-newline?} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t}, n'affiche pas de retour à la ligne avant +d'afficher le fichier @file{/etc/issue}. @c Is this dangerous only when used with login-program, or always? -@item @code{login-options} (default: @code{#f}) -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. - -@item @code{login-pause} (default: @code{#f}) -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. - -@item @code{chroot} (default: @code{#f}) -Change root to the specified directory. This option accepts a directory -path as a string. - -@item @code{hangup?} (default: @code{#f}) -Use the Linux system call @code{vhangup} to do a virtual hangup of the -specified terminal. - -@item @code{keep-baud?} (default: @code{#f}) -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. - -@item @code{timeout} (default: @code{#f}) -When set to an integer value, terminate if no user name could be read within -@var{timeout} seconds. - -@item @code{detect-case?} (default: @code{#f}) -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. - -@item @code{wait-cr?} (default: @code{#f}) -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. - -@item @code{no-hints?} (default: @code{#f}) -When set to @code{#t}, do not print hints about Num, Caps, and Scroll locks. - -@item @code{no-hostname?} (default: @code{#f}) -By default, the hostname is printed. When this option is set to @code{#t}, -no hostname will be shown at all. - -@item @code{long-hostname?} (default: @code{#f}) -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. - -@item @code{erase-characters} (default: @code{#f}) -This option accepts a string of additional characters that should be -interpreted as backspace when the user types their login name. - -@item @code{kill-characters} (default: @code{#f}) -This option accepts a string that should be interpreted to mean "ignore all -previous characters" (also called a "kill" character) when the types their -login name. - -@item @code{chdir} (default: @code{#f}) -This option accepts, as a string, a directory path that will be changed to -before login. - -@item @code{delay} (default: @code{#f}) -This options accepts, as an integer, the number of seconds to sleep before -opening the tty and displaying the login prompt. - -@item @code{nice} (default: @code{#f}) -This option accepts, as an integer, the nice value with which to run the -@command{login} program. - -@item @code{extra-options} (default: @code{'()}) -This option provides an "escape hatch" for the user to provide arbitrary -command-line arguments to @command{agetty} as a list of strings. +@item @code{login-options} (par défaut : @code{#f}) +Cette option accepte une chaîne de caractères contenant des options passées +au programme login. Lorsqu'utilisé avec @var{login-program}, soyez +conscient qu'un utilisateur malicieux pourrait essayer de rentrer un nom +d'utilisateur contenant des options incluses qui pourraient être analysées +par le programme de connexion. + +@item @code{login-pause} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t}, attend qu'une touche soit appuyée avant de +montrer l'écran de connexion. Cela peut être utilisé avec @var{auto-login} +pour sauvegarder de la mémoire en lançant les shells de manière fainéante. + +@item @code{chroot} (par défaut : @code{#f}) +Change de racine dans le répertoire donné. Cette option accepte un chemin +en tant que chaîne de caractères. + +@item @code{hangup?} (par défaut : @code{#f}) +Utilise l'appel système Linux @code{vhangup} pour raccrocher virtuellement +le terminal spécifié. + +@item @code{keep-baud?} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t}, essaye de garder le taux de baud existant. +Les taux de baud de @var{baud-rate} sont utilisés lorsque agetty reçoit un +caractères @key{BREAK}. + +@item @code{timeout} (par défaut : @code{#f}) +Lorsque la valeur est un nombre entier, termine la session si aucun nom +d'utilisateur n'a pu être lu après @var{timeout} secondes. + +@item @code{detect-case?} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t}, active le support pour la détection des +terminaux en majuscule uniquement. Ce paramètre détectera qu'un nom +d'utilisateur qui ne contient que des majuscules indique un terminal en +majuscule et effectuera des conversion de majuscule en minuscule. Remarquez +que cela ne fonctionne pas avec les caractères unicode. + +@item @code{wait-cr?} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t}, attend que l'utilisateur ou le modem envoie +un retour chariot ou un saut de ligne avant d'afficher @file{/etc/issue} ou +l'écran de connexion. Cela est typiquement utilisé avec l'option +@var{init-string}. + +@item @code{no-hints?} (par défaut : @code{#f}) +Lorsque la valeur est @code{#t}, n'affiche par les astuces à propos des +verrouillages numériques, majuscule et défilement. + +@item @code{no-hostname?} (par défaut : @code{#f}) +Par défaut, le nom d'hôte est affiché. Lorsque la valeur est @code{#t}, +aucun nom d'hôte ne sera affiché. + +@item @code{long-hostname?} (par défaut : @code{#f}) +Par défaut, le nom d'hôte n'est affiché qu'après le premier point. Lorsque +la valeur est @code{#t}, le nom d'hôte pleinement qualifié renvoyé par +@code{gethostname} ou @code{getaddrinfo} sera affiché. + +@item @code{erase-characters} (par défaut : @code{#f}) +Cette option accepte une chaîne de caractères de caractères supplémentaires +qui devraient être interprétés comme des effacements lorsque l'utilisateur +les tape dans leur nom d'utilisateur. + +@item @code{kill-characters} (par défaut : @code{#f}) +Cette option accepte une chaîne de caractères qui devrait être interprété +comme signifiant « ignore tous les caractères précédent » (aussi appelé un +caractère « kill ») lorsque l'utilisateur tape son nom d'utilisateur. + +@item @code{chdir} (par défaut : @code{#f}) +Cette option accepte, en tant que chaîne de caractères, un chemin vers un +répertoire dans lequel se trouvera la commande avant la connexion. + +@item @code{delay} (par défaut : @code{#f}) +Cette option accepte, en tant qu'entier, le nombre de secondes à attendre +avant d'ouvrir le tty et afficher l'écran de connexion. + +@item @code{nice} (par défaut : @code{#f}) +Cette option accepte, en tant qu'entier, la valeur « nice » avec laquelle le +programme @command{login} tourne. + +@item @code{extra-options} (par défaut : @code{'()}) +Cette option fournie un « mécanisme de secours » pour que l'utilisateur +puisse ajouter des arguments de la ligne de commande arbitraires à +@command{agetty} comme une liste de chaînes de caractères. @end table @end deftp -@deffn {Scheme Procedure} kmscon-service-type @var{config} -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. +@deffn {Procédure Scheme} kmscon-service-type @var{config} +Renvoie un service qui lance +@uref{https://www.freedesktop.org/wiki/Software/kmscon,kmscon} d'après +@var{config}, un objet @code{}, qui spécifie le tty +sur lequel tourner, entre autres choses. @end deffn -@deftp {Data Type} kmscon-configuration -This is the data type representing the configuration of Kmscon, which -implements virtual console log-in. +@deftp {Type de données} kmscon-configuration +C'est le type de données représentant la configuration de Kscon, qui +implémente l'écran de chargement de la console virtuelle. @table @asis @item @code{virtual-terminal} -The name of the console this Kmscon runs on---e.g., @code{"tty1"}. +Le nom de la console sur laquelle Kmscon tourne, p.@: ex.@: @code{"tty1"}. -@item @code{login-program} (default: @code{#~(string-append #$shadow "/bin/login")}) -A gexp denoting the name of the log-in program. The default log-in program -is @command{login} from the Shadow tool suite. +@item @code{login-program} (par défaut : @code{#~(string-append #$shadow "/bin/login")}) +Une gexp qui dénote le nom d'un programme de connexion. le programme de +connexion par défaut est @command{login} de la suite d'outils Shadow. -@item @code{login-arguments} (default: @code{'("-p")}) -A list of arguments to pass to @command{login}. +@item @code{login-arguments} (par défaut : @code{'("-p")}) +Une liste d'arguments à passer à @command{login}. -@item @code{hardware-acceleration?} (default: #f) -Whether to use hardware acceleration. +@item @code{hardware-acceleration?} (par défaut : #f) +S'il faut utiliser l'accélération matérielle. -@item @code{kmscon} (default: @var{kmscon}) -The Kmscon package to use. +@item @code{kmscon} (par défaut : @var{kmscon}) +Le paquet Kmscon à utiliser. @end table @end deftp @cindex name service cache daemon @cindex nscd -@deffn {Scheme Procedure} nscd-service [@var{config}] [#:glibc glibc] @ - [#: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. +@deffn {Procédure Scheme} nscd-service [@var{config}] [#:glibc glibc] @ + [#:name-services '()] +Renvoie un service qui lance le démon de cache de services de noms de la +libc (nscd) avec la @var{config} donnée — un objet +@code{}. @xref{Name Service Switch}, pour un exemple. @end deffn -@defvr {Scheme Variable} %nscd-default-configuration -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. +@defvr {Variable Scheme} %nscd-default-configuration +C'est la valeur par défaut de @code{} (voir plus bas) +utilisée par @code{nscd-service}. Elle utilise les caches définis par +@var{%nscd-default-caches} ; voir plus bas. @end defvr -@deftp {Data Type} nscd-configuration -This is the data type representing the name service cache daemon (nscd) -configuration. +@deftp {Type de données} nscd-configuration +C'est le type de données qui représente la configuration du démon de cache +de services de noms (nscd). @table @asis -@item @code{name-services} (default: @code{'()}) -List of packages denoting @dfn{name services} that must be visible to the -nscd---e.g., @code{(list @var{nss-mdns})}. +@item @code{name-services} (par défaut : @code{'()}) +Liste des paquets dénotant des @dfn{services de noms} qui doivent être +visible pour nscd, p.@: ex.@: @code{(list @var{nss-mdns})}. -@item @code{glibc} (default: @var{glibc}) -Package object denoting the GNU C Library providing the @command{nscd} -command. +@item @code{glibc} (par défaut : @var{glibc}) +Objet de paquet qui dénote la Biblothèque C de GNU qui fournit la commande +@command{nscd}. -@item @code{log-file} (default: @code{"/var/log/nscd.log"}) -Name of the nscd log file. This is where debugging output goes when -@code{debug-level} is strictly positive. +@item @code{log-file} (par défaut : @code{"/var/log/nscd.log"}) +Nom du fichier journal de nscd. C'est là que les sorties de débogage sont +envoyée lorsque @code{debug-level} est strictement positif. -@item @code{debug-level} (default: @code{0}) -Integer denoting the debugging levels. Higher numbers mean that more -debugging output is logged. +@item @code{debug-level} (par défaut : @code{0}) +Entier qui dénote le niveau de débogage. Les entiers les plus grands +signifient plus de sortie de débogage. -@item @code{caches} (default: @var{%nscd-default-caches}) -List of @code{} objects denoting things to be cached; see below. +@item @code{caches} (par défaut : @var{%nscd-default-caches}) +Liste d'objets @code{} qui dénotent des choses à mettre en cache +; voir plus bas. @end table @end deftp -@deftp {Data Type} nscd-cache -Data type representing a cache database of nscd and its parameters. +@deftp {Type de données} nscd-cache +Type de données représentant une base de données de cache de nscd et ses +paramètres. @table @asis @item @code{database} -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}). +C'est un symbole qui représente le nom de la base de donnée à mettre en +cache. Les valeurs valide sont @code{passwd}, @code{group}, @code{hosts} et +@code{services} qui désignent les bases de données NSS correspondantes +(@pxref{NSS Basics,,, libc, The GNU C Library Reference Manual}). @item @code{positive-time-to-live} -@itemx @code{negative-time-to-live} (default: @code{20}) -A number representing the number of seconds during which a positive or -negative lookup result remains in cache. +@itemx @code{negative-time-to-live} (par défaut : @code{20}) +Un entier qui représente le nombre de secondes pendant lesquelles un +résultat positif ou négatif reste en cache. -@item @code{check-files?} (default: @code{#t}) -Whether to check for updates of the files corresponding to @var{database}. +@item @code{check-files?} (par défaut : @code{#t}) +Indique s'il faut vérifier des mises à jours dans les fichiers correspondant +à @var{database}. -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. +Par exemple, lorsque @var{database} est @code{hosts}, ce drapeau indique à +nscd de vérifier s'il y a des mises à jour de @file{/etc/hosts} et de les +prendre en compte. -@item @code{persistent?} (default: @code{#t}) -Whether the cache should be stored persistently on disk. +@item @code{persistent?} (par défaut : @code{#t}) +Indique si le cache devrait être stocké de manière persistante sur le +disque. -@item @code{shared?} (default: @code{#t}) -Whether the cache should be shared among users. +@item @code{shared?} (par défaut : @code{#t}) +Indique si le cache devrait être partagé entre les utilisateurs. -@item @code{max-database-size} (default: 32@tie{}MiB) -Maximum size in bytes of the database cache. +@item @code{max-database-size} (par défaut : 32@tie{}MiB) +Taille maximale en octets de la base de données en cache. @c XXX: 'suggested-size' and 'auto-propagate?' seem to be expert @c settings, so leave them out. @@ -10749,118 +10864,122 @@ Maximum size in bytes of the database cache. @end table @end deftp -@defvr {Scheme Variable} %nscd-default-caches -List of @code{} objects used by default by -@code{nscd-configuration} (see above). +@defvr {Variable Scheme} %nscd-default-caches +Liste d'objets @code{} utilisés par défaut par +@code{nscd-configuration} (voir plus haut). -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. +Elle active la mise en cache persistante et agressive des recherches de +services et de noms d'hôtes. Ces derniers fournissent une recherche de noms +d'hôtes plus performante, résiliente face à des serveurs de noms peu fiables +et une protection de votre vie privée plus efficace — souvent le résultat +des recherches de noms d'hôtes sont dans le cache local, donc les serveurs +de nom externes n'ont même pas besoin d'être questionnés. @end defvr @anchor{syslog-configuration-type} @cindex syslog @cindex logging -@deftp {Data Type} syslog-configuration -This data type represents the configuration of the syslog daemon. +@deftp {Type de données} syslog-configuration +Ce type de données représente la configuration du démon syslog. @table @asis -@item @code{syslogd} (default: @code{#~(string-append #$inetutils "/libexec/syslogd")}) -The syslog daemon to use. +@item @code{syslogd} (par défaut : @code{#~(string-append #$inetutils "/libexec/syslogd")}) +Le démon syslog à utiliser. -@item @code{config-file} (default: @code{%default-syslog.conf}) -The syslog configuration file to use. +@item @code{config-file} (par défaut : @code{%default-syslog.conf}) +Le fichier de configuration de syslog à utiliser. @end table @end deftp @anchor{syslog-service} @cindex syslog -@deffn {Scheme Procedure} syslog-service @var{config} -Return a service that runs a syslog daemon according to @var{config}. +@deffn {Procédure Scheme} syslog-service @var{config} +Renvoie un service qui lance un démon syslog en suivant @var{config}. -@xref{syslogd invocation,,, inetutils, GNU Inetutils}, for more information -on the configuration file syntax. +@xref{syslogd invocation,,, inetutils, GNU Inetutils}, pour plus +d'informations sur la syntaxe du fichier de configuration. @end deffn @anchor{guix-configuration-type} -@deftp {Data Type} guix-configuration -This data type represents the configuration of the Guix build daemon. -@xref{Invoquer guix-daemon}, for more information. +@deftp {Type de données} guix-configuration +Ce type de données représente la configuration du démon de construction de +Guix. @xref{Invoquer guix-daemon} pour plus d'informations. @table @asis -@item @code{guix} (default: @var{guix}) -The Guix package to use. +@item @code{guix} (par défaut : @var{guix}) +Le paquet Guix à utiliser. -@item @code{build-group} (default: @code{"guixbuild"}) -Name of the group for build user accounts. +@item @code{build-group} (par défaut : @code{"guixbuild"}) +Nom du groupe des comptes utilisateurs de construction. -@item @code{build-accounts} (default: @code{10}) -Number of build user accounts to create. +@item @code{build-accounts} (par défaut : @code{10}) +Nombre de comptes utilisateurs de construction à créer. -@item @code{authorize-key?} (default: @code{#t}) +@item @code{authorize-key?} (par défaut : @code{#t}) @cindex substituts, autorisations Autoriser ou non les clefs de substituts listées dans @code{authorize-keys} — par défaut celle de @code{hydra.gny.org} (@pxref{Substituts}). @vindex %default-authorized-guix-keys -@item @code{authorized-keys} (default: @var{%default-authorized-guix-keys}) +@item @code{authorized-keys} (par défaut : @var{%default-authorized-guix-keys}) La liste des fichiers de clefs autorisées pour les imports d'archives, en tant que liste de gexps sous forme de chaînes (@pxref{Invoquer guix archive}). Par défaut, elle contient celle de @code{hydra.gnu.org} (@pxref{Substituts}). -@item @code{use-substitutes?} (default: @code{#t}) -Whether to use substitutes. +@item @code{use-substitutes?} (par défaut : @code{#t}) +S'il faut utiliser les substituts. -@item @code{substitute-urls} (default: @var{%default-substitute-urls}) -The list of URLs where to look for substitutes by default. +@item @code{substitute-urls} (par défaut : @var{%default-substitute-urls}) +La liste des URL où trouver des substituts par défaut. -@item @code{max-silent-time} (default: @code{0}) -@itemx @code{timeout} (default: @code{0}) -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. +@item @code{max-silent-time} (par défaut : @code{0}) +@itemx @code{timeout} (par défaut : @code{0}) +Le nombre de secondes de silence et le nombre de secondes d'inactivité, +respectivement, après lesquelles un processus de construction son délai +d'attente. Une valeur de zéro désactive le délai d'attente. -@item @code{log-compression} (default: @code{'bzip2}) -The type of compression used for build logs---one of @code{gzip}, -@code{bzip2}, or @code{none}. +@item @code{log-compression} (par défaut : @code{'bzip2}) +Le type de compression utilisé par les journaux de construction — parmi +@code{gzip}, @code{bzip2} et @code{none}. -@item @code{extra-options} (default: @code{'()}) -List of extra command-line options for @command{guix-daemon}. +@item @code{extra-options} (par défaut : @code{'()}) +Liste d'options supplémentaires de la ligne de commande pour +@command{guix-daemon}. -@item @code{log-file} (default: @code{"/var/log/guix-daemon.log"}) -File where @command{guix-daemon}'s standard output and standard error are -written. +@item @code{log-file} (par défaut : @code{"/var/log/guix-daemon.log"}) +Le fichier où les sorties standard et d'erreur de @command{guix-daemon} sont +écrites. -@item @code{http-proxy} (default: @code{#f}) -The HTTP proxy used for downloading fixed-output derivations and -substitutes. +@item @code{http-proxy} (par défaut : @code{#f}) +Le serveur mandataire HTTP à utiliser pour télécharger les dérivations à +sortie fixe et les substituts. -@item @code{tmpdir} (default: @code{#f}) -A directory path where the @command{guix-daemon} will perform builds. +@item @code{tmpdir} (par défaut : @code{#f}) +Un répertoire où @command{guix-daemon} effectuera ses constructions. @end table @end deftp -@deffn {Scheme Procedure} guix-service @var{config} -Return a service that runs the Guix build daemon according to @var{config}. +@deffn {Procédure Scheme} guix-service @var{config} +Renvoie un service qui fait tourner le démon de construction de Guix en +suivant @var{config}. @end deffn -@deffn {Scheme Procedure} udev-service [#:udev @var{eudev} #:rules @code{'()}] -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 @var{udev-rule} and @var{file->udev-rule} from @code{(gnu -services base)} simplify the creation of such rule files. +@deffn {Procédure Scheme} udev-service [#:udev @var{eudev} #:rules @code{'()}] +Lance @var{udev}, qui rempli le répertoire @file{/dev} dynamiquement. Les +règles udev peuvent être fournies comme une liste de fichier via la variable +@var{rules}. Les procédures @var{udev-rule} et @var{file->udev-rule} de +@code{(gnu services base)} simplifient la création de ces fichiers de règle. -@deffn {Scheme Procedure} udev-rule [@var{file-name} @var{contents}] -Return a udev-rule file named @var{file-name} containing the rules defined -by the @var{contents} literal. +@deffn {Procédure Scheme} udev-rule [@var{file-name} @var{contents}] +Renvoie un fichier de règle udev nommé @var{file-name} contenant les règles +définie par le litéral @var{contents}. -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. +Dans l'exemple suivant, on définie une règle pour un périphérique USB qui +sera stockée dans le fichier @file{90-usb-thing.rules}. La règle lance un +script à la détection du périphérique USB avec l'identifiant de produit +donné. @example (define %example-udev-rule @@ -10872,7 +10991,8 @@ USB device with a given product identifier. @end example @end deffn -Here we show how the default @var{udev-service} can be extended with it. +Ici on montre comment le service @var{udev-service} par défaut peut être +étendu avec cette règle. @example (operating-system @@ -10885,15 +11005,15 @@ Here we show how the default @var{udev-service} can be extended with it. (list %example-udev-rule)))))))) @end example -@deffn {Scheme Procedure} file->udev-rule [@var{file-name} @var{file}] -Return a udev file named @var{file-name} containing the rules defined within -@var{file}, a file-like object. +@deffn {Procédure Scheme} file->udev-rule [@var{file-name} @var{file}] +Renvoie un fichier udev nommé @var{file-name} contenant les règles définies +dans @var{file}, un objet simili-fichier. -The following example showcases how we can use an existing rule file. +L'exemple suivant montre comment utiliser un fichier de règles existant. @example -(use-modules (guix download) ;for url-fetch - (guix packages) ;for origin +(use-modules (guix download) ;pour url-fetch + (guix packages) ;pour origin ;; @dots{}) (define %android-udev-rules @@ -10909,21 +11029,20 @@ The following example showcases how we can use an existing rule file. @end example @end deffn -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. +En plus, les définitions des paquets de Guix peuvent être inclus dans +@var{rules} pour étendre les règles avec les définitions trouvées dans leur +sous-répertoire @file{lib/udev/rules.d}. Au lieu de l'exemple +@var{file->udev-rule} précédent, on aurait pu utiliser le paquet +@var{android-udev-rules} qui existe dans le module @code{(gnu packages +android)}. -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. +L'exemple suivant montre comment utiliser le paquet @var{android-udev-rules} +pour que l'outil Android @command{adb} puisse détecter les appareils sans +privilège root. Il détaille aussi comment créer le grope @code{adbusers}, +requis pour le bon fonctionnement des règles définies dans le paquet +@var{android-udev-rules}. Pour créer ce groupe, on doit le définir dans les +@var{supplementary-groups} de la déclaration @var{user-account} ainsi que +dans le champ @var{groups} de l'enregistrement @var{operating-system}. @example (use-modules (gnu packages android) ;for android-udev-rules @@ -10953,62 +11072,63 @@ declaration, as well as in the @var{groups} field of the @end example @end deffn -@defvr {Scheme Variable} urandom-seed-service-type -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. +@defvr {Variable Scheme} urandom-seed-service-type +Garde de l'entropie dans @var{%random-seed-file} pour démarrer +@file{/dev/urandom} au redémarrage. Ce service essaye aussi de démarrer +@file{/dev/urandom} à partir de @file{/dev/hwrng} au démarrage si +@file{/dev/hwrng} existe et peut être lu. @end defvr -@defvr {Scheme Variable} %random-seed-file -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}. +@defvr {Variable Scheme} %random-seed-file +C'est le nom du fichier où des octets aléatoires sont sauvegardés par +@var{urandom-seed-service} pour démarrer @file{/dev/urandom} au +redémarrage. Sa valeur par défaut est @file{/var/lib/random-seed}. @end defvr -@cindex keymap -@cindex keyboard -@deffn {Scheme Procedure} console-keymap-service @var{files} ... -@cindex keyboard layout -Return a service to load console keymaps from @var{files} using -@command{loadkeys} command. Most likely, you want to load some default -keymap, which can be done like this: +@cindex disposition clavier +@cindex clavier +@deffn {Procédure Scheme} console-keymap-service @var{files} ... +@cindex disposition du clavier +Renvoie un service qui charge les dispositions claviers de @var{files} avec +la commande @command{loadkeys}. Vraisemblablement, vous voudrez charger une +disposition par défaut, ce qui se fait ainsi : @example (console-keymap-service "dvorak") @end example -Or, for example, for a Swedish keyboard, you may need to combine the -following keymaps: +Ou par exemple pour un clavier suédois, vous pourriez avoir besoin de +combiner les dispositions suivantes : @example (console-keymap-service "se-lat6" "se-fi-lat6") @end example -Also you can specify a full file name (or file names) of your keymap(s). -See @code{man loadkeys} for details. +Vous pouvez aussi spécifier le nom de fichier (ou les noms de fichiers) +complets de vos dispositions. Voir @code{man loadkeys} pour des détails. @end deffn -@cindex mouse +@cindex souris @cindex gpm @defvr {Variable Scheme} gpm-service-type -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. +C'est le type du service qui lance GPM, le @dfn{démon de souris à but +général}, qui fournit le support de la souris sur la console Linux. GPM +permet aux utilisateurs d'utiliser la souris dans la console, entre autres +pour sélectionner, copier et coller du texte. -The value for services of this type must be a @code{gpm-configuration} (see -below). This service is not part of @var{%base-services}. +La valeur pour les services de ce type doit être un @code{gpm-configuration} +(voir plus bas). Ce service ne fait pas partie de @var{%base-services}. @end defvr -@deftp {Type de donnée} gpm-configuration +@deftp {Type de données} gpm-configuration Type de données représentant la configuration de GPM. @table @asis @item @code{options} (par défaut : @code{%default-gpm-options}) -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. +Les options de la ligne de commande à passer à @command{gpm}. L'ensemble +des options par défaut dit à @command{gpm} d'écouter les événements de la +souris dans @file{/dev/input/mice}. @xref{Command Line,,, gpm, gpm manual}, +pour plus d'informations. @item @code{gpm} (par défaut : @code{gpm}) Le paquet GPM à utiliser. @@ -11017,78 +11137,84 @@ Le paquet GPM à utiliser. @end deftp @anchor{guix-publish-service-type} -@deffn {Scheme Variable} guix-publish-service-type -This is the service type for @command{guix publish} (@pxref{Invoquer guix publish}). Its value must be a @code{guix-configuration} object, as -described below. +@deffn {Variable Scheme} guix-publish-service-type +C'est le type de service pour @command{guix publish} (@pxref{Invoquer guix publish}). Sa valeur doit être un objet @code{guix-configuration} décrit +plus bas. -This assumes that @file{/etc/guix} already contains a signing key pair as -created by @command{guix archive --generate-key} (@pxref{Invoquer guix archive}). If that is not the case, the service will fail to start. +Ce service suppose que @file{/etc/guix} contient déjà une paire de clefs +créée par @command{guix archive --generate-key} (@pxref{Invoquer guix archive}). Si ce n'est pas le cas, le service ne démarrera pas. @end deffn -@deftp {Data Type} guix-publish-configuration -Data type representing the configuration of the @code{guix publish} service. +@deftp {Type de données} guix-publish-configuration +Le type de données représentant la configuration du service @code{guix +publish}. @table @asis -@item @code{guix} (default: @code{guix}) -The Guix package to use. +@item @code{guix} (par défaut : @code{guix}) +Le paquet Guix à utiliser. -@item @code{port} (default: @code{80}) -The TCP port to listen for connections. +@item @code{port} (par défaut : @code{80}) +Le port TCP sur lequel écouter les connexions. -@item @code{host} (default: @code{"localhost"}) -The host (and thus, network interface) to listen to. Use @code{"0.0.0.0"} -to listen on all the network interfaces. +@item @code{host} (par défaut : @code{"localhost"}) +L'hôte (et donc, l'interface réseau) sur lequel écouter. Utilisez +@code{"0.0.0.0"} pour écouter sur toutes les interfaces réseaux. @item @code{compression-level} (par défaut : @code{3}) -The gzip compression level at which substitutes are compressed. Use -@code{0} to disable compression altogether, and @code{9} to get the best -compression ratio at the expense of increased CPU usage. - -@item @code{nar-path} (default: @code{"nar"}) -The URL path at which ``nars'' can be fetched. @xref{Invoquer guix publish, -@code{--nar-path}}, for details. - -@item @code{cache} (default: @code{#f}) -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{Invoquer guix publish, -@option{--cache}}, for more information on the tradeoffs involved. - -@item @code{workers} (default: @code{#f}) -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{Invoquer guix publish, @option{--workers}}, for more information. - -@item @code{ttl} (default: @code{#f}) -When it is an integer, this denotes the @dfn{time-to-live} in seconds of the -published archives. @xref{Invoquer guix publish, @option{--ttl}}, for more -information. +Le niveau de compression gzip auquel les substituts sont compressés. +Utilisez @code{0} pour désactiver complètement la compression, et @code{9} +pour avoir le meilleur taux de compression contre une plus grande +utilisation du CPU. + +@item @code{nar-path} (par défaut : @code{"nar"}) +Le chemin d'URL où les « nars » se trouvent. @xref{Invoquer guix publish, +@code{--nar-path}}, pour des détails. + +@item @code{cache} (par défaut : @code{#f}) +Lorsque la valeur est @code{#f}, désactive le cache et génère les archives à +la demande. Sinon, cela devrait être le nom d'un répertoire — p.@: ex.@: +@code{"/var/cache/guix/publish"} — où @command{guix publish} gère le cache +des archives et des métadonnées prêtes à être envoyées. @xref{Invoquer guix publish, @option{--cache}}, pour plus d'informations sur les compromis +impliqués. + +@item @code{workers} (par défaut : @code{#f}) +Lorsque la valeur est un entier, c'est le nombre de threads de travail +utilisés pour le cache ; lorsque la valeur est @code{#f}, le nombre de +processeurs est utilisé. @xref{Invoquer guix publish, @option{--workers}}, +pour plus d'informations. + +@item @code{ttl} (par défaut : @code{#f}) +Lorsque la valeur est un entier, il dénote la @dfn{durée de vie} en secondes +des archives publiées. @xref{Invoquer guix publish, @option{--ttl}}, pour +plus d'informations. @end table @end deftp @anchor{rngd-service} -@deffn {Scheme Procedure} rngd-service [#:rng-tools @var{rng-tools}] @ - [#: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. +@deffn {Procédure Scheme} rngd-service [#:rng-tools @var{rng-tools}] @ + [#:device "/dev/hwrng"] +Renvoie un service qui lance le programme @command{rngd} de @var{rng-tools} +pour ajouter @var{device} à la réserve d'entropie du noyau. Le service +échouera si @var{device} n'existe pas. @end deffn @anchor{pam-limits-service} -@cindex session limits +@cindex limites de session @cindex ulimit -@cindex priority -@cindex realtime +@cindex priorités +@cindex temps réel @cindex jackd -@deffn {Scheme Procedure} pam-limits-service [#:limits @code{'()}] +@deffn {Procédure Scheme} pam-limits-service [#:limits @code{'()}] -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. +Renvoie un service qui installe un fichier de configuration pour le +@uref{http://linux-pam.org/Linux-PAM-html/sag-pam_limits.html, module +@code{pam_limits}}. La procédure prend éventuellement une liste de valeurs +@code{pam-limits-entry} qui peuvent être utilisées pour spécifier les +limites @code{ulimit} et les priorités des sessions utilisateurs. -The following limits definition sets two hard and soft limits for all login -sessions of users in the @code{realtime} group: +La définition de limites suivante défini deux limites matérielles et +logicielles pour toutes les sessions connectées des utilisateurs du groupe +@code{realtime} : @example (pam-limits-service @@ -11097,10 +11223,10 @@ sessions of users in the @code{realtime} group: (pam-limits-entry "@@realtime" 'both 'memlock 'unlimited))) @end example -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. +La première entrée augment la priorité en temps réel maximale des processus +non privilégiés ; la deuxième entrée abandonne les restrictions sur l'espace +d'adressage maximal qui peut être verrouillé en mémoire. Ces paramètres +sont souvent utilisés sur les systèmes audio temps-réel. @end deffn @node Exécution de tâches planifiées @@ -11108,28 +11234,29 @@ real-time audio systems. @cindex cron @cindex mcron -@cindex scheduling jobs -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. - -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{Invoquer 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}). +@cindex tâches planifiées +Le module @code{(gnu services mcron)} fournit une interface pour +GNU@tie{}mcron, un démon qui lance des tâches planifiées (@pxref{Top,,, +mcron, GNU@tie{}mcron}). GNU@tie{}mcron est similaire au démon Unix +traditionel @command{cron} ; la principale différence est qu'il est +implémenté en Guile Scheme, qui fournit beaucoup de flexibilité lors de la +spécification de la planification des tâches et de leurs actions. + +L'exemple en dessous définit un système d'exploitation qu lance les +commandes @command{updatebd} (@pxref{Invoking updatedb,,, find, Finding +Files}) et @command{guix gc} (@pxref{Invoquer guix gc}) tous les jours, +ainsi que la commande @command{mkid} en tant qu'utilisateur non privilégié +(@pxref{mkid invocation,,, idutils, ID Database Utilities}). Il utilise des +gexps pour introduire des définitions de tâches qui sont passées à mcron +(@pxref{G-Expressions}). @lisp (use-modules (guix) (gnu) (gnu services mcron)) (use-package-modules base idutils) (define updatedb-job - ;; Run 'updatedb' at 3AM every day. Here we write the - ;; job's action as a Scheme procedure. + ;; Lance « updatedb » à 3h du matin chaque jour. Ici nous spécifions + ;; l'action de la tâche comme une procédure Scheme. #~(job '(next-hour '(3)) (lambda () (execl (string-append #$findutils "/bin/updatedb") @@ -11137,14 +11264,14 @@ job definitions that are passed to mcron (@pxref{G-Expressions}). "--prunepaths=/tmp /var/tmp /gnu/store")))) (define garbage-collector-job - ;; Collect garbage 5 minutes after midnight every day. - ;; The job's action is a shell command. + ;; Lance le ramasse-miettes tous les jours à minuit cinq. + ;; L'action de la tâche est une commande shell. #~(job "5 0 * * *" ;Vixie cron syntax "guix gc -F 1G")) (define idutils-job - ;; Update the index database as user "charlie" at 12:15PM - ;; and 19:15PM. This runs from the user's home directory. + ;; Met à jour la base de données d'index en tant que « charlie » à 12h15 + ;; et 19h15. La commande est lancée depuis le répertoire personnel de l'utilisateur. #~(job '(next-minute-from (next-hour '(12 19)) '(15)) (string-append #$idutils "/bin/mkid src") #:user "charlie")) @@ -11157,9 +11284,9 @@ job definitions that are passed to mcron (@pxref{G-Expressions}). %base-services))) @end lisp -@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. +@xref{Guile Syntax, mcron job specifications,, mcron, GNU@tie{}mcron}, pour +plus d'informations sur les spécifications des tâche de mcron. Ci-dessous +est la référence du service mcron. On a running system, you can use the @code{schedule} action of the service to visualize the mcron jobs that will be executed next: @@ -11176,38 +11303,38 @@ can also specify the number of tasks to display: # herd schedule mcron 10 @end example -@deffn {Scheme Procedure} mcron-service @var{jobs} [#:mcron @var{mcron}] -Return an mcron service running @var{mcron} that schedules @var{jobs}, a -list of gexps denoting mcron job specifications. +@deffn {Procédure Scheme} mcron-service @var{jobs} [#:mcron @var{mcron}] +Renvoie un service mcron qui lance @var{mcron} qui planifie les tâches +@var{jobs}, une liste de gexps qui dénotent des spécifications de tâches de +mcron. -This is a shorthand for: +C'est un raccourci pour : @example (service mcron-service-type (mcron-configuration (mcron mcron) (jobs jobs))) @end example @end deffn -@defvr {Scheme Variable} mcron-service-type -This is the type of the @code{mcron} service, whose value is an -@code{mcron-configuration} object. +@defvr {Variable Scheme} mcron-service-type +C'est le type du service @code{mcron}, dont la valeur est un objet +@code{mcron-configuration} -This service type can be the target of a service extension that provides it -additional job specifications (@pxref{Composition de services}). In other -words, it is possible to define services that provide additional mcron jobs -to run. +Ce type de service peut être la cible d'une extension de service qui lui +fournit des spécifications de tâches supplémentaires (@pxref{Composition de services}). En d'autres termes, il est possible de définir des services +qui fournissent des tâches mcron à lancer. @end defvr -@deftp {Data Type} mcron-configuration -Data type representing the configuration of mcron. +@deftp {Type de données} mcron-configuration +Type données qui représente la configuration de mcron. @table @asis -@item @code{mcron} (default: @var{mcron}) -The mcron package to use. +@item @code{mcron} (par défaut : @var{mcron}) +Le paquet mcron à utiliser. @item @code{jobs} -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}). +C'est la liste des gexps (@pxref{G-Expressions}), où chaque gexp correspond +à une spécification de tâche de mcron (@pxref{Syntax, mcron job +specifications,, mcron, GNU@tie{}mcron}). @end table @end deftp @@ -11216,16 +11343,18 @@ mcron, GNU@tie{}mcron}). @subsubsection Rotation des journaux @cindex rottlog -@cindex log rotation +@cindex journaux, rotation @cindex logging -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}). +Les fichiers journaux comme ceux qui se trouvent dans @file{/var/log} ont +tendance à grandir sans fin, donc c'est une bonne idée de le @dfn{faire +tourner} de temps à autres — c.-à-d.@: archiver leur contenu dans des +fichiers séparés, potentiellement compressés. Le module @code{(gnu services +admin)} fournit une interface pour GNU@tie{}Rot[t]log, un outil de rotation +de journaux (@pxref{Top,,, rottlog, GNU Rot[t]log Manual}). -The example below defines an operating system that provides log rotation -with the default settings, for commonly encountered log files. +L'exemple ci-dessous définit un système d'exploitation qui fournit la +rotation des journaux avec les paramètres par défaut, pour les journaux les +plus courants. @lisp (use-modules (guix) (gnu)) @@ -11238,43 +11367,44 @@ with the default settings, for commonly encountered log files. %base-services))) @end lisp -@defvr {Scheme Variable} rottlog-service-type -This is the type of the Rottlog service, whose value is a -@code{rottlog-configuration} object. +@defvr {Variable Scheme} rottlog-service-type +C'est le type du service Rotlog, dont la valeur est un objet +@code{rottlog-configuration}. -Other services can extend this one with new @code{log-rotation} objects (see -below), thereby augmenting the set of files to be rotated. +D'autres services peuvent étendre celui-ci avec de nouveaux objets +@code{log-rotation} (voir plus bas), en augmentant ainsi l'ensemble des +fichiers à faire tourner. -This service type can define mcron jobs (@pxref{Exécution de tâches planifiées}) to -run the rottlog service. +Ce type de service peut définir des taches (@pxref{Exécution de tâches planifiées}) +pour lancer le service rottlog. @end defvr -@deftp {Data Type} rottlog-configuration -Data type representing the configuration of rottlog. +@deftp {Type de données} rottlog-configuration +Type de données représentant la configuration de rottlog. @table @asis -@item @code{rottlog} (default: @code{rottlog}) -The Rottlog package to use. +@item @code{rottlog} (par défaut : @code{rottlog}) +Le paquet Rottlog à utiliser. -@item @code{rc-file} (default: @code{(file-append rottlog "/etc/rc")}) -The Rottlog configuration file to use (@pxref{Mandatory RC Variables,,, -rottlog, GNU Rot[t]log Manual}). +@item @code{rc-file} (par défaut : @code{(file-append rottlog "/etc/rc")}) +Le fichier de configuration Rottlog à utiliser (@pxref{Mandatory RC +Variables,,, rottlog, GNU Rot[t]log Manual}). -@item @code{rotations} (default: @code{%default-rotations}) -A list of @code{log-rotation} objects as defined below. +@item @code{rotations} (par défaut : @code{%default-rotations}) +Une liste d'objets @code{log-rotation} définis plus bas. @item @code{jobs} -This is a list of gexps where each gexp corresponds to an mcron job -specification (@pxref{Exécution de tâches planifiées}). +C'est une liste de gexps où chaque gexp correspond à une spécification de +tache de mcron (@pxref{Exécution de tâches planifiées}). @end table @end deftp -@deftp {Data Type} log-rotation -Data type representing the rotation of a group of log files. +@deftp {Type de données} log-rotation +Type de données représentant la rotation d'un groupe de fichiers journaux. -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: +En reprenant un exemple du manuel de Rottlog (@pxref{Period Related File +Examples,,, rottlog, GNU Rot[t]log Manual}), on peut définir la rotation +d'un journal de cette manière : @example (log-rotation @@ -11286,49 +11416,51 @@ like this: "nocompress"))) @end example -The list of fields is as follows: +La liste des champs est la suivante : @table @asis -@item @code{frequency} (default: @code{'weekly}) -The log rotation frequency, a symbol. +@item @code{frequency} (par défaut : @code{'weekly}) +La fréquence de rotation, un symbole. @item @code{files} -The list of files or file glob patterns to rotate. +La liste des fichiers ou des motifs de noms de fichiers à faire tourner. -@item @code{options} (default: @code{'()}) -The list of rottlog options for this rotation (@pxref{Configuration +@item @code{options} (par défaut : @code{'()}) +La liste des options de rottlog pour cette rotation (@pxref{Configuration parameters,,, rottlog, GNU Rot[t]lg Manual}). -@item @code{post-rotate} (default: @code{#f}) -Either @code{#f} or a gexp to execute once the rotation has completed. +@item @code{post-rotate} (par défaut : @code{#f}) +Soit @code{#f}, soit une gexp à exécuter une fois la rotation terminée. @end table @end deftp -@defvr {Scheme Variable} %default-rotations -Specifies weekly rotation of @var{%rotated-files} and a couple of other -files. +@defvr {Variable Scheme} %default-rotations +Spécifie la rotation hebdomadaire de @var{%rotated-files} et de quelques +autres fichiers. @end defvr -@defvr {Scheme Variable} %rotated-files -The list of syslog-controlled files to be rotated. By default it is: -@code{'("/var/log/messages" "/var/log/secure")}. +@defvr {Variable Scheme} %rotated-files +La liste des fichiers contrôlés par syslog à faire tourner. Par défaut il +s'agit de : @code{'("/var/log/messages" "/var/log/secure")} @end defvr @node Services réseau @subsubsection Services réseau -The @code{(gnu services networking)} module provides services to configure -the network interface. +Le module @code{(gnu services networking)} fournit des services pour +configurer les interfaces réseaux. -@cindex DHCP, networking service -@deffn {Scheme Procedure} dhcp-client-service [#:dhcp @var{isc-dhcp}] -Return a service that runs @var{dhcp}, a Dynamic Host Configuration Protocol -(DHCP) client, on all the non-loopback network interfaces. +@cindex DHCP, service réseau +@deffn {Procédure Scheme} dhcp-client-service [#:dhcp @var{isc-dhcp}] +Renvoie un service qui lance @var{dhcp}, un client DHCP (Dynamic Host +Configuration Protocol) sur toutes les interfaces réseaux en dehors de la +boucle locale. @end deffn -@deffn {Scheme Procedure} dhcpd-service-type -This type defines a service that runs a DHCP daemon. To create a service of -this type, you must supply a @code{}. For example: +@deffn {Procédure Scheme} dhcpd-service-type +Ce type définie un service qui lance un démon DHCP. Pour créer un service +de ce type, vous devez appliquer un objet @code{}. Par +exemple : @example (service dhcpd-service-type @@ -11338,43 +11470,44 @@ this type, you must supply a @code{}. For example: @end example @end deffn -@deftp {Data Type} dhcpd-configuration +@deftp {Type de données} dhcpd-configuration @table @asis -@item @code{package} (default: @code{isc-dhcp}) -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{http://www.isc.org/products/DHCP, ISC's -DHCP server}. -@item @code{config-file} (default: @code{#f}) -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. -@item @code{version} (default: @code{"4"}) -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. -@item @code{run-directory} (default: @code{"/run/dhcpd"}) -The run directory to use. At service activation time, this directory will -be created if it does not exist. -@item @code{pid-file} (default: @code{"/run/dhcpd/dhcpd.pid"}) -The PID file to use. This corresponds to the @code{-pf} option of -@code{dhcpd}. See @code{man dhcpd} for details. -@item @code{interfaces} (default: @code{'()}) -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. +@item @code{package} (par défaut : @code{isc-dhcp}) +Le paquet qui fournit le démon DHCP. ce paquet doit fournir le démon +@file{sbin/dhcpd} relativement à son répertoire de sortie. Le paquet par +défaut est le @uref{http://www.isc.org/products/DHCP, serveur DHCP d'ISC} +@item @code{config-file} (par défaut : @code{#f}) +Le fichier de configuration à utiliser. Il est requis. Il sera passé à +@code{dhcpd} via son option @code{-cf}. La valeur peut être n'importe quel +objet « simili-fichier » (@pxref{G-Expressions, file-like objects}). Voir +@code{man dhcpd.conf} pour des détails sur la syntaxe du fichier de +configuration. +@item @code{version} (par défaut : @code{"4"}) +La version de DHCP à utiliser. Le serveur DHCP d'ISC supporte les valeur « +4 », « 6 » et « 4o6 ». Elles correspondent aux options @code{-4}, @code{-6} +et @code{-4o6} du programme @code{dhcpd}. Voir @code{man dhcpd} pour plus +de détails. +@item @code{run-directory} (par défaut : @code{"/run/dhcpd"}) +Le répertoire d'exécution à utiliser. Au moment de l'activation du service, +ce répertoire sera créé s'il n'existe pas. +@item @code{pid-file} (par défaut : @code{"/run/dhcpd/dhcpd.pid"}) +Le fichier de PID à utiliser. Cela correspond à l'option @code{-pf} de +@code{dhcpd}. Voir @code{man dhcpd} pour plus de détails. +@item @code{interfaces} (par défaut : @code{'()}) +Les noms des interfaces réseaux sur lesquelles dhcpd écoute. Si cette liste +n'est pas vide, alors ses éléments (qui doivent être des chaînes de +caractères) seront ajoutés à l'invocation de @code{dhcpd} lors du démarrage +du démon. Il n'est pas forcément nécessaire de spécifier des interfaces ici +; voir @code{man dhcpd} pour plus de détails. @end table @end deftp -@defvr {Scheme Variable} static-networking-service-type +@defvr {Variable Scheme} static-networking-service-type @c TODO Document data structures. -This is the type for statically-configured network interfaces. +C'est le type des interfaces réseaux configurés statiquement. @end defvr -@deffn {Scheme Procedure} static-networking-service @var{interface} @var{ip} @ +@deffn {Procédure Scheme} static-networking-service @var{interface} @var{ip} @ [#: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 @@ -11382,38 +11515,39 @@ This is the type for statically-configured network interfaces. gateway. @var{requirement} can be used to declare a dependency on another service before configuring the interface. -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. +On peut appeler cette procédure plusieurs fois, une fois par interface +réseau qui nous intéresse. Dans les coulisses, elle étend +@code{static-networking-service-type} avec les interfaces réseaux +supplémentaires à gérer. @end deffn @cindex wicd -@cindex wireless +@cindex sans-fil @cindex WiFi -@cindex network management -@deffn {Scheme Procedure} wicd-service [#:wicd @var{wicd}] -Return a service that runs @url{https://launchpad.net/wicd,Wicd}, a network -management daemon that aims to simplify wired and wireless networking. - -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. +@cindex gestion du réseau +@deffn {Procédure Scheme} wicd-service [#:wicd @var{wicd}] +Renvoie un service qui lance @url{https://launchpad.net/wicd,Wicd}, un démon +de gestion réseau qui cherche à simplifier la configuration des résaux +filaires et sans fil. + +Ce service ajoute le paquet @var{wicd} au profil global, pour fournir des +commandes pour interagir avec le démon et configurer le réseau : +@command{wicd-client}, une interface graphique et les interfaces +utilisateurs @command{wicd-cli} et @command{wicd-curses}. @end deffn @cindex ModemManager @defvr {Variable Scheme} modem-manager-service-type -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. +C'est le type de service pour le service +@uref{https://wiki.gnome.org/Projects/ModemManager, ModemManager}. La +valeur de ce type de service est un enregistrement +@code{modem-manager-configuration}. -This service is part of @code{%desktop-services} (@pxref{Services de bureaux}). +Ce service fait partie de @code{%desktop-services} (@pxref{Services de bureaux}). @end defvr -@deftp {Type de donnée} modem-manager-configuration +@deftp {Type de données} modem-manager-configuration Type de donnée représentant la configuration de ModemManager. @table @asis @@ -11425,54 +11559,56 @@ Le paquet ModemManager à utiliser. @cindex NetworkManager -@defvr {Scheme Variable} network-manager-service-type -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. +@defvr {Variable Scheme} network-manager-service-type +C'est le type de service pour le service +@uref{https://wiki.gnome.org/Projects/NetworkManager, NetworkManager}. La +valeur pour ce type de service est un enregistrement +@code{network-manager-configuration}. -This service is part of @code{%desktop-services} (@pxref{Services de bureaux}). +Ce service fait partie de @code{%desktop-services} (@pxref{Services de bureaux}). @end defvr -@deftp {Data Type} network-manager-configuration -Data type representing the configuration of NetworkManager. +@deftp {Type de données} network-manager-configuration +Type de données représentant la configuration de NetworkManager. @table @asis -@item @code{network-manager} (default: @code{network-manager}) -The NetworkManager package to use. +@item @code{network-manager} (par défaut : @code{network-manager}) +Le paquet NetworkManager à utiliser. -@item @code{dns} (default: @code{"default"}) -Processing mode for DNS, which affects how NetworkManager uses the -@code{resolv.conf} configuration file. +@item @code{dns} (par défaut : @code{"default"}) +Mode de gestion pour le DNS, qui affecte la manière dont NetworkManager +utilise le fichier de configuration @code{resolv.conf} @table @samp @item default -NetworkManager will update @code{resolv.conf} to reflect the nameservers -provided by currently active connections. +NetworkManager mettra à jour @code{resolv.conf} pour refléter les serveurs +de noms fournis par les connexions actives. @item dnsmasq -NetworkManager will run @code{dnsmasq} as a local caching nameserver, using -a "split DNS" configuration if you are connected to a VPN, and then update -@code{resolv.conf} to point to the local nameserver. +NetworkManager lancera @code{dnsmasq} en tant que serveur de cache local, en +utilisant une configuration « DNS disjointe » si vous êtes connecté par un +VPN puis mettra à jour @code{resolv.conf} pour pointer vers le serveur de +nom local. @item none -NetworkManager will not modify @code{resolv.conf}. +NetworkManager ne modifiera pas @code{resolv.conf}. @end table -@item @code{vpn-plugins} (default: @code{'()}) -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. +@item @code{vpn-plugins} (par défaut : @code{'()}) +C'est la liste des greffons disponibles pour les VPN (réseaux privés +virtuels). Un exemple est le paquet @code{network-manager-openvpn}, qui +permet à NetworkManager de gérer des VPN via OpenVPN. @end table @end deftp @cindex Connman -@deffn {Scheme Variable} connman-service-type -This is the service type to run @url{https://01.org/connman,Connman}, a -network connection manager. +@deffn {Variable Scheme} connman-service-type +C'est le type de service pour lancer @url{https://01.org/connman,Connman}, +un gestionnaire de connexions réseaux. -Its value must be an @code{connman-configuration} record as in this example: +Sa valeur doit être un enregistrement @code{connman-configuration} comme +dans cet exemple : @example (service connman-service-type @@ -11480,30 +11616,30 @@ Its value must be an @code{connman-configuration} record as in this example: (disable-vpn? #t))) @end example -See below for details about @code{connman-configuration}. +Voir plus bas pour des détails sur @code{connman-configuration}. @end deffn -@deftp {Data Type} connman-configuration -Data Type representing the configuration of connman. +@deftp {Type de données} connman-configuration +Type de données représentant la configuration de connman. @table @asis -@item @code{connman} (default: @var{connman}) -The connman package to use. +@item @code{connman} (par défaut : @var{connman}) +Le paquet connman à utiliser. -@item @code{disable-vpn?} (default: @code{#f}) -When true, enable connman's vpn plugin. +@item @code{disable-vpn?} (par défaut : @code{#f}) +Lorsque la valeur est vraie, active le greffon vpn de connman. @end table @end deftp @cindex WPA Supplicant -@defvr {Scheme Variable} wpa-supplicant-service-type -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. It is configured to listen for -requests on D-Bus. +@defvr {Variable Scheme} wpa-supplicant-service-type +C'est le type du service qui lance @url{https://w1.fi/wpa_supplicant/,WPA +supplicant}, un démon d'authentification requis pour s'authentifier sur des +WiFi chiffrés ou des réseaux ethernet. l est configuré pour écouter des +requêtes sur D-Bus. -The value of this service is the @code{wpa-supplicant} package to use. -Thus, it can be instantiated like this: +La valeur de ce service est le paquet @code{wpa-supplicant} à utiliser. +Ainsi, il peut être instancié de cette manière : @lisp (use-modules (gnu services networking)) @@ -11513,25 +11649,26 @@ Thus, it can be instantiated like this: @end defvr @cindex NTP -@cindex real time clock -@deffn {Scheme Procedure} ntp-service [#:ntp @var{ntp}] @ - [#:servers @var{%ntp-servers}] @ [#:allow-large-adjustment? #f] Return a -service that runs the daemon from @var{ntp}, the @uref{http://www.ntp.org, -Network Time Protocol package}. The daemon will keep the system clock -synchronized with that of @var{servers}. @var{allow-large-adjustment?} -determines whether @command{ntpd} is allowed to make an initial adjustment -of more than 1,000 seconds. +@cindex horloge +@deffn {Procédure Scheme} ntp-service [#:ntp @var{ntp}] @ + [#:servers @var{%ntp-servers}] @ +[#:allow-large-adjustment? #f] +Renvoie un service qui lance le démon de @var{ntp}, le +@uref{http://www.ntp.org, paquet Network Time Protocol}. Le démon gardera +l'horloge système synchronisée avec celle des serveurs @var{servers}. +@var{allow-large-adjustment?} détermine si @command{ntpd} a le droit de +faire des ajustements initiaux de plus de 1 000 secondes. @end deffn -@defvr {Scheme Variable} %ntp-servers -List of host names used as the default NTP servers. +@defvr {Variable Scheme} %ntp-servers +Liste des noms d'hôtes utilisés comme serveurs NTP par défaut. @end defvr @cindex OpenNTPD -@deffn {Scheme Procedure} openntpd-service-type -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. +@deffn {Procédure Scheme} openntpd-service-type +Lance le démon NTP @command{ntpd}, implémenté par +@uref{http://www.openntpd.org, OpenNTPD}. Le démon gardera l'horloge +système synchronisée avec celle des serveurs donnés. @example (service @@ -11546,53 +11683,57 @@ keep the system clock synchronized with that of the given servers. @end example @end deffn -@deftp {Data Type} openntpd-configuration +@deftp {Type de données} openntpd-configuration @table @asis -@item @code{openntpd} (default: @code{(file-append openntpd "/sbin/ntpd")}) -The openntpd executable to use. -@item @code{listen-on} (default: @code{'("127.0.0.1" "::1")}) -A list of local IP addresses or hostnames the ntpd daemon should listen on. -@item @code{query-from} (default: @code{'()}) -A list of local IP address the ntpd daemon should use for outgoing queries. -@item @code{sensor} (default: @code{'()}) -Specify a list of timedelta sensor devices ntpd should use. @code{ntpd} -will listen to each sensor that acutally exists and ignore non-existant -ones. See @uref{https://man.openbsd.org/ntpd.conf, upstream documentation} -for more information. -@item @code{server} (default: @var{%ntp-servers}) -Specify a list of IP addresses or hostnames of NTP servers to synchronize -to. -@item @code{servers} (default: @code{'()}) -Specify a list of IP addresses or hostnames of NTP pools to synchronize to. -@item @code{constraint-from} (default: @code{'()}) -@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. -@item @code{constraints-from} (default: @code{'()}) -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. -@item @code{allow-large-adjustment?} (default: @code{#f}) -Determines if @code{ntpd} is allowed to make an initial adjustment of more -than 180 seconds. +@item @code{openntpd} (par défaut : @code{(file-append openntpd "/sbin/ntpd")}) +L'exécutable openntpd à utiliser. +@item @code{listen-on} (par défaut : @code{'("127.0.0.1" "::1")}) +Une liste d'adresses IP locales ou de noms d'hôtes que devrait écouter le +démon ntpd. +@item @code{query-from} (par défaut : @code{'()}) +Une liste d'adresses IP que le démon devrait utiliser pour les requêtes +sortantes. +@item @code{sensor} (par défaut : @code{'()}) +Spécifie une liste de senseurs de différences de temps que ntpd devrait +utiliser. @code{ntpd} écoutera chaque senseur qui existe et ignorera ceux +qui n'existent pas. Voir @uref{https://man.openbsd.org/ntpd.conf, la +documentation en amont} pour plus d'informations. +@item @code{server} (par défaut : @var{%ntp-servers}) +Spécifie une liste d'adresses IP ou de noms d'hôtes de serveurs NTP avec +lesquels se synchroniser. +@item @code{servers} (par défaut : @code{'()}) +Spécifie une liste d'adresses IP ou de noms d'hôtes de banques de serveurs +NTP avec lesquelles se synchroniser. +@item @code{constraint-from} (par défaut : @code{'()}) +@code{ntpd} peut être configuré pour demander la « Date » à des serveurs +HTTPS de confiance via TLS. Cette information de temps n'est pas utilisée +pour sa précision mais agit comme une contrainte authentifiée, ce qui réduit +l'impact d'une attaque par l'homme du milieu sur le protocole NTP non +authentifié. Spécifie une liste d'URL, d'adresses IP ou de noms d'hôtes de +serveurs HTTPS qui fournissent cette contrainte. +@item @code{constraints-from} (par défaut : @code{'()}) +Comme pour @code{constraint-from}, spécifie une liste d'URL, d'adresses IP +ou de noms d'hôtes de serveurs HTTPS qui fournissent une contrainte. Si les +noms d'hôtes sont résolus en plusieurs adresses IP, @code{ntpd} calculera la +contrainte médiane. +@item @code{allow-large-adjustment?} (par défaut : @code{#f}) +Détermine si @code{ntpd} peut faire un ajustement initial de plus de 180 +secondes. @end table @end deftp @cindex inetd -@deffn {Scheme variable} inetd-service-type -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. - -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}: +@deffn {Variable Scheme} inetd-service-type +Ce service lance le démon @command{inetd} (@pxref{inetd invocation,,, +inetutils, GNU Inetutils}). @command{inetd} écoute des connexionssur des +sockets internet et démarre le programme spécifié uniquement lorsqu'une +connexion arrive sur l'un de ces sockets. + +La valeur de ce service est un objet @code{inetd-configuration}. L'exemple +suivant configure le démon @command{inetd} pour qu'il fournisse le service +@command{echo}, ainsi qu'in service smtp qui transfère le trafic smtp par +ssh à un serveur @code{smtp-server} derrière une passerelle @code{hostname} +: @example (service @@ -11618,206 +11759,215 @@ smtp traffic over ssh to a server @code{smtp-server} behind a gateway "-W" "smtp-server:25" "user@@hostname"))))) @end example -See below for more details about @code{inetd-configuration}. +Voir plus bas pour plus de détails sur @code{inetd-configuration}. @end deffn -@deftp {Data Type} inetd-configuration -Data type representing the configuration of @command{inetd}. +@deftp {Type de données} inetd-configuration +Type de données représentant la configuration de @command{inetd}. @table @asis -@item @code{program} (default: @code{(file-append inetutils "/libexec/inetd")}) -The @command{inetd} executable to use. +@item @code{program} (par défaut : @code{(file-append inetutils "/libexec/inetd")}) +L'exécutable @command{inetd} à utiliser. -@item @code{entries} (default: @code{'()}) -A list of @command{inetd} service entries. Each entry should be created by -the @code{inetd-entry} constructor. +@item @code{entries} (par défaut : @code{'()}) +Une liste d'entrées de services @command{inetd}. Chaque entrée devrait être +crée avec le constructeur @code{inetd-entry}. @end table @end deftp -@deftp {Data Type} inetd-entry -Data type representing an entry in the @command{inetd} configuration. Each -entry corresponds to a socket where @command{inetd} will listen for -requests. +@deftp {Type de données} inetd-entry +Type de données représentant une entrée dans la configuration +d'@command{inetd}. Chaque entrée correspond à un socket sur lequel +@command{inetd} écoutera les requêtes. @table @asis -@item @code{node} (default: @code{#f}) -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. +@item @code{node} (par défaut : @code{#f}) +Chaîne de caractères facultative, un liste d'adresses locales séparées par +des virgules que @command{inetd} devrait utiliser pour écouter ce service. +@xref{Configuration file,,, inetutils, GNU Inetutils} pour une description +complète de toutes les options. @item @code{name} -A string, the name must correspond to an entry in @code{/etc/services}. +Une chaîne de caractères dont le nom doit correspondre à une entrée de +@code{/etc/services}. @item @code{socket-type} -One of @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} or +Un symbole parmi @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} ou @code{'seqpacket}. @item @code{protocol} -A string, must correspond to an entry in @code{/etc/protocols}. -@item @code{wait?} (default: @code{#t}) -Whether @command{inetd} should wait for the server to exit before listening -to new service requests. +Une chaîne de caractères qui doit correspondre à une entrée dans +@code{/etc/protocols}. +@item @code{wait?} (par défaut : @code{#t}) +Indique si @command{inetd} devrait attendre que le serveur ait quitté avant +d'écouter de nouvelles demandes de service. @item @code{user} -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"}. -@item @code{program} (default: @code{"internal"}) -The server program which will serve the requests, or @code{"internal"} if -@command{inetd} should use a built-in service. +Une chaîne de caractères contenant le nom d'utilisateur (et éventuellement +de groupe) de l'utilisateur en tant que lequel le serveur devrait tourner. +Le nom du groupe peut être spécifié comme un suffixe, séparé par un +deux-points ou un point, c.-à-d.@: @code{"utilisateur"}, +@code{"utilisateur:groupe"} ou @code{"utilisateur.groupe"}. +@item @code{program} (par défaut : @code{"internal"}) +Le programme du serveur qui servira les requêtes, ou @code{"internal"} si +@command{inetd} devrait utiliser un service inclus. @item @code{arguments} (par défaut : @code{'()}) -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")}. +Une liste de chaînes de caractères ou d'objets simili-fichiers qui sont les +arguments du programme du serveur, en commençant par le zéroième argument, +c.-à-d.@: le nom du programme lui-même. Pour les services internes à +@command{inetd}, cette entrée doit être @code{'()} ou @code{'("internal")}. @end table -@xref{Configuration file,,, inetutils, GNU Inetutils} for a more detailed -discussion of each configuration field. +@xref{Configuration file,,, inetutils, GNU Inetutils} pour trouver une +discussion plus détaillée de chaque champ de configuration. @end deftp @cindex Tor -@deffn {Scheme Procedure} tor-service [@var{config-file}] [#:tor @var{tor}] -Return a service to run the @uref{https://torproject.org, Tor} anonymous -networking daemon. - -The daemon runs as the @code{tor} unprivileged user. It is passed -@var{config-file}, a file-like object, with an additional @code{User tor} -line and lines for hidden services added via @code{tor-hidden-service}. Run -@command{man tor} for information about the configuration file. +@deffn {Procédure Scheme} tor-service [@var{config-file}] [#:tor @var{tor}] +Renvoie un service qui lance le démon de réseau anonyme +@uref{https://torproject.org, Tor}. + +Le démon est lancé avec l'identité de l'utilisateur non privilégié +@code{tor}. Il lit @var{config-file}, un objet simili-fichier, avec une +ligne @code{User tor} supplémentaire et des lignes pour les services cachés +ajoutées par des @code{tor-hidden-service}. Lncez @command{man tor} pour +obtenir des informations sur le fichier de configuration. @end deffn -@cindex hidden service -@deffn {Scheme Procedure} tor-hidden-service @var{name} @var{mapping} -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: +@cindex service caché +@deffn {Procédure Scheme} tor-hidden-service @var{name} @var{mapping} +Définie un @dfn{service caché} pour Tor nommé @var{name} qui implémente +@var{mapping}. @var{mapping} est une liste de paires de port et d'hôte, +comme dans : @example '((22 "127.0.0.1:22") (80 "127.0.0.1:8080")) @end example -In this example, port 22 of the hidden service is mapped to local port 22, -and port 80 is mapped to local port 8080. +Dans cet exemple, le port 22 du service caché est relié au port local 22 et +le port 80 est relié au port local 8080. -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. +Cela crée un répertoire @file{/var/lib/tor/hidden-services/@var{name}} où le +fichier @file{hostname} contient le nom d'hôte @code{.onion} pour le service +caché. -See @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, the -Tor project's documentation} for more information. +Voir @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, the +Tor project's documentation} pour trouver plus d'information. @end deffn -The @code{(gnu services rsync)} module provides the following services: +Le module @code{(gnu services rsync)} fournit les services suivant : -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. +Vous pourriez vouloir un démon rsync si vous voulez que des fichiers soient +disponibles pour que n'importe qui (ou juste vous) puisse télécharger des +fichiers existants ou en téléverser des nouveaux. -@deffn {Scheme Variable} rsync-service-type -This is the type for the @uref{https://rsync.samba.org, rsync} rsync daemon, -@command{rsync-configuration} record as in this example: +@deffn {Variable Scheme} rsync-service-type +C'est le type pour le démon @uref{https://rsync.samba.org, rsync}, qui prend +un enregistrement @command{rsync-configuration} comme dans cet exemple : @example (service rsync-service-type) @end example -See below for details about @code{rsync-configuration}. +Voir plus pas pour trouver des détails à propos de +@code{rsync-configuration}. @end deffn -@deftp {Data Type} rsync-configuration -Data type representing the configuration for @code{rsync-service}. +@deftp {Type de données} rsync-configuration +Type de données représentant la configuration de @code{rsync-service}. @table @asis -@item @code{package} (default: @var{rsync}) -@code{rsync} package to use. +@item @code{package} (par défaut : @var{rsync}) +Le paquet @code{rsync} à utiliser. -@item @code{port-number} (default: @code{873}) -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. +@item @code{port-number} (par défaut : @code{873}) +Le port TCP sur lequel @command{rsync} écoute les connexions entrantes. Si +le port est inférieur à @code{1024}, @command{rsync} doit être démarré en +tant qu'utilisateur et groupe @code{root}. -@item @code{pid-file} (default: @code{"/var/run/rsyncd/rsyncd.pid"}) -Name of the file where @command{rsync} writes its PID. +@item @code{pid-file} (par défaut : @code{"/var/run/rsyncd/rsyncd.pid"}) +Nom du fichier où @command{rsync} écrit son PID. -@item @code{lock-file} (default: @code{"/var/run/rsyncd/rsyncd.lock"}) -Name of the file where @command{rsync} writes its lock file. +@item @code{lock-file} (par défaut : @code{"/var/run/rsyncd/rsyncd.lock"}) +Nom du fichier où @command{rsync} écrit son fichier de verrouillage. -@item @code{log-file} (default: @code{"/var/log/rsyncd.log"}) -Name of the file where @command{rsync} writes its log file. +@item @code{log-file} (par défaut : @code{"/var/log/rsyncd.log"}) +Nom du fichier où @command{rsync} écrit son fichier de journal. -@item @code{use-chroot?} (default: @var{#t}) -Whether to use chroot for @command{rsync} shared directory. +@item @code{use-chroot?} (par défaut : @var{#t}) +S'il faut utiliser un chroot pour le répertoire partagé de @command{rsync}. -@item @code{share-path} (default: @file{/srv/rsync}) -Location of the @command{rsync} shared directory. +@item @code{share-path} (par défaut : @file{/srv/rsync}) +Emplacement du répertoire partagé de @command{rsync}. -@item @code{share-comment} (default: @code{"Rsync share"}) -Comment of the @command{rsync} shared directory. +@item @code{share-comment} (par défaut : @code{"Rsync share"}) +Commentaire du répertoire partagé de @command{rsync}. -@item @code{read-only?} (default: @var{#f}) -Read-write permissions to shared directory. +@item @code{read-only?} (par défaut : @var{#f}) +Permission en écriture sur le répertoire partagé. -@item @code{timeout} (default: @code{300}) -I/O timeout in seconds. +@item @code{timeout} (par défaut : @code{300}) +Délai d'attente d'entrée-sortie en secondes. -@item @code{user} (default: @var{"root"}) -Owner of the @code{rsync} process. +@item @code{user} (par défaut : @var{"root"}) +Propriétaire du processus @code{rsync}. -@item @code{group} (default: @var{"root"}) -Group of the @code{rsync} process. +@item @code{group} (par défaut : @var{"root"}) +Groupe du processus @code{rsync}. -@item @code{uid} (default: @var{"rsyncd"}) -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}. +@item @code{uid} (par défaut : @var{"rsyncd"}) +Nom d'utilisateur ou ID utilisateur en tant que lequel les transferts de +fichiers ont lieu si le démon a été lancé en @code{root}. -@item @code{gid} (default: @var{"rsyncd"}) -Group name or group ID that will be used when accessing the module. +@item @code{gid} (par défaut : @var{"rsyncd"}) +Nom du groupe ou ID du groupe qui sera utilisé lors de l'accès au module. @end table @end deftp -Furthermore, @code{(gnu services ssh)} provides the following services. +En plus, @code{(gnu services ssh)} fournit les services suivant. @cindex SSH -@cindex SSH server +@cindex serveur SSH -@deffn {Scheme Procedure} lsh-service [#:host-key "/etc/lsh/host-key"] @ +@deffn {Procédure Scheme} lsh-service [#:host-key "/etc/lsh/host-key"] @ [#: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. - -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}. - -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. - -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}). - -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. - -@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. - -The other options should be self-descriptive. +[#: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] +Lance le programme @command{lshd} de @var{lsh} pour écouter sur le port +@var{port-number}. @var{host-key} doit désigner un fichier contenant la +clef d'hôte et ne doit être lisible que par root. + +Lorsque @var{daemonic?} est vrai, @command{lshd} se détachera du terminal +qui le contrôle et enregistrera ses journaux avec syslogd, à moins que +@var{syslog-output?} ne soit faux. Évidemment, cela rend aussi lsh-service +dépendant de l'existence d'un service syslogd. Lorsque @var{pid-file?} est +vrai, @command{lshd} écrit son PID dans le fichier @var{pid-file}. + +Lorsque @var{initialize?} est vrai, la graine et la clef d'hôte seront créés +lors de l'activation du service s'ils n'existent pas encore. Cela peut +prendre du temps et demande une interaction. + +Lorsque @var{initialize?} est faux, c'est à l'utilisateur d'initialiser le +générateur d'aléatoire (@pxref{lsh-make-seed,,, lsh, LSH Manual}) et de crée +une paire de clefs dont la clef privée sera stockée dans le fichier +@var{host-key} (@pxref{lshd basics,,, lsh, LSH Manual}). + +Lorsque @var{interfaces} est vide, lshd écoute les connexions sur toutes les +interfaces réseau ; autrement, @var{interfaces} doit être une liste de noms +d'hôtes et d'adresses. + +@var{allow-empty-passwords?} spécifie si les connexions avec des mots de +passes vides sont acceptés et @var{root-login?} spécifie si la connexion en +root est acceptée. + +Les autres options devraient être évidentes. @end deffn @cindex SSH -@cindex SSH server -@deffn {Scheme Variable} openssh-service-type -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: +@cindex serveur SSH +@deffn {Variable Scheme} openssh-service-type +C'est le type pour le démon ssh @uref{http://www.openssh.org, OpenSSH}, +@command{sshd}. Sa valeur doit être un enregistrement +@code{openssh-configuration} comme dans cet exemple : @example (service openssh-service-type @@ -11829,9 +11979,10 @@ record as in this example: ("bob" ,(local-file "bob.pub")))))) @end example -See below for details about @code{openssh-configuration}. +Voir plus bas pour trouver des détails sur @code{openssh-configuration}. -This service can be extended with extra authorized keys, as in this example: +Ce service peut être étendu avec des clefs autorisées supplémentaires, comme +dans cet exemple : @example (service-extension openssh-service-type @@ -11840,39 +11991,46 @@ This service can be extended with extra authorized keys, as in this example: @end example @end deffn -@deftp {Data Type} openssh-configuration -This is the configuration record for OpenSSH's @command{sshd}. +@deftp {Type de données} openssh-configuration +C'est l'enregistrement de la configuration de la commande @command{sshd} +d'OpenSSH. @table @asis -@item @code{pid-file} (default: @code{"/var/run/sshd.pid"}) -Name of the file where @command{sshd} writes its PID. - -@item @code{port-number} (default: @code{22}) -TCP port on which @command{sshd} listens for incoming connections. - -@item @code{permit-root-login} (default: @code{#f}) -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. - -@item @code{allow-empty-passwords?} (default: @code{#f}) -When true, users with empty passwords may log in. When false, they may not. - -@item @code{password-authentication?} (default: @code{#t}) -When true, users may log in with their password. When false, they have -other authentication methods. - -@item @code{public-key-authentication?} (default: @code{#t}) -When true, users may log in using public key authentication. When false, -users have to use other authentication method. - -Authorized public keys are stored in @file{~/.ssh/authorized_keys}. This is -used only by protocol version 2. - -@item @code{x11-forwarding?} (default: @code{#f}) -When true, forwarding of X11 graphical client connections is enabled---in -other words, @command{ssh} options @option{-X} and @option{-Y} will work. +@item @code{pid-file} (par défaut : @code{"/var/run/sshd.pid"}) +Nom du fichier où @command{sshd} écrit son PID. + +@item @code{port-number} (par défaut : @code{22}) +Port TCP sur lequel @command{sshd} écoute les connexions entrantes. + +@item @code{permit-root-login} (par défaut : @code{#f}) +Ce champ détermine si et quand autoriser les connexions en root. Si la +valeur est @code{#f}, les connexions en root sont désactivées ; si la valeur +est @code{#t}, elles sont autorisées. S'il s'agit du symbole +@code{'without-password}, alors les connexions root sont autorisées mais pas +par une authentification par mot de passe. + +@item @code{allow-empty-passwords?} (par défaut : @code{#f}) +Lorsque la valeur est vraie, les utilisateurs avec un mot de passe vide +peuvent se connecter. Sinon, ils ne peuvent pas. + +@item @code{password-authentication?} (par défaut : @code{#t}) +Lorsque la valeur est vraie, les utilisateurs peuvent se connecter avec leur +mot de passe. Sinon, ils doivent utiliser une autre méthode +d'authentification. + +@item @code{public-key-authentication?} (par défaut : @code{#t}) +Lorsque la valeur est vraie, les utilisateurs peuvent se connecter avec leur +clef publique. Sinon, les utilisateurs doivent utiliser une autre méthode +d'authentification. + +Les clefs publiques autorisées sont stockées dans +@file{~/.ssh/authorized_keys}. Ce n'est utilisé que par le protocole +version 2. + +@item @code{x11-forwarding?} (par défaut : @code{#f}) +Lorsque la valeur est vraie, le transfert de connexion du client graphique +X11 est activé — en d'autre termes, les options @option{-X} et @option{-Y} +de @command{ssh} fonctionneront. @item @code{allow-agent-forwarding?} (default: @code{#t}) Whether to allow agent forwarding. @@ -11883,35 +12041,36 @@ Whether to allow TCP forwarding. @item @code{gateway-ports?} (default: @code{#f}) Whether to allow gateway ports. -@item @code{challenge-response-authentication?} (default: @code{#f}) -Specifies whether challenge response authentication is allowed (e.g. via -PAM). +@item @code{challenge-response-authentication?} (par défaut : @code{#f}) +Spécifie si l'authentification par défi est autorisée (p.@: ex.@: via PAM). -@item @code{use-pam?} (default: @code{#t}) -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. +@item @code{use-pam?} (par défaut : @code{#t}) +Active l'interface avec le module d'authentification greffable, PAM. Si la +valeur est @code{#t}, cela activera l'authentification PAM avec +@code{challenge-response-authentication?} et +@code{password-authentication?}, en plus des modules de compte et de session +de PAM pour tous les types d'authentification. -Because PAM challenge response authentication usually serves an equivalent -role to password authentication, you should disable either -@code{challenge-response-authentication?} or +Comme l'authentification par défi de PAM sert généralement un rôle +équivalent à l'authentification par mot de passe, vous devriez désactiver +soit @code{challenge-response-authentication?}, soit @code{password-authentication?}. -@item @code{print-last-log?} (default: @code{#t}) -Specifies whether @command{sshd} should print the date and time of the last -user login when a user logs in interactively. +@item @code{print-last-log?} (par défaut : @code{#t}) +Spécifie si @command{sshd} devrait afficher la date et l'heure de dernière +connexion des utilisateurs lorsqu'un utilisateur se connecte de manière +interactive. -@item @code{subsystems} (default: @code{'(("sftp" "internal-sftp"))}) -Configures external subsystems (e.g. file transfer daemon). +@item @code{subsystems} (par défaut : @code{'(("sftp" "internal-sftp"))}) +Configure les sous-systèmes externes (p.@: ex.@: le démon de transfert de +fichiers). -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. +C'est une liste de paires, composées chacune du nom du sous-système et d'une +commande (avec éventuellement des arguments) à exécuter à la demande du +sous-système. -The command @command{internal-sftp} implements an in-process SFTP server. -Alternately, one can specify the @command{sftp-server} command: +La commande @command{internal-sftp} implémente un serveur SFTP dans le +processus. Autrement, on peut spécifier la commande @command{sftp-server} : @example (service openssh-service-type (openssh-configuration @@ -11919,16 +12078,18 @@ Alternately, one can specify the @command{sftp-server} command: `(("sftp" ,(file-append openssh "/libexec/sftp-server")))))) @end example -@item @code{accepted-environment} (default: @code{'()}) -List of strings describing which environment variables may be exported. +@item @code{accepted-environment} (par défaut : @code{'()}) +Liste de chaînes de caractères qui décrivent les variables d'environnement +qui peuvent être exportées. -Each string gets on its own line. See the @code{AcceptEnv} option in +Chaque chaîne a sa propre ligne. Voir l'option @code{AcceptEnv} dans @code{man sshd_config}. -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. +Cet exemple permet aux clients ssh d'exporter la variable @code{COLORTERM}. +Elle est initialisée par les émulateurs de terminaux qui supportent les +couleurs. Vous pouvez l'utiliser dans votre fichier de ressource de votre +shell pour activer les couleurs sur la ligne de commande si cette variable +est initialisée. @example (service openssh-service-type @@ -11936,12 +12097,12 @@ variable is set. (accepted-environment '("COLORTERM")))) @end example -@item @code{authorized-keys} (default: @code{'()}) -@cindex authorized keys, SSH -@cindex SSH authorized keys -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: +@item @code{authorized-keys} (par défaut : @code{'()}) +@cindex clefs autorisées, SSH +@cindex SSH, clefs autorisées +C'est la liste des clefs autorisées. Chaque élément de la liste est un nom +d'utilisateur suivit d'un ou plusieurs objets simili-fichiers qui +représentent les clefs publiques SSH. Par exemple : @example (openssh-configuration @@ -11952,24 +12113,24 @@ keys. For example: @end example @noindent -registers the specified public keys for user accounts @code{rekado}, -@code{chris}, and @code{root}. +enregistre les clefs publiques spécifiées pour les comptes @code{rekado}, +@code{chris} et @code{root}. -Additional authorized keys can be specified @i{via} +Des clefs autorisées supplémentaires peuvent être spécifiées via @code{service-extension}. -Note that this does @emph{not} interfere with the use of +Remarquez que cela n'interfère @emph{pas} avec l'utilisation de @file{~/.ssh/authorized_keys}. @end table @end deftp -@deffn {Scheme Procedure} dropbear-service [@var{config}] -Run the @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,Dropbear SSH -daemon} with the given @var{config}, a @code{} -object. +@deffn {Procédure Scheme} dropbear-service [@var{config}] +Lance le @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,démon SSH +Dropbear} avec la configuration @var{config} donnée, un objet +@code{}. -For example, to specify a Dropbear service listening on port 1234, add this -call to the operating system's @code{services} field: +Par exemple, pour spécifier un service Dropbear qui écoute sur le port 1234, +ajoutez cet appel au champ @code{services} d evotre système d'exploitation : @example (dropbear-service (dropbear-configuration @@ -11977,101 +12138,106 @@ call to the operating system's @code{services} field: @end example @end deffn -@deftp {Data Type} dropbear-configuration -This data type represents the configuration of a Dropbear SSH daemon. +@deftp {Type de données} dropbear-configuration +Ce type de données représente la configuration d'un démon SSH Dropbear. @table @asis -@item @code{dropbear} (default: @var{dropbear}) -The Dropbear package to use. +@item @code{dropbear} (par défaut : @var{dropbear}) +Le paquet Dropbear à utiliser. -@item @code{port-number} (default: 22) -The TCP port where the daemon waits for incoming connections. +@item @code{port-number} (par défaut : 22) +Le port TCP sur lequel le démon attend des connexions entrantes. -@item @code{syslog-output?} (default: @code{#t}) -Whether to enable syslog output. +@item @code{syslog-output?} (par défaut : @code{#t}) +Indique s'il faut activer la sortie vers syslog. -@item @code{pid-file} (default: @code{"/var/run/dropbear.pid"}) -File name of the daemon's PID file. +@item @code{pid-file} (par défaut : @code{"/var/run/dropbear.pid"}) +Nom du fichier de PID du démon. -@item @code{root-login?} (default: @code{#f}) -Whether to allow @code{root} logins. +@item @code{root-login?} (par défaut : @code{#f}) +Indique s'il faut autoriser les connexions en @code{root}. -@item @code{allow-empty-passwords?} (default: @code{#f}) -Whether to allow empty passwords. +@item @code{allow-empty-passwords?} (par défaut : @code{#f}) +Indique s'il faut autoriser les mots de passes vides. -@item @code{password-authentication?} (default: @code{#t}) -Whether to enable password-based authentication. +@item @code{password-authentication?} (par défaut : @code{#t}) +Indique s'il faut autoriser l'authentification par mot de passe. @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 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}. +@defvr {Variable Scheme} %facebook-host-aliases +Cette variable contient une chaîne de caractères à utiliser dans +@file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library Reference +Manual}). Chaque ligne contient une entrée qui fait correspondre les noms +des serveurs connus du service en ligne Facebook — p.@: ex.@: +@code{www.facebook.com} — à l'hôte local — @code{127.0.0.1} ou son +équivalent en IPv6, @code{::1}. -This variable is typically used in the @code{hosts-file} field of an -@code{operating-system} declaration (@pxref{Référence de système d'exploitation, -@file{/etc/hosts}}): +Cette variable est typiquement utilisée dans le champ @code{hosts-file} +d'une déclaration @code{operating-system} (@pxref{Référence de système d'exploitation, @file{/etc/hosts}}) : @example (use-modules (gnu) (guix)) (operating-system - (host-name "mymachine") + (host-name "mamachine") ;; ... (hosts-file - ;; Create a /etc/hosts file with aliases for "localhost" - ;; and "mymachine", as well as for Facebook servers. + ;; Crée un fichier /etc/hosts avec des alias pour « localhost » + ;; et « mamachine », ainsi que pour les serveurs de Facebook. (plain-file "hosts" (string-append (local-host-aliases host-name) %facebook-host-aliases)))) @end example -This mechanism can prevent programs running locally, such as Web browsers, -from accessing Facebook. +Ce mécanisme peut éviter que des programmes qui tournent localement, comme +des navigateurs Web, ne se connectent à Facebook. @end defvr -The @code{(gnu services avahi)} provides the following definition. - -@deffn {Scheme Procedure} avahi-service [#:avahi @var{avahi}] @ - [#:host-name #f] [#:publish? #t] [#:ipv4? #t] @ [#:ipv6? #t] [#:wide-area? -#f] @ [#:domains-to-browse '()] [#:debug? #f] Return a 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{http://avahi.org/}), and 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}. -Additionally, add the @var{avahi} package to the system profile so that -commands such as @command{avahi-browse} are directly usable. - -If @var{host-name} is different from @code{#f}, use that as the host name to -publish for this machine; otherwise, use the machine's actual host name. - -When @var{publish?} is true, publishing of host names and services is -allowed; in particular, avahi-daemon will publish the machine's host name -and IP address via mDNS on the local network. - -When @var{wide-area?} is true, DNS-SD over unicast DNS is enabled. - -Boolean values @var{ipv4?} and @var{ipv6?} determine whether to use -IPv4/IPv6 sockets. +Le module @code{(gnu services avahi)} fourni la définition suivante. + +@deffn {Procédure Scheme} avahi-service [#:avahi @var{avahi}] @ + [#:host-name #f] [#:publish? #t] [#:ipv4? #t] @ +[#:ipv6? #t] [#:wide-area? #f] @ +[#:domains-to-browse '()] [#:debug? #f] +Renvoie un service qui lance @command{avahi-daemon}, un serveur qui répond +aux requêtes mDNS/DNS-SD qui permet de découvrir des services et de chercher +des noms d'hôtes « sans configuration » (voir @uref{http://avahi.org/}) et +qui étend le démon de cache de services de noms (nscd) pour qu'il puisse +résoudre des noms en @code{.local} avec +@uref{http://0pointer.de/lennart/projects/nss-mdns/, nss-mdns}. En plus, +ajoute le paquet @var{avahi} au profil du système pour que les commandes +comme @command{avahi-browse} soient directement utilisables. + +Si @var{host-name} n'est pas @code{#f}, utilise cette valeur comme nom +d'hôte à publier pour la machine ; sinon, utilise le vrai nom d'hôte de la +machine. + +Lorsque la valeur de @var{publish?} est vraie, la publication des noms +d'hôtes et des domaines sont autorisés ; en particulier, avahi-daemon +publiera le nom d'hôte et l'adresse IP de la machine via mDNS sur le réseau +local. + +Lorsque la valeur de @var{wide-area?} est vraie, DNS-SD sur DNS unicast est +activé. + +Les valeurs booléennes @var{ipv4?} et @var{ipv6?} déterminent s'il faut +utiliser un socket IPv4 ou IPv6 respectivement. @end deffn -@deffn {Scheme Variable} openvswitch-service-type -This is the type of the @uref{http://www.openvswitch.org, Open vSwitch} -service, whose value should be an @code{openvswitch-configuration} object. +@deffn {Variable Scheme} openvswitch-service-type +C'est le type du service @uref{http://www.openvswitch.org, Open vSwitch}, +dont la valeur devrait être un objet @code{openvswitch-configuration}. @end deffn -@deftp {Data Type} openvswitch-configuration -Data type representing the configuration of Open vSwitch, a multilayer -virtual switch which is designed to enable massive network automation -through programmatic extension. +@deftp {Type de données} openvswitch-configuration +Type de données représentant la configuration de Open vSwitch, un +commutateur virtuel multiniveaux conçu pour rendre possible l'automatisation +massive des réseaux avec des extensions programmables. @table @asis -@item @code{package} (default: @var{openvswitch}) -Package object of the Open vSwitch. +@item @code{package} (par défaut : @var{openvswitch}) +Objet de paquet de Open vSwitch. @end table @end deftp @@ -12080,188 +12246,196 @@ Package object of the Open vSwitch. @subsubsection Système de fenêtrage X @cindex X11 -@cindex X Window System -@cindex login manager -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 SLiM. - -@cindex window manager -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{Référence de système d'exploitation, system-wide packages}). - -@defvr {Scheme Variable} slim-service-type -This is the type for the SLiM graphical login manager for X11. - -@cindex session types (X11) -@cindex X11 session types -SLiM 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 using @kbd{F1}. Packages such as -@code{xfce}, @code{sawfish}, and @code{ratpoison} provide @file{.desktop} -files; adding them to the system-wide set of packages automatically makes -them available at the log-in screen. - -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. +@cindex Système de fenêtrage X +@cindex gestionnaire de connexion +Le support pour le système d'affichage graphique X Window — en particulier +Xorg — est fournit par le module @code{(gnu services xorg)}. Remarquez +qu'il n'y a pas de procédure @code{xorg-service}. À la place, le serveur X +est démarré par le @dfn{gestionnaire de connexion}, par défaut SLiM. + +@cindex gestionnaire de fenêtre +Pour utiliser X11, vous devez installer au moins un @dfn{gestionnaire de +fenêtre} — par exemple les paquets @code{windowmaker} ou @code{openbox} — de +préférence en l'ajoutant au champ @code{packages} de votre définition de +système d'exploitation (@pxref{Référence de système d'exploitation, system-wide +packages}). + +@defvr {Variable Scheme} slim-service-type +C'est de type pour le gestionnaire de connexion graphique SLiM pour X11. + +@cindex types de sessions (X11) +@cindex X11, types de sessions +SLiM cherche des @dfn{types de sessions} définies par les fichiers +@file{.desktop} dans @file{/run/current-system/profile/share/xsessions} et +permet aux utilisateurs de choisir une session depuis l'écran de connexion +avec @kbd{F1}. Les paquets comme @code{xfce}, @code{sawfish} et +@code{ratpoison} fournissent des fichiers @file{.desktop} ; les ajouter à +l'ensemble des paquets du système les rendra automatiquement disponibles sur +l'écran de connexion. + +En plus, les fichiers @file{~/.xsession} sont honorées. Lorsqu'il est +disponible, @file{~/.xsession} doit être un fichier exécutable qui démarre +un gestionnaire de fenêtre au un autre client X. @end defvr -@deftp {Data Type} slim-configuration -Data type representing the configuration of @code{slim-service-type}. +@deftp {Type de données} slim-configuration +Type de données représentant la configuration de @code{slim-service-type}. @table @asis -@item @code{allow-empty-passwords?} (default: @code{#t}) -Whether to allow logins with empty passwords. +@item @code{allow-empty-passwords?} (par défaut : @code{#t}) +S'il faut autoriser les connexions avec un mot de passe vide. -@item @code{auto-login?} (default: @code{#f}) -@itemx @code{default-user} (default: @code{""}) -When @code{auto-login?} is false, SLiM presents a log-in screen. +@item @code{auto-login?} (par défaut : @code{#f}) +@itemx @code{default-user} (par défaut : @code{""}) +Lorsque @code{auto-login?} est faux, SLiM présent un écran de connexion. -When @code{auto-login?} is true, SLiM logs in directly as -@code{default-user}. +Lorsque @code{auto-login?} est vrai, SLiM se connecte directement en tant +que @code{default-user}. -@item @code{theme} (default: @code{%default-slim-theme}) -@itemx @code{theme-name} (default: @code{%default-slim-theme-name}) -The graphical theme to use and its name. +@item @code{theme} (par défaut : @code{%default-slim-theme}) +@itemx @code{theme-name} (par défaut : @code{%default-slim-theme-name}) +Le thème graphique à utiliser et son nom. -@item @code{auto-login-session} (default: @code{#f}) -If true, this must be the name of the executable to start as the default -session---e.g., @code{(file-append windowmaker "/bin/windowmaker")}. +@item @code{auto-login-session} (par défaut : @code{#f}) +Si la valeur est vraie, elle doit être le nom d'un exécutable à démarrer +comme session par défaut — p.@: ex.@: @code{(file-append windowmaker +"/bin/windowmaker")}. -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. +Si la valeur est fausse, une session décrite par l'un des fichiers +@file{.desktop} disponibles dans @code{/run/current-system/profile} et +@code{~/.guix-profile} sera utilisée. @quotation Remarque -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. +Vous devez installer au moins un gestionnaire de fenêtres dans le profil du +système ou dans votre profil utilisateur. Sinon, si +@code{auto-login-session} est faux, vous ne serez jamais capable de vous +connecter. @end quotation -@item @code{startx} (default: @code{(xorg-start-command)}) -The command used to start the X11 graphical server. +@item @code{startx} (par défaut : @code{(xorg-start-command)}) +La commande utilisée pour démarrer le serveur graphique X11. -@item @code{xauth} (default: @code{xauth}) -The XAuth package to use. +@item @code{xauth} (par défaut : @code{xauth}) +Le paquet XAuth à utiliser. -@item @code{shepherd} (default: @code{shepherd}) -The Shepherd package used when invoking @command{halt} and @command{reboot}. +@item @code{shepherd} (par défaut : @code{shepherd}) +Le paquet Shepherd à utiliser pour invoquer @command{halt} et +@command{reboot}. -@item @code{sessreg} (default: @code{sessreg}) -The sessreg package used in order to register the session. +@item @code{sessreg} (par défaut : @code{sessreg}) +Le paquet sessreg à utiliser pour enregistrer la session. -@item @code{slim} (default: @code{slim}) -The SLiM package to use. +@item @code{slim} (par défaut : @code{slim}) +Le paquet SLiM à utiliser. @end table @end deftp -@defvr {Scheme Variable} %default-theme -@defvrx {Scheme Variable} %default-theme-name -The default SLiM theme and its name. +@defvr {Variable Scheme} %default-theme +@defvrx {Variable Scheme} %default-theme-name +Le thème SLiM par défaut et son nom. @end defvr -@deftp {Data Type} sddm-configuration -This is the data type representing the sddm service configuration. +@deftp {Type de données} sddm-configuration +C'est le type de données représentant la configuration du service sddm. @table @asis -@item @code{display-server} (default: "x11") -Select display server to use for the greeter. Valid values are "x11" or -"wayland". +@item @code{display-server} (par défaut : "x11") +Choisit le serveur d'affichage à utiliser pour l'écran d'accueil. Les +valeurs valides sont « x11 » et « wayland ». -@item @code{numlock} (default: "on") -Valid values are "on", "off" or "none". +@item @code{numlock} (par défaut : "on") +Les valeurs valides sont « on », « off » ou « none ». -@item @code{halt-command} (default @code{#~(string-apppend #$shepherd "/sbin/halt")}) -Command to run when halting. +@item @code{halt-command} (par défaut : @code{#~(string-apppend #$shepherd "/sbin/halt")}) +La commande à lancer à l'arrêt du système. -@item @code{reboot-command} (default @code{#~(string-append #$shepherd "/sbin/reboot")}) -Command to run when rebooting. +@item @code{reboot-command} (par défaut : @code{#~(string-append #$shepherd "/sbin/reboot")}) +La commande à lancer lors du redémarrage du système. -@item @code{theme} (default "maldives") -Theme to use. Default themes provided by SDDM are "elarun" or "maldives". +@item @code{theme} (par défaut : "maldives") +Le thème à utiliser. Les thèmes par défaut fournis par SDDM sont « elarun » +et « maldives ». -@item @code{themes-directory} (default "/run/current-system/profile/share/sddm/themes") -Directory to look for themes. +@item @code{themes-directory} (par défaut : "/run/current-system/profile/share/sddm/themes") +Le répertoire où se trouvent les thèmes. -@item @code{faces-directory} (default "/run/current-system/profile/share/sddm/faces") -Directory to look for faces. +@item @code{faces-directory} (par défaut : "/run/current-system/profile/share/sddm/faces") +Répertoire où se trouvent les avatars. -@item @code{default-path} (default "/run/current-system/profile/bin") -Default PATH to use. +@item @code{default-path} (par défaut : "/run/current-system/profile/bin") +Le PATH par défaut à utiliser. -@item @code{minimum-uid} (default 1000) -Minimum UID to display in SDDM. +@item @code{minimum-uid} (par défaut : 1000) +UID minimum pour être affiché dans SDDM. -@item @code{maximum-uid} (default 2000) -Maximum UID to display in SDDM +@item @code{maximum-uid} (par défaut : 2000) +UID maximum pour être affiché dans SDDM. -@item @code{remember-last-user?} (default #t) -Remember last user. +@item @code{remember-last-user?} (par défaut : #t) +S'il faut se rappeler le dernier utilisateur connecté. -@item @code{remember-last-session?} (default #t) -Remember last session. +@item @code{remember-last-session?} (par défaut : #t) +S'il faut se rappeler la dernière session. -@item @code{hide-users} (default "") -Usernames to hide from SDDM greeter. +@item @code{hide-users} (par défaut : "") +Les noms d'utilisateurs à cacher sur l'écran d'accueil de SDDM. -@item @code{hide-shells} (default @code{#~(string-append #$shadow "/sbin/nologin")}) -Users with shells listed will be hidden from the SDDM greeter. +@item @code{hide-shells} (par défaut : @code{#~(string-append #$shadow "/sbin/nologin")}) +Les utilisateurs avec les shells listés seront cachés sur l'écran d'accueil +de SDDM. -@item @code{session-command} (default @code{#~(string-append #$sddm "/share/sddm/scripts/wayland-session")}) -Script to run before starting a wayland session. +@item @code{session-command} (par défaut : @code{#~(string-append #$sddm "/share/sddm/scripts/wayland-session")}) +Le script à lancer avant de démarrer une session wayland. -@item @code{sessions-directory} (default "/run/current-system/profile/share/wayland-sessions") -Directory to look for desktop files starting wayland sessions. +@item @code{sessions-directory} (par défaut : "/run/current-system/profile/share/wayland-sessions") +Le répertoire où trouver les fichiers .desktop qui démarrent des sessions +wayland. -@item @code{xorg-server-path} (default @code{xorg-start-command}) -Path to xorg-server. +@item @code{xorg-server-path} (par défaut : @code{xorg-start-command}) +Chemin vers xorg-server. -@item @code{xauth-path} (default @code{#~(string-append #$xauth "/bin/xauth")}) -Path to xauth. +@item @code{xauth-path} (par défaut : @code{#~(string-append #$xauth "/bin/xauth")}) +Chemin vers xauth. -@item @code{xephyr-path} (default @code{#~(string-append #$xorg-server "/bin/Xephyr")}) -Path to Xephyr. +@item @code{xephyr-path} (par défaut : @code{#~(string-append #$xorg-server "/bin/Xephyr")}) +Chemin vers Xephyr. -@item @code{xdisplay-start} (default @code{#~(string-append #$sddm "/share/sddm/scripts/Xsetup")}) -Script to run after starting xorg-server. +@item @code{xdisplay-start} (par défaut : @code{#~(string-append #$sddm "/share/sddm/scripts/Xsetup")}) +Le script à lancer après avoir démarré xorg-server. -@item @code{xdisplay-stop} (default @code{#~(string-append #$sddm "/share/sddm/scripts/Xstop")}) -Script to run before stopping xorg-server. +@item @code{xdisplay-stop} (par défaut : @code{#~(string-append #$sddm "/share/sddm/scripts/Xstop")}) +Le script à lancer avant d'arrêter xorg-server. @item @code{xsession-command} (par défaut : @code{xinitrc}) -Script to run before starting a X session. +Le script à lancer avant de démarrer une session X. -@item @code{xsessions-directory} (default: "/run/current-system/profile/share/xsessions") -Directory to look for desktop files starting X sessions. +@item @code{xsessions-directory} (par défaut : "/run/current-system/profile/share/xsessions") +Répertoire où trouver les fichiers .desktop pour les sessions X. -@item @code{minimum-vt} (default: 7) -Minimum VT to use. +@item @code{minimum-vt} (par défaut : 7) +VT minimal à utiliser. -@item @code{xserver-arguments} (default "-nolisten tcp") -Arguments to pass to xorg-server. +@item @code{xserver-arguments} (par défaut : "-nolisten tcp") +Arguments à passer à xorg-server. -@item @code{auto-login-user} (default "") -User to use for auto-login. +@item @code{auto-login-user} (par défaut : "") +Utilisateur à utiliser pour la connexion automatique. -@item @code{auto-login-session} (default "") -Desktop file to use for auto-login. +@item @code{auto-login-session} (par défaut : "") +Le fichier desktop à utiliser pour la connexion automatique. -@item @code{relogin?} (default #f) -Relogin after logout. +@item @code{relogin?} (par défaut : #f) +S'il faut se reconnecter après la déconnexion. @end table @end deftp -@cindex login manager -@cindex X11 login -@deffn {Scheme Procedure} sddm-service config -Return a service that spawns the SDDM graphical login manager for config of -type @code{}. +@cindex gestionnaire de connexion +@cindex connexion X11 +@deffn {Procédure Scheme} sddm-service config +Renvoie un service qui démarre le gestionnaire de connexion graphique SDDM +avec une configuration de type @code{}. @example (sddm-service (sddm-configuration @@ -12270,45 +12444,49 @@ type @code{}. @end example @end deffn -@deffn {Scheme Procedure} xorg-start-command [#:guile] @ - [#:modules %default-xorg-modules] @ [#:fonts %default-xorg-fonts] @ -[#:configuration-file (xorg-configuration-file @dots{})] @ [#:xorg-server -@var{xorg-server}] Return a @code{startx} script in which @var{modules}, a -list of X module packages, and @var{fonts}, a list of X font directories, -are available. See @code{xorg-wrapper} for more details on the arguments. -The result should be used in place of @code{startx}. - -Usually the X server is started by a login manager. +@deffn {Procédure Scheme} xorg-start-command [#:guile] @ + [#:modules %default-xorg-modules] @ +[#:fonts %default-xorg-fonts] @ +[#:configuration-file (xorg-configuration-file @dots{})] @ +[#:xorg-server @var{xorg-server}] +Renvoie un script @code{startx} dans lequel @var{modules}, une liste de +paquets de modules X et @var{fonts}, une liste de répertoires de polices X, +sont disponibles. Voir @code{xorg-wrapper} pour plus de détails sur les +arguments. Le résultat devrait être utilisé à la place de @code{startx}. + +Habituellement le serveur X est démarré par un gestionnaire de connexion. @end deffn -@deffn {Scheme Procedure} xorg-configuration-file @ - [#:modules %default-xorg-modules] @ [#:fonts %default-xorg-fonts] @ -[#:drivers '()] [#:resolutions '()] [#:extra-config '()] Return a -configuration file for the Xorg server containing search paths for all the -common drivers. - -@var{modules} must be a list of @dfn{module packages} loaded by the Xorg -server---e.g., @code{xf86-video-vesa}, @code{xf86-input-keyboard}, and so -on. @var{fonts} must be a list of font directories to add to the server's -@dfn{font path}. - -@var{drivers} 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")}. - -Likewise, when @var{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))}. - -Last, @var{extra-config} 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. - -@cindex keymap -@cindex keyboard layout -This procedure is especially useful to configure a different keyboard layout -than the default US keymap. For instance, to use the ``bépo'' keymap by -default on the display manager: +@deffn {Procédure Scheme} xorg-configuration-file @ + [#:modules %default-xorg-modules] @ +[#:fonts %default-xorg-fonts] @ +[#:drivers '()] [#:resolutions '()] [#:extra-config '()] +Renvoie un fichier de configuration pour le serveur Xorg qui contient des +chemins de recherche pour tous les pilotes communs. + +@var{modules} doit être une liste de @dfn{paquets de modules} chargés par le +serveur Xorg — p.@: ex.@: @code{xf86-video-vesa}, @code{xf86-input-keyboard} +etc. @var{fonts} doit être une liste de répertoires de polices à ajouter au +@dfn{chemin de polices} du serveur. + +@var{drivers} doit être soit la liste vide, auquel cas Xorg choisis un +pilote graphique automatiquement, soit une liste de noms de pilotes qui +seront essayés dans cet ordre — p.@: ex.@: @code{("modesetting" "vesa")}. + +De même, lorsque @var{resolutions} est la liste vide, Xorg choisis une +résolution d'écran appropriée ; autrement, ce doit être une liste de +résolutions — p.@: ex.@: @code{((1024 768) (640 480))}. + +Enfin, @var{extra-config} est une liste de chaînes de caractères ou d'objets +ajoutés au fichier de configuration. Elle est utilisée pour passer du texte +supplémentaire à être ajouté directement au fichier de configuration. + +@cindex disposition clavier +@cindex disposition du clavier +Cette procédure est particulièrement utile pour configurer une disposition +de clavier différente de la disposition US par défaut. Par exemple, pour +utiliser la disposition « bépo » par défaut sur le gestionnaire d'affichage +: @example (define bepo-evdev @@ -12334,51 +12512,56 @@ EndSection") (list bepo-evdev))))))))) @end example -The @code{MatchIsKeyboard} line specifies that we only apply the -configuration to keyboards. Without this line, other devices such as -touchpad may not work correctly because they will be attached to the wrong -driver. In this example, the user typically used @code{setxkbmap fr bepo} -to set their favorite keymap once logged in. The first argument corresponds -to the layout, while the second argument corresponds to the variant. The -@code{xkb_variant} line can be omitted to select the default variant. +La ligne @code{MatchIsKeyboard} spécifie que nous n'appliquons la +configuration qu'aux claviers. Sans cette ligne, d'autres périphériques +comme les pavés tactiles ne fonctionneront pas correctement parce qu'ils +seront associés au mauvais pilote. Dans cet exemple, l'utilisateur +utiliserait typiquement @code{setxkbmap fr bepo} pour utiliser sa +disposition de clavier préférée une fois connecté. Le premier argument +correspond à la disposition, tandis que le second argument correspond à la +variante. La ligne @code{xkb_variant} peut être omise pour choisir la +variante par défaut. @end deffn -@deffn {Scheme Procedure} screen-locker-service @var{package} [@var{program}] -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: +@deffn {Procédure Scheme} screen-locker-service @var{package} [@var{program}] +Ajoute @var{package}, un paquet pour un verrouiller l'écran ou un +économiseur d'écran dont la commande est @var{program}, à l'ensemble des +programmes setuid et lui ajoute une entrée PAM. Par exemple : @lisp (screen-locker-service xlockmore "xlock") @end lisp -makes the good ol' XlockMore usable. +rend utilisable le bon vieux XlockMore. @end deffn @node Services d'impression @subsubsection Services d'impression -@cindex printer support with CUPS -The @code{(gnu services cups)} module provides a Guix service definition for -the CUPS printing service. To add printer support to a GuixSD system, add a -@code{cups-service} to the operating system definition: +@cindex support des imprimantes avec CUPS +Le module @code{(gnu services cups)} fournit une définition de service Guix +pour le service d'impression CUPS. Pour ajouter le support d'une imprimante +à un système GuixSD, ajoutez un @code{cups-service} à la définition du +système d'exploitation : -@deffn {Scheme Variable} cups-service-type -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: +@deffn {Variable Scheme} cups-service-type +Le type de service pour un serveur d'impression CUPS. Sa valeur devrait +être une configuration CUPS valide (voir plus bas). Pour utiliser les +paramètres par défaut, écrivez simplement : @example (service cups-service-type) @end example @end deffn -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. +La configuration de CUPS contrôle les paramètres de base de votre +installation CUPS : sur quelles interfaces il doit écouter, que faire si un +travail échoue, combien de journalisation il faut faire, etc. Pour ajouter +une imprimante, vous devrez visiter l'URL @url{http://localhost:631} ou +utiliser un outil comme les services de configuration d'imprimante de +GNOME. Par défaut, la configuration du service CUPS générera un certificat +auto-signé si besoin, pour les connexions sécurisée avec le serveur +d'impression. 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 @@ -12397,12 +12580,13 @@ 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. -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. +Les paramètres de configuration disponibles sont les suivants. Chaque +définition des paramètres est précédé par son type ; par exemple, +@samp{string-list foo} indique que le paramètre @code{foo} devrait être +spécifié comme une liste de chaînes de caractères. Il y a aussi une manière +de spécifier la configuration comme une chaîne de caractères, si vous avez +un vieux fichier @code{cupsd.conf} que vous voulez porter depuis un autre +système ; voir la fin pour plus de détails. @c The following documentation was initially generated by @c (generate-documentation) in (gnu services cups). Manually maintained @@ -12413,770 +12597,809 @@ see the end for more details. @c the churn as CUPS updates. -Available @code{cups-configuration} fields are: +Les champs de @code{cups-configuration} disponibles sont : -@deftypevr {@code{cups-configuration} parameter} package cups -The CUPS package. +@deftypevr {paramètre de @code{cups-configuration}} package cups +Le paquet CUPS. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} package-list extensions -Drivers and other extensions to the CUPS package. +@deftypevr {paramètre de @code{cups-configuration}} package-list extensions +Pilotes et autres extensions du paquet CUPS. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} files-configuration files-configuration -Configuration of where to write logs, what directories to use for print -spools, and related privileged configuration parameters. +@deftypevr {paramètre de @code{cups-configuration}} files-configuration files-configuration +Configuration de l'emplacement où écrire les journaux, quels répertoires +utiliser pour les travaux d'impression et les paramètres de configuration +privilégiés liés. -Available @code{files-configuration} fields are: +Les champs @code{files-configuration} disponibles sont : -@deftypevr {@code{files-configuration} parameter} log-location access-log -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}. +@deftypevr {paramètre de @code{files-configuration}} log-location access-log +Définit le fichier de journal d'accès. Spécifier un nom de fichier vide +désactive la génération de journaux d'accès. La valeur @code{stderr} fait +que les entrées du journal seront envoyés sur l'erreur standard lorsque +l'ordonnanceur est lancé au premier plan ou vers le démon de journal système +lorsqu'il tourne en tache de fond. La valeur @code{syslog} fait que les +entrées du journal sont envoyées au démon de journalisation du système. Le +nom du serveur peut être inclus dans les noms de fichiers avec la chaîne +@code{%s}, comme dans @code{/var/log/cups/%s-access_log}. -Defaults to @samp{"/var/log/cups/access_log"}. +La valeur par défaut est @samp{"/var/log/cups/access_log"}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} file-name cache-dir -Where CUPS should cache data. +@deftypevr {paramètre de @code{files-configuration}} file-name cache-dir +L'emplacement où CUPS devrait mettre les données en cache. -Defaults to @samp{"/var/cache/cups"}. +La valeur par défaut est @samp{"/var/cache/cups"}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} string config-file-perm -Specifies the permissions for all configuration files that the scheduler -writes. +@deftypevr {paramètre de @code{files-configuration}} string config-file-perm +Spécifie les permissions pour tous les fichiers de configuration que +l'ordonnanceur écrit. -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. +Remarquez que les permissions pour le fichier printers.conf sont +actuellement masqués pour ne permettre que l'accès par l'utilisateur de +l'ordonnanceur (typiquement root). La raison est que les URI des +imprimantes contiennent des informations d'authentification sensibles qui ne +devraient pas être connues sur le système. Il n'est pas possible de +désactiver cette fonctionnalité de sécurité. -Defaults to @samp{"0640"}. +La valeur par défaut est @samp{"0640"}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} log-location error-log -Defines the error 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-error_log}. +@deftypevr {paramètre de @code{files-configuration}} log-location error-log +Définit le fichier de journal d'erreur. Spécifier un nom de fichier vide +désactive la génération de journaux d'erreur. La valeur @code{stderr} fait +que les entrées du journal seront envoyés sur l'erreur standard lorsque +l'ordonnanceur est lancé au premier plan ou vers le démon de journal système +lorsqu'il tourne en tache de fond. La valeur @code{syslog} fait que les +entrées du journal sont envoyées au démon de journalisation du système. Le +nom du serveur peut être inclus dans les noms de fichiers avec la chaîne +@code{%s}, comme dans @code{/var/log/cups/%s-error_log}. -Defaults to @samp{"/var/log/cups/error_log"}. +La valeur par défaut est @samp{"/var/log/cups/error_log"}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} string fatal-errors -Specifies which errors are fatal, causing the scheduler to exit. The kind -strings are: +@deftypevr {paramètre de @code{files-configuration}} string fatal-errors +Spécifie quelles erreurs sont fatales, qui font terminer l'ordonnanceur. +Les types de chaînes sont : @table @code @item none -No errors are fatal. +Aucune erreur n'est fatale. @item all -All of the errors below are fatal. +Toutes les erreurs ci-dessous sont fatales. @item browse -Browsing initialization errors are fatal, for example failed connections to -the DNS-SD daemon. +Les erreurs d'initialisation de la navigation sont fatales, par exemple les +connexion échouées au démon DNS-SD. @item config -Configuration file syntax errors are fatal. +Les erreurs de syntaxe du fichier de configuration sont fatale. @item listen -Listen or Port errors are fatal, except for IPv6 failures on the loopback or -@code{any} addresses. +Les erreurs d'écoute ou de port sont fatales, sauf pour les erreurs d'IPv6 +sur la boucle locale ou les adresses @code{any}. @item log -Log file creation or write errors are fatal. +Les erreurs de création ou d'écriture des fichiers de journal sont fatales. @item permissions -Bad startup file permissions are fatal, for example shared TLS certificate -and key files with world-read permissions. +Les mauvaises permissions des fichiers de démarrage sont fatales, par +exemple un certificat TLS et des fichiers de clefs avec des permissions +permettant la lecture à tout le monde. @end table -Defaults to @samp{"all -browse"}. +La valeur par défaut est @samp{"all -browse"}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} boolean file-device? -Specifies whether the file pseudo-device can be used for new printer -queues. The URI @uref{file:///dev/null} is always allowed. +@deftypevr {paramètre de @code{files-configuration}} boolean file-device? +Spécifie si le fichier de pseudo-périphérique peut être utilisé pour de +nouvelles queues d'impression. L'URI @uref{file:///dev/null} est toujours +permise. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} string group -Specifies the group name or ID that will be used when executing external -programs. +@deftypevr {paramètre de @code{files-configuration}} string group +Spécifie le nom ou l'ID du groupe qui sera utilisé lors de l'exécution de +programmes externes. -Defaults to @samp{"lp"}. +La valeur par défaut est @samp{"lp"}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} string log-file-perm -Specifies the permissions for all log files that the scheduler writes. +@deftypevr {paramètre de @code{files-configuration}} string log-file-perm +Spécifie les permissions pour tous les fichiers de journal que +l'ordonnanceur écrit. -Defaults to @samp{"0644"}. +La valeur par défaut est @samp{"0644"}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} log-location page-log -Defines the page 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-page_log}. +@deftypevr {paramètre de @code{files-configuration}} log-location page-log +Définit le fichier de journal de page. Spécifier un nom de fichier vide +désactive la génération de journaux de pages. La valeur @code{stderr} fait +que les entrées du journal seront envoyés sur l'erreur standard lorsque +l'ordonnanceur est lancé au premier plan ou vers le démon de journal système +lorsqu'il tourne en tache de fond. La valeur @code{syslog} fait que les +entrées du journal sont envoyées au démon de journalisation du système. Le +nom du serveur peut être inclus dans les noms de fichiers avec la chaîne +@code{%s}, comme dans @code{/var/log/cups/%s-page_log}. -Defaults to @samp{"/var/log/cups/page_log"}. +La valeur par défaut est @samp{"/var/log/cups/page_log"}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} string remote-root -Specifies the username that is associated with unauthenticated accesses by -clients claiming to be the root user. The default is @code{remroot}. +@deftypevr {paramètre de @code{files-configuration}} string remote-root +Spécifie le nom d'utilisateur associé aux accès non authentifiés par des +clients qui se disent être l'utilisateur root. La valeur par défaut est +@code{remroot}. -Defaults to @samp{"remroot"}. +La valeur par défaut est @samp{"remroot"}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} file-name request-root -Specifies the directory that contains print jobs and other HTTP request -data. +@deftypevr {paramètre de @code{files-configuration}} file-name request-root +Spécifie le répertoire qui contient les travaux d'impression et d'autres +données des requêtes HTTP. -Defaults to @samp{"/var/spool/cups"}. +La valeur par défaut est @samp{"/var/spool/cups"}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} sandboxing sandboxing -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. +@deftypevr {paramètre de @code{files-configuration}} sandboxing sandboxing +Spécifie le niveau d'isolation de sécurité appliqué aux filtres +d'impression, aux moteurs et aux autres processus fils de l'ordonnanceur ; +soit @code{relaxed} soit @code{strict}. Cette directive n'est actuellement +utilisée et supportée que sur macOS. -Defaults to @samp{strict}. +La valeur par défaut est @samp{strict}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} file-name server-keychain -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. +@deftypevr {paramètre de @code{files-configuration}} file-name server-keychain +Spécifie l'emplacement des certifications TLS et des clefs privées. CUPS +cherchera les clefs publiques et privées dans ce répertoire : un fichier +@code{.crt} pour un certificat encodé en PEM et le fichier @code{.key} +correspondant pour la clef privée encodée en PEM. -Defaults to @samp{"/etc/cups/ssl"}. +La valeur par défaut est @samp{"/etc/cups/ssl"}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} file-name server-root -Specifies the directory containing the server configuration files. +@deftypevr {paramètre de @code{files-configuration}} file-name server-root +Spécifie le répertoire contenant les fichiers de configuration du serveur. -Defaults to @samp{"/etc/cups"}. +La valeur par défaut est @samp{"/etc/cups"}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} boolean sync-on-close? -Specifies whether the scheduler calls fsync(2) after writing configuration -or state files. +@deftypevr {paramètre de @code{files-configuration}} boolean sync-on-close? +Spécifie si l'ordonnanceur appelle fsync(2) après avoir écrit la +configuration ou les fichiers d'état. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} space-separated-string-list system-group -Specifies the group(s) to use for @code{@@SYSTEM} group authentication. +@deftypevr {paramètre de @code{files-configuration}} space-separated-string-list system-group +Spécifie le groupe ou les groupes à utiliser pour l'authentification du +groupe @code{@@SYSTEM}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} file-name temp-dir -Specifies the directory where temporary files are stored. +@deftypevr {paramètre de @code{files-configuration}} file-name temp-dir +Spécifie le répertoire où les fichiers temporaires sont stockés. -Defaults to @samp{"/var/spool/cups/tmp"}. +La valeur par défaut est @samp{"/var/spool/cups/tmp"}. @end deftypevr -@deftypevr {@code{files-configuration} parameter} string user -Specifies the user name or ID that is used when running external programs. +@deftypevr {paramètre de @code{files-configuration}} string user +Spécifie le nom d'utilisateur ou l'ID utilisé pour lancer des programmes +externes. -Defaults to @samp{"lp"}. +La valeur par défaut est @samp{"lp"}. @end deftypevr @end deftypevr -@deftypevr {@code{cups-configuration} parameter} access-log-level access-log-level -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. +@deftypevr {paramètre de @code{cups-configuration}} access-log-level access-log-level +Spécifie le niveau de journalisation pour le fichier AccessLog. Le niveau +@code{config} enregistre les ajouts, suppressions et modifications +d'imprimantes et de classes et lorsque les fichiers de configuration sont +accédés ou mis à jour. Le niveau @code{actions} enregistre la soumission, +la suspension, la libération, la modification et l'annulation des travaux et +toutes les conditions de @code{config}. Le niveau @code{all} enregistre +toutes les requêtes. -Defaults to @samp{actions}. +La valeur par défaut est @samp{actions}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} boolean auto-purge-jobs? -Specifies whether to purge job history data automatically when it is no -longer required for quotas. +@deftypevr {paramètre de @code{cups-configuration}} boolean auto-purge-jobs? +Spécifie s'il faut vider l'historique des travaux automatiquement lorsqu'il +n'est plus nécessaire pour les quotas. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} browse-local-protocols browse-local-protocols -Specifies which protocols to use for local printer sharing. +@deftypevr {paramètre de @code{cups-configuration}} browse-local-protocols browse-local-protocols +Spécifie les protocoles à utiliser pour partager les imprimantes sur le +réseau local. -Defaults to @samp{dnssd}. +La valeur par défaut est @samp{dnssd}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} boolean browse-web-if? -Specifies whether the CUPS web interface is advertised. +@deftypevr {paramètre de @code{cups-configuration}} boolean browse-web-if? +Spécifie si l'interface web de CUPS est publiée. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} boolean browsing? -Specifies whether shared printers are advertised. +@deftypevr {paramètre de @code{cups-configuration}} boolean browsing? +Spécifie si les imprimantes partagées sont publiées. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} string classification -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. +@deftypevr {paramètre de @code{cups-configuration}} string classification +Spécifie la classification de sécurité du serveur. N'importe quel nom de +bannière peut être utilisé, comme « classifié », « confidentiel », « secret +», « top secret » et « déclassifié » ou la bannière peut être omise pour +désactiver les fonctions d'impression sécurisées. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} boolean classify-override? -Specifies whether users may override the classification (cover page) of -individual print jobs using the @code{job-sheets} option. +@deftypevr {paramètre de @code{cups-configuration}} boolean classify-override? +Spécifie si les utilisateurs peuvent remplacer la classification (page de +couverture) des travaux d'impression individuels avec l'option +@code{job-sheets}. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} default-auth-type default-auth-type -Specifies the default type of authentication to use. +@deftypevr {paramètre de @code{cups-configuration}} default-auth-type default-auth-type +Spécifie le type d'authentification par défaut à utiliser. -Defaults to @samp{Basic}. +La valeur par défaut est @samp{Basic}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} default-encryption default-encryption -Specifies whether encryption will be used for authenticated requests. +@deftypevr {paramètre de @code{cups-configuration}} default-encryption default-encryption +Spécifie si le chiffrement sera utilisé pour les requêtes authentifiées. -Defaults to @samp{Required}. +La valeur par défaut est @samp{Required}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} string default-language -Specifies the default language to use for text and web content. +@deftypevr {paramètre de @code{cups-configuration}} string default-language +Spécifie la langue par défaut à utiliser pour le contenu textuel et web. -Defaults to @samp{"en"}. +La valeur par défaut est @samp{"en"}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} string default-paper-size -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"}. +@deftypevr {paramètre de @code{cups-configuration}} string default-paper-size +Spécifie la taille de papier par défaut pour les nouvelles queues +d'impression. @samp{"Auto"} utilise la valeur par défaut du paramètre de +régionalisation, tandis que @samp{"None"} spécifie qu'il n'y a pas de taille +par défaut. Des noms de tailles spécifique sont par exemple @samp{"Letter"} +et @samp{"A4"}. -Defaults to @samp{"Auto"}. +La valeur par défaut est @samp{"Auto"}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} string default-policy -Specifies the default access policy to use. +@deftypevr {paramètre de @code{cups-configuration}} string default-policy +Spécifie la politique d'accès par défaut à utiliser. -Defaults to @samp{"default"}. +La valeur par défaut est @samp{"default"}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} boolean default-shared? -Specifies whether local printers are shared by default. +@deftypevr {paramètre de @code{cups-configuration}} boolean default-shared? +Spécifie si les imprimantes locales sont partagées par défaut. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer dirty-clean-interval -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. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer dirty-clean-interval +Spécifie le délai pour mettre à jour les fichiers de configuration et +d'état. Une valeur de 0 fait que la mise à jour arrive aussi vite que +possible, typiquement en quelques millisecondes. -Defaults to @samp{30}. +La valeur par défaut est @samp{30}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} error-policy error-policy -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-this-job}, which -retries the failed job immediately; and @code{stop-printer}, which stops the -printer. +@deftypevr {paramètre de @code{cups-configuration}} error-policy error-policy +Spécifie ce qu'il faut faire si une erreur a lieu. Les valeurs possibles +sont @code{abort-job}, qui supprimera les travaux d'impression en échec ; +@code{retry-job}, qui tentera de nouveau l'impression plus tard ; +@code{retry-this-job}, qui retentera l'impression immédiatement ; et +@code{stop-printer} qui arrête l'imprimante. -Defaults to @samp{stop-printer}. +La valeur par défaut est @samp{stop-printer}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer filter-limit -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. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer filter-limit +Spécifie le coût maximum des filtres qui sont lancés en même temps, pour +minimiser les problèmes de ressources de disque, de mémoire et de CPU. Une +limite de 0 désactive la limite de filtrage. Une impression standard vers +une imprimante non-PostScript requirt une limite de filtre d'environ 200. +Une imprimante PostScript requiert environ la moitié (100). Mettre en place +la limite en dessous de ces valeurs limitera l'ordonnanceur à un seul +travail d'impression à la fois. -Defaults to @samp{0}. +La valeur par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer filter-nice -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. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer filter-nice +Spécifie la priorité des filtres de l'ordonnanceur qui sont lancés pour +imprimer un travail. La valeur va de 0, la plus grande priorité, à 19, la +plus basse priorité. -Defaults to @samp{0}. +La valeur par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} host-name-lookups host-name-lookups -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. +@deftypevr {paramètre de @code{cups-configuration}} host-name-lookups host-name-lookups +Spécifie s'il faut faire des résolutions inverses sur les clients qui se +connectent. Le paramètre @code{double} fait que @code{cupsd} vérifie que le +nom d'hôte résolu depuis l'adresse correspond à l'une des adresses renvoyées +par ce nom d'hôte. Les résolutions doubles évitent aussi que des clients +avec des adresses non enregistrées ne s'adressent à votre serveur. +N'initialisez cette valeur qu'à @code{#t} ou @code{double} que si c'est +absolument nécessaire. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer job-kill-delay -Specifies the number of seconds to wait before killing the filters and -backend associated with a canceled or held job. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer job-kill-delay +Spécifie le nombre de secondes à attendre avant de tuer les filtres et les +moteurs associés avec un travail annulé ou suspendu. -Defaults to @samp{30}. +La valeur par défaut est @samp{30}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer job-retry-interval -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}. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer job-retry-interval +Spécifie l'intervalle des nouvelles tentatives en secondes. C'est +typiquement utilisé pour les queues de fax mais peut aussi être utilisé avec +des queues d'impressions normales dont la politique d'erreur est +@code{retry-job} ou @code{retry-current-job}. -Defaults to @samp{30}. +La valeur par défaut est @samp{30}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer job-retry-limit -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}. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer job-retry-limit +Spécifie le nombre de nouvelles tentatives pour les travaux. C'est +typiquement utilisé pour les queues de fax mais peut aussi être utilisé pour +les queues d'impressions dont la politique d'erreur est @code{retry-job} ou +@code{retry-current-job}. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} boolean keep-alive? -Specifies whether to support HTTP keep-alive connections. +@deftypevr {paramètre de @code{cups-configuration}} boolean keep-alive? +Spécifie s'il faut supporter les connexion HTTP keep-alive. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer keep-alive-timeout -Specifies how long an idle client connection remains open, in seconds. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer keep-alive-timeout +Spécifie combien de temps les connexions inactives avec les clients restent +ouvertes, en secondes. -Defaults to @samp{30}. +La valeur par défaut est @samp{30}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer limit-request-body -Specifies the maximum size of print files, IPP requests, and HTML form -data. A limit of 0 disables the limit check. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer limit-request-body +Spécifie la taille maximale des fichiers à imprimer, des requêtes IPP et des +données de formulaires HTML. Une limite de 0 désactive la vérification de +la limite. -Defaults to @samp{0}. +La valeur par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} multiline-string-list listen -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. +@deftypevr {paramètre de @code{cups-configuration}} multiline-string-list listen +Écoute sur les interfaces spécifiées. Les valeurs valides sont de la forme +@var{adresse}:@var{port}, où @var{adresse} est sotit une daresse IPv6 dans +des crochets, soit une adresse IPv4, soit @code{*} pour indiquer toutes les +adresses. Les valeurs peuvent aussi être des noms de fichiers de socket +UNIX domain. La directive Listen est similaire à la directive Port mais +vous permet de restreindre l'accès à des interfaces ou des réseaux +spécifiques. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer listen-back-log -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. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer listen-back-log +Spécifie le nombre de connexions en attente qui seront permises. Ça +n'affecte normalement que les serveurs très actifs qui ont atteint la limite +MaxClients, mais peut aussi être déclenché par un grand nombre de connexions +simultanées. Lorsque la limite est atteinte, le système d'exploitation +refusera les connexions supplémentaires jusqu'à ce que l'ordonnanceur +accepte les connexions en attente. -Defaults to @samp{128}. +La valeur par défaut est @samp{128}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} location-access-control-list location-access-controls -Specifies a set of additional access controls. +@deftypevr {paramètre de @code{cups-configuration}} location-access-control-list location-access-controls +Spécifie un ensemble de contrôles d'accès supplémentaires. -Available @code{location-access-controls} fields are: +Les champs de @code{location-access-controls} disponibles sont : -@deftypevr {@code{location-access-controls} parameter} file-name path -Specifies the URI path to which the access control applies. +@deftypevr {paramètre de @code{location-access-controls}} file-name path +Spécifie le chemin d'URI auquel les contrôles d'accès s'appliquent. @end deftypevr -@deftypevr {@code{location-access-controls} parameter} access-control-list access-controls -Access controls for all access to this path, in the same format as the -@code{access-controls} of @code{operation-access-control}. +@deftypevr {paramètre de @code{location-access-controls}} access-control-list access-controls +Les contrôles d'accès pour tous les accès à ce chemin, dans le même format +que le champ @code{access-controls} de @code{operation-access-control}. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{location-access-controls} parameter} method-access-control-list method-access-controls -Access controls for method-specific access to this path. +@deftypevr {paramètre de @code{location-access-controls}} method-access-control-list method-access-controls +Contrôles d'accès pour les accès spécifiques à la méthode à ce chemin. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. -Available @code{method-access-controls} fields are: +Les champs de @code{method-access-controls} disponibles sont : -@deftypevr {@code{method-access-controls} parameter} boolean reverse? -If @code{#t}, apply access controls to all methods except the listed -methods. Otherwise apply to only the listed methods. +@deftypevr {paramètre de @code{method-access-controls}} boolean reverse? +Si la valeur est @code{#t}, applique les contrôles d'accès à toutes les +méthodes sauf les méthodes listées. Sinon, applique le contrôle uniquement +aux méthodes listées. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{method-access-controls} parameter} method-list methods -Methods to which this access control applies. +@deftypevr {paramètre de @code{method-access-controls}} method-list methods +Les méthodes auxquelles ce contrôle d'accès s'applique. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{method-access-controls} parameter} access-control-list access-controls -Access control directives, as a list of strings. Each string should be one -directive, such as "Order allow,deny". +@deftypevr {paramètre de @code{method-access-controls}} access-control-list access-controls +Directives de contrôle d'accès, comme une liste de chaînes de caractères. +Chaque chaîne devrait être une directive, comme « Order allow, deny ». -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr @end deftypevr @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer log-debug-history -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. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer log-debug-history +Spécifie le nombre de messages de débogage qui sont retenu pour la +journalisation si une erreur arrive dans un travail d'impression. Les +messages de débogage sont journalisés indépendamment du paramètre LogLevel. -Defaults to @samp{100}. +La valeur par défaut est @samp{100}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} log-level log-level -Specifies the level of logging for the ErrorLog file. The value @code{none} -stops all logging while @code{debug2} logs everything. +@deftypevr {paramètre de @code{cups-configuration}} log-level log-level +Spécifie le niveau de journalisation du fichier ErrorLog. La valeur +@code{none} arrête toute journalisation alors que que @code{debug2} +enregistre tout. -Defaults to @samp{info}. +La valeur par défaut est @samp{info}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} log-time-format log-time-format -Specifies the format of the date and time in the log files. The value -@code{standard} logs whole seconds while @code{usecs} logs microseconds. +@deftypevr {paramètre de @code{cups-configuration}} log-time-format log-time-format +Spécifie le format de la date et de l'heure dans les fichiers de journaux. +La valeur @code{standard} enregistre les secondes entières alors que +@code{usecs} enregistre les microsecondes. -Defaults to @samp{standard}. +La valeur par défaut est @samp{standard}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer max-clients -Specifies the maximum number of simultaneous clients that are allowed by the -scheduler. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer max-clients +Spécifie le nombre maximum de clients simultanés qui sont autorisés par +l'ordonnanceur. -Defaults to @samp{100}. +La valeur par défaut est @samp{100}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer max-clients-per-host -Specifies the maximum number of simultaneous clients that are allowed from a -single address. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer max-clients-per-host +Spécifie le nombre maximum de clients simultanés permis depuis une même +adresse. -Defaults to @samp{100}. +La valeur par défaut est @samp{100}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer max-copies -Specifies the maximum number of copies that a user can print of each job. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer max-copies +Spécifie le nombre maximum de copies qu'un utilisateur peut imprimer pour +chaque travail. -Defaults to @samp{9999}. +La valeur par défaut est @samp{9999}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer max-hold-time -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. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer max-hold-time +Spécifie la durée maximum qu'un travail peut rester dans l'état de +suspension @code{indefinite} avant qu'il ne soit annulé. La valeur 0 +désactive l'annulation des travaux suspendus. -Defaults to @samp{0}. +La valeur par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer max-jobs -Specifies the maximum number of simultaneous jobs that are allowed. Set to -0 to allow an unlimited number of jobs. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer max-jobs +Spécifie le nombre maximum de travaux simultanés autorisés. La valeur 0 +permet un nombre illimité de travaux. -Defaults to @samp{500}. +La valeur par défaut est @samp{500}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer max-jobs-per-printer -Specifies the maximum number of simultaneous jobs that are allowed per -printer. A value of 0 allows up to MaxJobs jobs per printer. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer max-jobs-per-printer +Spécifie le nombre maximum de travaux simultanés autorisés par imprimante. +La valeur 0 permet au plus MaxJobs travaux par imprimante. -Defaults to @samp{0}. +La valeur par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer max-jobs-per-user -Specifies the maximum number of simultaneous jobs that are allowed per -user. A value of 0 allows up to MaxJobs jobs per user. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer max-jobs-per-user +Spécifie le nombre maximum de travaux simultanés permis par utilisateur. La +valeur 0 permet au plus MaxJobs travaux par utilisateur. -Defaults to @samp{0}. +La valeur par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer max-job-time -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. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer max-job-time +Spécifie la durée maximum qu'un travail peut prendre avant qu'il ne soit +annulé, en secondes. Indiquez 0 pour désactiver l'annulation des travaux « +coincés ». -Defaults to @samp{10800}. +La valeur par défaut est @samp{10800}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer max-log-size -Specifies the maximum size of the log files before they are rotated, in -bytes. The value 0 disables log rotation. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer max-log-size +Spécifie la taille maximale des fichiers de journaux avant qu'on ne les +fasse tourner, en octets. La valeur 0 désactive la rotation. -Defaults to @samp{1048576}. +La valeur par défaut est @samp{1048576}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer multiple-operation-timeout -Specifies the maximum amount of time to allow between files in a multiple -file print job, in seconds. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer multiple-operation-timeout +Spécifie la durée maximale à permettre entre les fichiers d'un travail en +contenant plusieurs, en secondes. -Defaults to @samp{300}. +La valeur par défaut est @samp{300}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} string page-log-format -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: +@deftypevr {paramètre de @code{cups-configuration}} string page-log-format +Spécifie le format des lignes PageLog. Les séquences qui commencent par un +pourcent (@samp{%}) sont remplacées par l'information correspondante, tandis +que les autres caractères sont copiés littéralement. Les séquences pourcent +suivantes sont reconnues : @table @samp @item %% -insert a single percent character +insère un seul caractères pourcent @item %@{name@} -insert the value of the specified IPP attribute +insère la valeur de l'attribut IPP spécifié @item %C -insert the number of copies for the current page +insère le nombre de copies pour la page actuelle @item %P -insert the current page number +insère le numéro de page actuelle @item %T -insert the current date and time in common log format +insère la date et l'heure actuelle dans un format de journal commun @item %j -insert the job ID +insère l'ID du travail @item %p -insert the printer name +insère le nom de l'imprimante @item %u -insert the username +insère le nom d'utilisateur @end table -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. +Si la valeur est la chaîne vide, le PageLog est désactivée. La chaîne +@code{%p %u %j %T %P %C %@{job-billing@} %@{job-originating-host-name@} +%@{job-name@} %@{media@} %@{sides@}} crée un PageLog avec les entrées +standards. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} environment-variables environment-variables -Passes the specified environment variable(s) to child processes; a list of -strings. +@deftypevr {paramètre de @code{cups-configuration}} environment-variables environment-variables +Passe les variables d'environnement spécifiées aux processus fils ; une +liste de chaînes de caractères. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} policy-configuration-list policies -Specifies named access control policies. +@deftypevr {paramètre de @code{cups-configuration}} policy-configuration-list policies +Spécifie des politiques de contrôle d'accès nommées. -Available @code{policy-configuration} fields are: +Les champs de @code{policy-configuration} disponibles sont : -@deftypevr {@code{policy-configuration} parameter} string name -Name of the policy. +@deftypevr {paramètre de @code{policy-configuration}} string name +Nom de la politique. @end deftypevr -@deftypevr {@code{policy-configuration} parameter} string job-private-access -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}. +@deftypevr {paramètre de @code{policy-configuration}} string job-private-access +Spécifie une liste d'accès pour les valeurs privées du travail. +@code{@@ACL} correspond aux valeurs requesting-user-name-allowed ou +requesting-user-name-denied de l'imprimante. @code{@@OWNER} correspond au +propriétaire du travail. @code{@@SYSTEM} correspond aux groupes listés dans +le champ @code{system-group} de la configuration @code{files-config}, qui +est réifié dans le fichier @code{cups-files.conf(5)}. Les autres éléments +possibles de la liste d'accès sont des noms d'utilisateurs spécifiques et +@code{@@@var{group}} pour indiquer les membres d'un groupe spécifique. La +liste d'accès peut aussi être simplement @code{all} ou @code{default}. -Defaults to @samp{"@@OWNER @@SYSTEM"}. +La valeur par défaut est @samp{"@@OWNER @@SYSTEM"}. @end deftypevr -@deftypevr {@code{policy-configuration} parameter} string job-private-values -Specifies the list of job values to make private, or @code{all}, -@code{default}, or @code{none}. +@deftypevr {paramètre de @code{policy-configuration}} string job-private-values +Spécifie la liste des valeurs de travaux à rendre privée, ou @code{all}, +@code{default}, ou @code{none}. -Defaults to @samp{"job-name job-originating-host-name +La valeur par défaut est @samp{"job-name job-originating-host-name job-originating-user-name phone"}. @end deftypevr -@deftypevr {@code{policy-configuration} parameter} string subscription-private-access -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}. +@deftypevr {paramètre de @code{policy-configuration}} string subscription-private-access +Spécifie un liste d'accès pour les valeurs privées de la souscription. +@code{@@ACL} correspond aux valeurs requesting-user-name-allowed ou +requesting-user-name-denied de l'imprimante. @code{@@OWNER} correspond au +propriétaire du travail. @code{@@SYSTEM} correspond aux groupes listés dans +le champ @code{system-group} de la configuration @code{files-config}, qui +est réifié dans le fichier @code{cups-files.conf(5)}. Les autres éléments +possibles de la liste d'accès sont des noms d'utilisateurs spécifiques et +@code{@@@var{group}} pour indiquer les membres d'un groupe spécifique. La +liste d'accès peut aussi être simplement @code{all} ou @code{default}. -Defaults to @samp{"@@OWNER @@SYSTEM"}. +La valeur par défaut est @samp{"@@OWNER @@SYSTEM"}. @end deftypevr -@deftypevr {@code{policy-configuration} parameter} string subscription-private-values -Specifies the list of job values to make private, or @code{all}, -@code{default}, or @code{none}. +@deftypevr {paramètre de @code{policy-configuration}} string subscription-private-values +Spécifie la liste des valeurs de travaux à rendre privée, ou @code{all}, +@code{default}, ou @code{none}. -Defaults to @samp{"notify-events notify-pull-method notify-recipient-uri -notify-subscriber-user-name notify-user-data"}. +La valeur par défaut est @samp{"notify-events notify-pull-method +notify-recipient-uri notify-subscriber-user-name notify-user-data"}. @end deftypevr -@deftypevr {@code{policy-configuration} parameter} operation-access-control-list access-controls -Access control by IPP operation. +@deftypevr {paramètre de @code{policy-configuration}} operation-access-control-list access-controls +Contrôle d'accès par les actions IPP. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr @end deftypevr -@deftypevr {@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-files -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. +@deftypevr {paramètre de @code{cups-configuration}} boolean-or-non-negative-integer preserve-job-files +Spécifie si les fichiers de travaux (les documents) sont préservés après +qu'un travail est imprimé. Si une valeur numérique est spécifiée, les +fichiers de travaux sont préservés pour le nombre de secondes indiquées +après l'impression. Sinon, une valeur booléenne s'applique indéfiniment. -Defaults to @samp{86400}. +La valeur par défaut est @samp{86400}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-history -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. +@deftypevr {paramètre de @code{cups-configuration}} boolean-or-non-negative-integer preserve-job-history +Spécifie si l'historique des travaux est préservé après qu'un travail est +imprimé. Si une valeur numérique est spécifiée, l'historique des travaux +est préservé pour le nombre de secondes indiquées après l'impression. Si la +valeur est @code{#t}, l'historique des travaux est préservé jusqu'à +atteindre la limite MaxJobs. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer reload-timeout -Specifies the amount of time to wait for job completion before restarting -the scheduler. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer reload-timeout +Spécifie la durée d'attente pour la fin des travaux avant de redémarrer +l'ordonnanceur. -Defaults to @samp{30}. +La valeur par défaut est @samp{30}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} string rip-cache -Specifies the maximum amount of memory to use when converting documents into -bitmaps for a printer. +@deftypevr {paramètre de @code{cups-configuration}} string rip-cache +Spécifie la quantité de mémoire maximale à utiliser pour convertir des +documents en bitmaps pour l'imprimante. -Defaults to @samp{"128m"}. +La valeur par défaut est @samp{"128m"}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} string server-admin -Specifies the email address of the server administrator. +@deftypevr {paramètre de @code{cups-configuration}} string server-admin +Spécifie l'adresse de courriel de l'administrateur système. -Defaults to @samp{"root@@localhost.localdomain"}. +La valeur par défaut est @samp{"root@@localhost.localdomain"}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} host-name-list-or-* server-alias -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{*}. +@deftypevr {paramètre de @code{cups-configuration}} host-name-list-or-* server-alias +La directive ServerAlias est utilisée pour la validation des en-tête HTTP +Host lorsque les clients se connectent à l'ordonnanceur depuis des +interfaces externes. Utiliser le nom spécial @code{*} peut exposer votre +système à des attaques connues de recombinaison DNS dans le navigateur, même +lorsque vous accédez au site à travers un pare-feu. Si la découverte +automatique des autres noms ne fonctionne pas, nous vous recommandons de +lister chaque nom alternatif avec une directive SeverAlias plutôt que +d'utiliser @code{*}. -Defaults to @samp{*}. +La valeur par défaut est @samp{*}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} string server-name -Specifies the fully-qualified host name of the server. +@deftypevr {paramètre de @code{cups-configuration}} string server-name +Spécifie le nom d'hôte pleinement qualifié du serveur. -Defaults to @samp{"localhost"}. +La valeur par défaut est @samp{"localhost"}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} server-tokens server-tokens -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}. +@deftypevr {paramètre de @code{cups-configuration}} server-tokens server-tokens +Spécifie les informations incluses dans les en-têtes Server des réponses +HTTP. @code{None} désactive l'en-tête Server. @code{ProductOnly} rapporte +@code{CUPS}. @code{Major} rapporte @code{CUPS 2}. @code{Minor} rapporte +@code{CUPS 2.0}. @code{Minimal} rapporte @code{CUPS 2.0.0}. @code{OS} +rapporte @code{CUPS 2.0.0 (@var{uname})} où @var{uname} est la sortie de la +commande @code{uname}. @code{Full} rapporte @code{CUPS 2.0.0 (@var{uname}) +IPP/2.0}. -Defaults to @samp{Minimal}. +La valeur par défaut est @samp{Minimal}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} string set-env -Set the specified environment variable to be passed to child processes. +@deftypevr {paramètre de @code{cups-configuration}} string set-env +Indique que la variable d'environnement spécifiée doit être passée aux +processus fils. -Defaults to @samp{"variable value"}. +La valeur par défaut est @samp{"variable value"}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} multiline-string-list ssl-listen -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. +@deftypevr {paramètre de @code{cups-configuration}} multiline-string-list ssl-listen +Écoute des connexions chiffrées sur les interfaces spécifiées. Les valeurs +valides sont de la forme @var{adresse}:@var{port}, où @var{adresse} est soit +une adresse IPv6 dans des crochets, soit une adresse IPv4, soit @code{*} +pour indiquer toutes les interfaces. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} ssl-options ssl-options -Sets encryption options. By default, CUPS only supports encryption using -TLS v1.0 or higher using known secure cipher suites. The @code{AllowRC4} -option enables the 128-bit RC4 cipher suites, which are required for some -older clients that do not implement newer ones. The @code{AllowSSL3} option -enables SSL v3.0, which is required for some older clients that do not -support TLS v1.0. +@deftypevr {paramètre de @code{cups-configuration}} ssl-options ssl-options +Indique les options de chiffrement. Par défaut, CUPS ne supporte que le +chiffrement avec TLS 1.0 ou plus avec des suites de chiffrement connues pour +être sures. L'option @code{AllowRC4} active les suites de chiffrement +128-bits RC4, qui sont requises pour certains vieux clients qui +n'implémentent pas les nouvelles. L'option @code{AllowSSL3} active SSL +v3.0, qui est requis par certains vieux clients qui ne supportent pas TLS +v1.0. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} boolean strict-conformance? -Specifies whether the scheduler requires clients to strictly adhere to the -IPP specifications. +@deftypevr {paramètre de @code{cups-configuration}} boolean strict-conformance? +Spécifie si l'ordonnanceur demande aux clients d'adhérer aux spécifications +IPP. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} non-negative-integer timeout -Specifies the HTTP request timeout, in seconds. +@deftypevr {paramètre de @code{cups-configuration}} non-negative-integer timeout +Spécifie le délai d'attente des requêtes HTTP, en secondes. -Defaults to @samp{300}. +La valeur par défaut est @samp{300}. @end deftypevr -@deftypevr {@code{cups-configuration} parameter} boolean web-interface? -Specifies whether the web interface is enabled. +@deftypevr {paramètre de @code{cups-configuration}} boolean web-interface? +Spécifie si l'interface web est activée. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -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}. +Maintenant, vous vous dîtes peut-être « oh la la, cher manuel de Guix, je +t'aime bien mais arrête maintenant avec ces options de configuration +»@footnote{NdT : je vous rassure, c'est aussi mon sentiment au moment de +traduire ces lignes. Et pour moi, c'est encore loin d'être fini.}. En +effet. cependant, encore un point supplémentaire : vous pouvez avoir un +fichier @code{cupsd.conf} existant que vous pourriez vouloir utiliser. Dans +ce cas, vous pouvez passer un @code{opaque-cups-configuration} en +configuration d'un @code{cups-service-type}. -Available @code{opaque-cups-configuration} fields are: +Les champs de @code{opaque-cups-configuration} disponibles sont : -@deftypevr {@code{opaque-cups-configuration} parameter} package cups -The CUPS package. +@deftypevr {paramètre de @code{opaque-cups-configuration}} package cups +Le paquet CUPS. @end deftypevr -@deftypevr {@code{opaque-cups-configuration} parameter} string cupsd.conf -The contents of the @code{cupsd.conf}, as a string. +@deftypevr {paramètre de @code{opaque-cups-configuration}} string cupsd.conf +Le contenu de @code{cupsd.conf}, en tant que chaîne de caractères. @end deftypevr -@deftypevr {@code{opaque-cups-configuration} parameter} string cups-files.conf -The contents of the @code{cups-files.conf} file, as a string. +@deftypevr {paramètre de @code{opaque-cups-configuration}} string cups-files.conf +Le contenu du fichier @code{cups-files.conf}, en tant que chaîne de +caractères. @end deftypevr -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: +Par exemple, si vos fichiers @code{cupsd.conf} et @code{cups-files.conf} +sont dans des chaînes du même nom, pouvez instancier un service CUPS de +cette manière : @example (service cups-service-type @@ -13189,149 +13412,154 @@ strings of the same name, you could instantiate a CUPS service like this: @node Services de bureaux @subsubsection Services de bureaux -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. - -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: - -@defvr {Scheme Variable} %desktop-services -This is a list of services that builds upon @var{%base-services} and adds or -adjusts services for a typical ``desktop'' setup. - -In particular, it adds a graphical login manager (@pxref{Système de fenêtrage X, -@code{slim-service}}), screen lockers, a network management tool -(@pxref{Services réseau, @code{network-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{Services réseau}), the Avahi daemon, and has the -name service switch service configured to be able to use @code{nss-mdns} -(@pxref{Name Service Switch, mDNS}). +Le module @code{(gnu services desktop)} fournit des services qui sont +habituellement utiles dans le contexte d'une installation « de bureau » — +c'est-à-dire sur une machine qui fait tourner un service d'affichage +graphique, éventuellement avec des interfaces utilisateurs graphiques, etc. +Il définit aussi des services qui fournissent des environnements de bureau +spécifiques comme GNOME, XFCE et MATE. + +Pour simplifier les choses, le module définit une variable contenant +l'ensemble des services que les utilisateurs s'attendent en général à avoir +sur une machine avec un environnement graphique et le réseau : + +@defvr {Variable Scheme} %desktop-services +C'est la liste des services qui étend @var{%base-services} en ajoutant ou en +ajustant des services pour une configuration « de bureau » typique. + +En particulier, il ajoute un gestionnaire de connexion graphique (@pxref{Système de fenêtrage X, @code{slim-service}}), des verrouilleurs d'écran, un outil de +gestion réseau (@pxref{Services réseau, +@code{network-manager-service-type}}), des services de gestion de l'énergie +et des couleurs, le gestionnaire de connexion et de session @code{elogind}, +le service de privilèges Polkit, le service de géolocalisation GeoClue, le +démon Accounts Service qui permet aux utilisateurs autorisés de changer leur +mot de passe, un client NTP (@pxref{Services réseau}), le démon Avahi, +et le service name service switch est configuré pour pouvoir utiliser +@code{nss-mdns} (@pxref{Name Service Switch, mDNS}). @end defvr -The @var{%desktop-services} variable can be used as the @code{services} -field of an @code{operating-system} declaration (@pxref{Référence de système d'exploitation, @code{services}}). - -Additionally, the @code{gnome-desktop-service}, @code{xfce-desktop-service}, -@code{mate-desktop-service} 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} 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 made by -@code{mate-desktop-service} 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. - -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 the @code{slim-service} for 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. - -@deffn {Scheme Procedure} gnome-desktop-service -Return a service that adds the @code{gnome} package to the system profile, -and extends polkit with the actions from @code{gnome-settings-daemon}. +La variable @var{%desktop-services} peut être utilisée comme champ +@code{services} d'une déclaration @code{operating-system} +(@pxref{Référence de système d'exploitation, @code{services}}). + +En plus, les procédures @code{gnome-desktop-service}, +@code{xfce-desktop-service}, @code{mate-desktop-service} et +@code{enlightenment-desktop-service-type} peuvent ajouter GNOME, XFCE, MATE +ou Enlightenment à un système. « Ajouter GNOME » signifie que les services +du système comme les utilitaires d'ajustement de la luminosité et de gestion +de l'énergie sont ajoutés au système, en étendant @code{polkit} et +@code{dbus} de la bonne manière, ce qui permet à GNOME d'opérer avec des +privilèges plus élevés sur un nombre limité d'interfaces systèmes +spécialisées. En plus, ajouter un service construit par +@code{gnome-desktop-service} ajoute le métapaquet GNOME au profil du +système. de même, ajouter le service XFCE ajoute le métapaquet @code{xfce} +au profil système, mais il permet aussi au gestionnaire de fichiers Thunar +d'ouvrir une fenêtre de gestion des fichier « en mode root », si +l'utilisateur s'authentifie avec le mot de passe administrateur via +l'interface graphique polkit standard. « Ajouter MATE » signifie que +@code{polkit} et @code{dbus} sont étendue de la bonne manière, ce qui permet +à MATE d'opérer avec des privilèges plus élevés sur un nombre limité +d'interface systèmes spécialisées. « Ajouter ENLIGHTENMENT » signifie que +@code{dbus} est étendu comme il faut et que plusieurs binaires +d'Enlightenment récupèrent le bit setuid, ce qui permet au verrouilleur +d'écran d'Enlightenment et à d'autres fonctionnalités de fonctionner +correctement. + +Les environnement de bureau dans Guix utilisent le service d'affichage Xorg +par défaut. Si vous voulez utiliser le protocol de serveur d'affichage plus +récent Wayland, vous devez utiliser @code{sddm-service} à la place de +@code{slim-service} comme gestionnaire de connexion graphique. Vous devriez +ensuite sélectionner la session « GNOME (Wayland) » dans SDDM. Autrement, +vous pouvez essayer de démarrer GNOME sur Wayland manuellement depuis un TTY +avec la commande @command{XDG_SESSION_TYPE=wayland exec dbus-run-session +gnome-session}. Actuellement seul GNOME support Wayland. + +@deffn {Procédure Scheme} gnome-desktop-service +Renvoie un service qui ajoute le paquet @code{gnome} au profil système et +étend polkit avec des actions de @code{gnome-settings-daemon}. @end deffn -@deffn {Scheme Procedure} xfce-desktop-service -Return a service that 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. +@deffn {Procédure Scheme} xfce-desktop-service +Renvoie un service qui ajoute le paquet @code{xfce} au profil du système et +étend polkit avec la capacité pour @code{thunar} de manipuler le système de +fichier en tant que root depuis une session utilisateur, après que +l'utilisateur s'est authentifié avec le mot de passe administrateur. @end deffn -@deffn {Scheme Procedure} mate-desktop-service -Return a service that adds the @code{mate} package to the system profile, -and extends polkit with the actions from @code{mate-settings-daemon}. +@deffn {Procédure Scheme} mate-desktop-service +Renvoie un service qui ajoute le paquet @code{mate} au profil du système et +étend polkit avec les actions de @code{mate-settings-daemon}. @end deffn @deffn {Procédure Scheme} enlightenment-desktop-service-type -Return a service that adds the @code{enlightenment} package to the system -profile, and extends dbus with actions from @code{efl}. +Renvoie un service qui ajoute le paquet @code{enlightenment} et étend dbus +avec les actions de @code{efl} @end deffn -@deftp {Data Type} enlightenment-desktop-service-configuration +@deftp {Type de données} enlightenment-desktop-service-configuration @table @asis @item @code{enlightenment} (par défaut : @code{enlightenment}) Le paquet enlightenment à utiliser. @end table @end deftp -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}: +Comme les services de bureau GNOME, XFCE et MATE récupèrent tant de paquet, +la variable @code{%desktop-services} par défaut n'inclut aucun d'entre eux. +Pour ajouter GNOME, XFCE ou MATE, utilisez @code{cons} pour les ajouter à +@code{%desktop-services} dans le champ @code{services} de votre +@code{operating-system}. @example (use-modules (gnu)) (use-service-modules desktop) (operating-system ... - ;; cons* adds items to the list given as its last argument. + ;; cons* ajoute les élément à la liste donnée en dernier argument (services (cons* (gnome-desktop-service) (xfce-desktop-service) %desktop-services)) ...) @end example -These desktop environments will then be available as options in the -graphical login window. +Ces environnements de bureau seront alors disponibles comme une option dans +la fenêtre de connexion graphique. -The actual service definitions included in @code{%desktop-services} and -provided by @code{(gnu services dbus)} and @code{(gnu services desktop)} are -described below. +Les définitions de service qui sont vraiment incluses dans +@code{%desktop-services} et fournies par @code{(gnu services dbus)} et +@code{(gnu services desktop)} sont décrites plus bas. -@deffn {Scheme Procedure} dbus-service [#:dbus @var{dbus}] [#:services '()] -Return a service that runs the ``system bus'', using @var{dbus}, with -support for @var{services}. +@deffn {Procédure Scheme} dbus-service [#:dbus @var{dbus}] [#:services '()] +Renvoie un service qui lance le « bus système », @var{dbus}, avec le support +de @var{services}. -@uref{http://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. +@uref{http://dbus.freedesktop.org/, D-Bus} est un utilitaire de +communication inter-processus. Son bus système est utilisé pour permettre à +des services systèmes de communiquer et d'être notifiés d'événements +systèmes. -@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)}. +@var{services} doit être une liste de paquets qui fournissent un répertoire +@file{etc/dbus-1/system.d} contenant de la configuration D-Bus +supplémentaire et des fichiers de politiques. Par exemple, pour permettre à +avahi-daemon d'utiliser le bus système, @var{services} doit être égal à +@code{(list avahi)}. @end deffn -@deffn {Scheme Procedure} elogind-service [#:config @var{config}] -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. +@deffn {Procédure Scheme} elogind-service [#:config @var{config}] +Renvoie un service qui lance le démon de gestion de connexion et de session +@code{elogind}. @uref{https://github.com/elogind/elogind, Elogind} expose +une interface D-Bus qui peut être utilisée pour connaître quels utilisateurs +sont connectés, le type de session qu'ils sont ouverte, suspendre le +système, désactiver la veille système, redémarrer le système et d'autre +taches. -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. +Elogind gère la plupart des événements liés à l'énergie du système, par +exemple mettre en veille le système quand l'écran est rabattu ou en +l'éteignant quand le bouton de démarrage est appuyé. -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: +L'argument @var{config} spécifie la configuration d'elogind et devrait être +le résultat d'une invocation de @code{(elogind-configuration +(@var{parameter} @var{value})...)}. Les paramètres disponibles et leur +valeur par défaut sont : @table @code @item kill-user-processes? @@ -13387,106 +13615,121 @@ are: @end table @end deffn -@deffn {Scheme Procedure} accountsservice-service @ - [#: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. - -The @var{accountsservice} keyword argument is the @code{accountsservice} -package to expose as a service. +@deffn {Procédure Scheme} accountsservice-service @ + [#:accountsservice @var{accountsservice}] +Renvoie un service qui lance AccountsService, un service système qui peut +lister les comptes disponibles, changer leur mot de passe, etc. +AccountsService s'intègre à Polkit pour permettre aux utilisateurs non +privilégiés de pouvoir modifier la configuration de leur système. +@uref{https://www.freedesktop.org/wiki/Software/AccountsService/, le site de +accountsservice} pour trouver plus d'informations. + +L'argument @var{accountsservice} est le paquet @code{accountsservice} à +exposer comme un service. @end deffn -@deffn {Scheme Procedure} polkit-service @ - [#:polkit @var{polkit}] Return a service that runs the -@uref{http://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. +@deffn {Procédure Scheme} polkit-service @ + [#:polkit @var{polkit}] +Renvoie un service qui lance le +@uref{http://www.freedesktop.org/wiki/Software/polkit/, service de gestion +des privilèges Polkit}, qui permet aux administrateurs systèmes de permettre +l'accès à des opération privilégiées d'une manière structurée. En demandant +au service Polkit, un composant système privilégié peut savoir lorsqu'il +peut donner des privilèges supplémentaires à des utilisateurs normaux. Par +exemple, un utilisateur normal peut obtenir le droit de mettre le système en +veille si l'utilisateur est connecté localement. @end deffn -@deffn {Scheme Procedure} upower-service [#:upower @var{upower}] @ - [#:watts-up-pro? #f] @ [#:poll-batteries? #t] @ [#:ignore-lid? #f] @ -[#:use-percentage-for-policy? #f] @ [#:percentage-low 10] @ -[#:percentage-critical 3] @ [#:percentage-action 2] @ [#:time-low 1200] @ -[#:time-critical 300] @ [#:time-action 120] @ [#:critical-power-action -'hybrid-sleep] Return a service that runs -@uref{http://upower.freedesktop.org/, @command{upowerd}}, a system-wide -monitor for power consumption and battery levels, with the given -configuration settings. It implements the @code{org.freedesktop.UPower} -D-Bus interface, and is notably used by GNOME. +@deffn {Procédure Scheme} upower-service [#:upower @var{upower}] @ + [#:watts-up-pro? #f] @ +[#:poll-batteries? #t] @ +[#:ignore-lid? #f] @ +[#:use-percentage-for-policy? #f] @ +[#:percentage-low 10] @ +[#:percentage-critical 3] @ +[#:percentage-action 2] @ +[#:time-low 1200] @ +[#:time-critical 300] @ +[#:time-action 120] @ +[#:critical-power-action 'hybrid-sleep] +Renvoie un service qui lance @uref{http://upower.freedesktop.org/, +@command{upowerd}}, un moniteur système pour la consommation électrique et +le niveau de batterie, avec les paramètres de configuration données. Il +implémente l'interface D-Bus @code{org.freedesktop.UPower} et est notamment +utilisé par GNOME. @end deffn -@deffn {Scheme Procedure} udisks-service [#:udisks @var{udisks}] -Return a service for @uref{http://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. +@deffn {Procédure Scheme} udisks-service [#:udisks @var{udisks}] +Renvoie un service pour @uref{http://udisks.freedesktop.org/docs/latest/, +UDisks}, un démon de @dfn{gestion de disques} qui fournit des notifications +et la capacité de monter et démonter des disques à des interfaces +utilisateurs. Les programmes qui parlent à UDisks sont par exemple la +commande @command{udisksctl}, qui fait partie de UDisks et GNOME Disks. @end deffn -@deffn {Scheme Procedure} colord-service [#:colord @var{colord}] -Return a 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{http://www.freedesktop.org/software/colord/, the -colord web site} for more information. +@deffn {Procédure Scheme} colord-service [#:colord @var{colord}] +Renvoie un service qui lance @command{colord}, un service système avec une +interface D-Bus pour gérer les profils de couleur des périphériques +d'entrées et de sorties comme les écrans et les scanners. Il est notamment +utilisé par l'outil graphique GNOME Color Manager. Voir +@uref{http://www.freedesktop.org/software/colord/, le site web de colord} +pour plus d'informations. @end deffn -@deffn {Scheme Procedure} geoclue-application name [#:allowed? #t] [#:system? #f] [#:users '()] -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. +@deffn {Procédure Scheme} geoclue-application name [#:allowed? #t] [#:system? #f] [#:users '()] +Renvoie une configuration qui permet d'accéder aux données de localisation +de GeoClue. @var{name} est l'ID Desktop de l'application, sans la partie en +@code{.desktop}. Si @var{allowed?} est vraie, l'application aura droit +d'accéder aux informations de localisation par défaut. Le booléen +@var{system?} indique si une application est un composant système ou non. +Enfin @var{users} est la liste des UID des utilisateurs pour lesquels cette +application a le droit d'accéder aux informations de géolocalisation. Une +liste d'utilisateurs vide indique que tous les utilisateurs sont autorisés. @end deffn -@defvr {Scheme Variable} %standard-geoclue-applications -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. +@defvr {Variable Scheme} %standard-geoclue-applications +la liste standard de configuration des application GeoClue connues, qui +permet à l'utilitaire date-and-time de GNOME de demander l'emplacement +actuel pour initialiser le fuseau horaire et aux navigateurs web IceCat et +Epiphany de demander les informations de localisation. IceCat et Epiphany +demandent tous deux à l'utilisateur avant de permettre à une page web de +connaître l'emplacement de l'utilisateur. @end defvr -@deffn {Scheme Procedure} geoclue-service [#:colord @var{colord}] @ - [#:whitelist '()] @ [#:wifi-geolocation-url +@deffn {Procédure Scheme} geoclue-service [#:colord @var{colord}] @ + [#: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. +[#:submission-nick "geoclue"] @ +[#:applications %standard-geoclue-applications] +Renvoie un service qui lance le service de géolocalisation GeoClue. Ce +service fournit une interface D-Bus pour permettre aux applications de +demande l'accès à la position de l'utilisateur et éventuellement d'ajouter +des informations à des bases de données de géolocalisation en ligne. Voir +@uref{https://wiki.freedesktop.org/www/Software/GeoClue/, le site web de +GeoClue} pour plus d'informations. @end deffn -@deffn {Scheme Procedure} bluetooth-service [#:bluez @var{bluez}] @ - [@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. +@deffn {Procédure Scheme} bluetooth-service [#:bluez @var{bluez}] @ + [@w{#:auto-enable? #f}] +Renvoie un service qui lance le démon @command{bluetoothd} qui gère tous les +appareils Bluetooth et fournit un certain nombre d'interfaces D-Bus. +Lorsque @var{auto-enable?} est vraie, le contrôler bluetooth est +automatiquement alimenté au démarrage, ce qui peut être utile lorsque vous +utilisez un clavier ou une souris bluetooth. -Users need to be in the @code{lp} group to access the D-Bus service. +Les utilisateurs doivent être dans le groupe @code{lp} pour accéder au +service D-Bus. @end deffn @node Services de son @subsubsection Services de son -@cindex sound support +@cindex support du son @cindex ALSA -@cindex PulseAudio, sound support +@cindex PulseAudio, support du son The @code{(gnu services sound)} module provides a service to configure the Advanced Linux Sound Architecture (ALSA) system, which making PulseAudio the @@ -13502,25 +13745,26 @@ Sound Architecture} (ALSA) system, which generates the (service alsa-service-type) @end example -See below for details about @code{alsa-configuration}. +Voir plus bas pour des détails sur @code{alsa-configuration}. @end deffn -@deftp {Type de donnée} alsa-configuration -Data type representing the configuration for @code{alsa-service}. +@deftp {Type de données} alsa-configuration +Type de données représentant la configuration pour @code{alsa-service}. @table @asis @item @code{alsa-plugins} (default: @var{alsa-plugins}) @code{alsa-plugins} package to use. -@item @code{pulseaudio?} (par défaut : @code{#t}) -Whether ALSA applications should transparently be made to use the -@uref{http://www.pulseaudio.org/, PulseAudio} sound server. +@item @code{pulseaudio?} (par défaut : @var{#t}) +Indique si les applications ALSA devraient utiliser le serveur de son +@uref{http://www.pulseaudio.org/, PulseAudio} de manière transparente pour +elles. -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. +Utiliser PulseAudio vous permet dans lancer plusieurs applications qui +produisent du son en même temps et de les contrôler individuellement via +@command{pavucontrol} entre autres choses. -@item @code{extra-options} (par défaut : @code{""}) +@item @code{extra-options} (par défaut : @var{""}) String to append to the @file{/etc/asound.conf} file. @end table @@ -13567,152 +13811,155 @@ details. @cindex database @cindex SQL -The @code{(gnu services databases)} module provides the following services. - -@deffn {Scheme Procedure} postgresql-service [#:postgresql postgresql] @ - [#:config-file] [#:data-directory ``/var/lib/postgresql/data''] @ [#:port -5432] [#:locale ``en_US.utf8''] Return a service that runs @var{postgresql}, -the PostgreSQL database server. - -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}. +Le module @code{(gnu services databases)} fournit les services suivants. + +@deffn {Procédure Scheme} postgresql-service [#:postgresql postgresql] @ + [#:config-file] [#:data-directory ``/var/lib/postgresql/data''] @ +[#:port 5432] [#:locale ``en_US.utf8''] +Renvoie un service qui lance @var{postgresql}, le service de bases de +données PostgreSQL. + +Le démon PostgreSQL charge sa configuration à l'exécution depuis +@var{config-file}, crée une grappe de bases de données avec @var{locale} +comme paramètre de régionalisation par défaut, stockée dans +@var{data-directory}. Il écoute ensuite sur @var{port}. @end deffn -@deffn {Scheme Procedure} mysql-service [#:config (mysql-configuration)] -Return a service that runs @command{mysqld}, the MySQL or MariaDB database -server. +@deffn {Procédure Scheme} mysql-service [#:config (mysql-configuration)] +Renvoie un service qui lance @command{mysqld}, le service de bases de +données MySQL ou MariaDB. -The optional @var{config} argument specifies the configuration for -@command{mysqld}, which should be a @code{} object. +L'argument @var{config} facultatif spécifie la configuration de +@command{mysqld}, qui devrait être un objet @code{}. @end deffn -@deftp {Data Type} mysql-configuration -Data type representing the configuration of @var{mysql-service}. +@deftp {Type de données} mysql-configuration +Type de données représentant la configuration de @var{mysql-service}. @table @asis -@item @code{mysql} (default: @var{mariadb}) -Package object of the MySQL database server, can be either @var{mariadb} or -@var{mysql}. +@item @code{mysql} (par défaut : @var{mariadb}) +Objet paquet du serveur de base de données MySQL, qui peut être soit +@var{mariadb}, soit @var{mysql}. -For MySQL, a temporary root password will be displayed at activation time. -For MariaDB, the root password is empty. +Pour MySQL, un mot de passe root temporaire sera affiché à l'activation. +Pour MariaDB, le mot de passe root est vide. -@item @code{port} (default: @code{3306}) -TCP port on which the database server listens for incoming connections. +@item @code{port} (par défaut : @code{3306}) +Port TCP sur lequel le serveur de base de données écoute les connexions +entrantes. @end table @end deftp -@defvr {Scheme Variable} memcached-service-type -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. +@defvr {Variable Scheme} memcached-service-type +C'est le type de service pour le service @uref{https://memcached.org/, +Memcached} qui fournit un cache en mémoire distribué. La valeur pour le +type de service est un objet @code{memcached-configuration}. @end defvr @example (service memcached-service-type) @end example -@deftp {Data Type} memcached-configuration -Data type representing the configuration of memcached. +@deftp {Type de données} memcached-configuration +Type de données représentant la configuration de memcached. @table @asis -@item @code{memcached} (default: @code{memcached}) -The Memcached package to use. +@item @code{memcached} (par défaut : @code{memcached}) +Le paquet Memcached à utiliser. -@item @code{interfaces} (default: @code{'("0.0.0.0")}) -Network interfaces on which to listen. +@item @code{interfaces} (par défaut : @code{'("0.0.0.0")}) +Les interfaces réseaux sur lesquelles écouter. -@item @code{tcp-port} (default: @code{11211}) -Port on which to accept connections on, +@item @code{tcp-port} (par défaut : @code{11211}) +Port sur lequel accepter les connexions. -@item @code{udp-port} (default: @code{11211}) -Port on which to accept UDP connections on, a value of 0 will disable -listening on a UDP socket. +@item @code{udp-port} (par défaut : @code{11211}) +Port sur lequel accepter les connexions UDP, une valeur de 0 désactive +l'écoute en UDP. -@item @code{additional-options} (default: @code{'()}) -Additional command line options to pass to @code{memcached}. +@item @code{additional-options} (par défaut : @code{'()}) +Options de la ligne de commande supplémentaires à passer à @code{memcached}. @end table @end deftp -@defvr {Scheme Variable} mongodb-service-type -This is the service type for @uref{https://www.mongodb.com/, MongoDB}. The -value for the service type is a @code{mongodb-configuration} object. +@defvr {Variable Scheme} mongodb-service-type +C'est le type de service pour @uref{https://www.mongodb.com/, MongoDB}. La +valeur de ce service est un objet @code{mongodb-configuration}. @end defvr @example (service mongodb-service-type) @end example -@deftp {Data Type} mongodb-configuration -Data type representing the configuration of mongodb. +@deftp {Type de données} mongodb-configuration +Type de données représentant la configuration de mongodb. @table @asis -@item @code{mongodb} (default: @code{mongodb}) -The MongoDB package to use. +@item @code{mongodb} (par défaut : @code{mongodb}) +Le paquet MongoDB à utiliser. -@item @code{config-file} (default: @code{%default-mongodb-configuration-file}) -The configuration file for MongoDB. +@item @code{config-file} (par défaut : @code{%default-mongodb-configuration-file}) +Le fichier de configuration pour MongoDB. -@item @code{data-directory} (default: @code{"/var/lib/mongodb"}) -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. +@item @code{data-directory} (par défaut : @code{"/var/lib/mongodb"}) +Cette valeur est utilisée pour créer le répertoire, pour qu'il existe et +appartienne à l'utilisateur mongodb. Il devrait correspondre au +data-directory que MongoDB est configuré pour utiliser dans son fichier de +configuration. @end table @end deftp -@defvr {Scheme Variable} redis-service-type -This is the service type for the @uref{https://redis.io/, Redis} key/value -store, whose value is a @code{redis-configuration} object. +@defvr {Variable Scheme} redis-service-type +C'est le type de service pour la base clef-valeur @uref{https://redis.io/, +Redis} dont la valeur est un objet @code{redis-configuration}. @end defvr -@deftp {Data Type} redis-configuration -Data type representing the configuration of redis. +@deftp {Type de données} redis-configuration +Type de données représentant la configuration de redis. @table @asis -@item @code{redis} (default: @code{redis}) -The Redis package to use. +@item @code{redis} (par défaut : @code{redis}) +Le paquet Redis à utiliser. -@item @code{bind} (default: @code{"127.0.0.1"}) -Network interface on which to listen. +@item @code{bind} (par défaut : @code{"127.0.0.1"}) +Interface réseau sur laquelle écouter. -@item @code{port} (default: @code{6379}) -Port on which to accept connections on, a value of 0 will disable listening -on a TCP socket. +@item @code{port} (par défaut : @code{6379}) +Port sur lequel accepter les connexions, une valeur de 0 désactive l'écoute +sur un socket TCP. -@item @code{working-directory} (default: @code{"/var/lib/redis"}) -Directory in which to store the database and related files. +@item @code{working-directory} (par défaut : @code{"/var/lib/redis"}) +Répertoire dans lequel stocker la base de données et les fichiers liés. @end table @end deftp @node Services de courriels @subsubsection Services de courriels -@cindex mail +@cindex courriel @cindex email -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. +Le module @code{(gnu services mail)} fournit des définitions de services +Guix pour les services de courriel : des serveurs IMAP, POP3 et LMTP ainsi +que des MTA (Mail Transport Agent). Que d'acronymes ! Ces services sont +détaillés dans les sous-sections ci-dessous. -@subsubheading Dovecot Service +@subsubheading Service Dovecot -@deffn {Scheme Procedure} dovecot-service [#:config (dovecot-configuration)] -Return a service that runs the Dovecot IMAP/POP3/LMTP mail server. +@deffn {Procédure Scheme} dovecot-service [#:config (dovecot-configuration)] +Renvoie un service qui lance le serveur de courriel IMAP/POP3/LMTP Dovecot. @end deffn -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. +Par défaut, Dovecot n'a pas besoin de beaucoup de configuration ; l'objet de +configuration par défaut créé par @code{(dovecot-configuration)} suffira si +votre courriel est livré dans @code{~/Maildir}. Un certificat auto-signé +sera généré pour les connexions TLS, bien que Dovecot écoutera aussi sur les +ports non chiffrés par défaut. Il y a quelques options cependant, que les +administrateurs peuvent avoir besoin de changer et comme c'est le cas avec +d'autres services, Guix permet aux administrateurs systèmes de spécifier ces +paramètres via une interface Scheme unifiée. -For example, to specify that mail is located at @code{maildir~/.mail}, one -would instantiate the Dovecot service like this: +Par exemple, pour spécifier que les courriels se trouvent dans +@code{maildir~/.mail}, on peut instancier Dovecot de cette manière : @example (dovecot-service #:config @@ -13720,12 +13967,13 @@ would instantiate the Dovecot service like this: (mail-location "maildir:~/.mail"))) @end example -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. +Les paramètres de configuration disponibles sont les suivants. Chaque +définition des paramètres est précédé par son type ; par exemple, +@samp{string-list foo} indique que le paramètre @code{foo} devrait être +spécifié comme une liste de chaînes de caractères. Il y a aussi une manière +de spécifier la configuration comme une chaîne de caractères, si vous avez +un vieux fichier @code{dovecot.conf} que vous voulez porter depuis un autre +système ; voir la fin pour plus de détails. @c The following documentation was initially generated by @c (generate-documentation) in (gnu services mail). Manually maintained @@ -13735,519 +13983,561 @@ see the end for more details. @c (generate-documentation) than to make it below and have to deal with @c the churn as dovecot updates. -Available @code{dovecot-configuration} fields are: +Les champs de @code{dovecot-configuration} disponibles sont : -@deftypevr {@code{dovecot-configuration} parameter} package dovecot -The dovecot package. +@deftypevr {paramètre de @code{dovecot-configuration}} package dovecot +Le paquet dovecot @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} comma-separated-string-list listen -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. +@deftypevr {paramètre de @code{dovecot-configuration}} comma-separated-string-list listen +Une liste d'IP ou d'hôtes à écouter pour les connexions. @samp{*} écoute +sur toutes les interfaces IPv4, @samp{::} écoute sur toutes les interfaces +IPv6. Si vous voulez spécifier des ports différents de la valeur par défaut +ou quelque chose de plus complexe, complétez les champs d'adresse et de port +de @samp{inet-listener} des services spécifiques qui vous intéressent. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} protocol-configuration-list protocols -List of protocols we want to serve. Available protocols include -@samp{imap}, @samp{pop3}, and @samp{lmtp}. +@deftypevr {paramètre de @code{dovecot-configuration}} protocol-configuration-list protocols +Liste des protocoles que vous voulez servir. Les protocoles disponibles +comprennent @samp{imap}, @samp{pop3} et @samp{lmtp}. -Available @code{protocol-configuration} fields are: +Les champs @code{protocol-configuration} disponibles sont : -@deftypevr {@code{protocol-configuration} parameter} string name -The name of the protocol. +@deftypevr {paramètre de @code{protocol-configuration}} string name +Le nom du protocole. @end deftypevr -@deftypevr {@code{protocol-configuration} parameter} string auth-socket-path -UNIX socket path to the master authentication server to find users. This is -used by imap (for shared users) and lda. It defaults to +@deftypevr {paramètre de @code{protocol-configuration}} string auth-socket-path +Le chemin d'un socket UNIX vers le serveur d'authentification maître pour +trouver les utilisateurs. C'est utilisé par imap (pour les utilisateurs +partagés) et lda. Sa valeur par défaut est @samp{"/var/run/dovecot/auth-userdb"}. @end deftypevr -@deftypevr {@code{protocol-configuration} parameter} space-separated-string-list mail-plugins -Space separated list of plugins to load. +@deftypevr {paramètre de @code{protocol-configuration}} space-separated-string-list mail-plugins +Liste de greffons à charger séparés par des espaces. @end deftypevr -@deftypevr {@code{protocol-configuration} parameter} non-negative-integer mail-max-userip-connections -Maximum number of IMAP connections allowed for a user from each IP address. -NOTE: The username is compared case-sensitively. Defaults to @samp{10}. +@deftypevr {paramètre de @code{protocol-configuration}} non-negative-integer mail-max-userip-connections +Nombre maximum de connexions IMAP permises pour un utilisateur depuis chaque +adresse IP. Remarque : la comparaison du nom d'utilisateur est sensible à +la casse. Par défaut @samp{10}. @end deftypevr @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} service-configuration-list services -List of services to enable. Available services include @samp{imap}, -@samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth}, and -@samp{lmtp}. +@deftypevr {paramètre de @code{dovecot-configuration}} service-configuration-list services +Liste des services à activer. Les services disponibles comprennent +@samp{imap}, @samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth} +et @samp{lmtp}. -Available @code{service-configuration} fields are: +Les champs de @code{service-configuration} disponibles sont : -@deftypevr {@code{service-configuration} parameter} string kind -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. +@deftypevr {paramètre de @code{service-configuration}} string kind +Le type de service. Les valeurs valides comprennent @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} ou n'importe quoi d'autre. @end deftypevr -@deftypevr {@code{service-configuration} parameter} listener-configuration-list listeners -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{()}. +@deftypevr {paramètre de @code{service-configuration}} listener-configuration-list listeners +Les auditeurs du service. Un auditeur est soit un +@code{unix-listener-configuration}, soit un +@code{fifo-listener-configuration}, soit un +@code{inet-listener-configuration}. La valeur par défaut est @samp{()}. -Available @code{unix-listener-configuration} fields are: +Les champs de @code{unix-listener-configuration} disponibles sont : -@deftypevr {@code{unix-listener-configuration} parameter} string path -Path to the file, relative to @code{base-dir} field. This is also used as -the section name. +@deftypevr {paramètre de @code{unix-listener-configuration}} string path +Chemin vers le fichier, relativement au champ @code{base-dir}. C'est aussi +utilisé comme nom de section. @end deftypevr -@deftypevr {@code{unix-listener-configuration} parameter} string mode -The access mode for the socket. Defaults to @samp{"0600"}. +@deftypevr {paramètre de @code{unix-listener-configuration}} string mode +Le mode d'accès pour le socket. La valeur par défaut est @samp{"0600"}. @end deftypevr -@deftypevr {@code{unix-listener-configuration} parameter} string user -The user to own the socket. Defaults to @samp{""}. +@deftypevr {paramètre de @code{unix-listener-configuration}} string user +L'utilisateur à qui appartient le socket. La valeur par défaut est +@samp{""} @end deftypevr -@deftypevr {@code{unix-listener-configuration} parameter} string group -The group to own the socket. Defaults to @samp{""}. +@deftypevr {paramètre de @code{unix-listener-configuration}} string group +Le groupe auquel appartient le socket. La valeur par défaut est @samp{""}. @end deftypevr -Available @code{fifo-listener-configuration} fields are: +Les champs de @code{fifo-listener-configuration} disponibles sont : -@deftypevr {@code{fifo-listener-configuration} parameter} string path -Path to the file, relative to @code{base-dir} field. This is also used as -the section name. +@deftypevr {paramètre de @code{fifo-listener-configuration}} string path +Chemin vers le fichier, relativement au champ @code{base-dir}. C'est aussi +utilisé comme nom de section. @end deftypevr -@deftypevr {@code{fifo-listener-configuration} parameter} string mode -The access mode for the socket. Defaults to @samp{"0600"}. +@deftypevr {paramètre de @code{fifo-listener-configuration}} string mode +Le mode d'accès pour le socket. La valeur par défaut est @samp{"0600"}. @end deftypevr -@deftypevr {@code{fifo-listener-configuration} parameter} string user -The user to own the socket. Defaults to @samp{""}. +@deftypevr {paramètre de @code{fifo-listener-configuration}} string user +L'utilisateur à qui appartient le socket. La valeur par défaut est +@samp{""} @end deftypevr -@deftypevr {@code{fifo-listener-configuration} parameter} string group -The group to own the socket. Defaults to @samp{""}. +@deftypevr {paramètre de @code{fifo-listener-configuration}} string group +Le groupe auquel appartient le socket. La valeur par défaut est @samp{""}. @end deftypevr -Available @code{inet-listener-configuration} fields are: +Les champs de @code{inet-listener-configuration} disponibles sont : -@deftypevr {@code{inet-listener-configuration} parameter} string protocol -The protocol to listen for. +@deftypevr {paramètre de @code{inet-listener-configuration}} string protocol +Le protocole à écouter. @end deftypevr -@deftypevr {@code{inet-listener-configuration} parameter} string address -The address on which to listen, or empty for all addresses. Defaults to -@samp{""}. +@deftypevr {paramètre de @code{inet-listener-configuration}} string address +L'adresse sur laquelle écouter, ou la chaîne vide pour toutes les adresses. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{inet-listener-configuration} parameter} non-negative-integer port -The port on which to listen. +@deftypevr {paramètre de @code{inet-listener-configuration}} non-negative-integer port +Le port sur lequel écouter. @end deftypevr -@deftypevr {@code{inet-listener-configuration} parameter} boolean ssl? -Whether to use SSL for this service; @samp{yes}, @samp{no}, or -@samp{required}. Defaults to @samp{#t}. +@deftypevr {paramètre de @code{inet-listener-configuration}} boolean ssl? +S'il faut utiliser SSL pour ce service ; @samp{yes}, @samp{no} ou +@samp{required}. La valeur par défaut est @samp{#t}. @end deftypevr @end deftypevr -@deftypevr {@code{service-configuration} parameter} non-negative-integer service-count -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}. +@deftypevr {paramètre de @code{service-configuration}} non-negative-integer service-count +Nombre de connexions à gérer avant de démarrer un nouveau processus. +Typiquement les valeurs utiles sont 0 (sans limite) ou 1. 1 est plus sûr, +mais 0 est plus rapide. . La valeur par défaut +est @samp{1}. @end deftypevr -@deftypevr {@code{service-configuration} parameter} non-negative-integer process-min-avail -Number of processes to always keep waiting for more connections. Defaults -to @samp{0}. +@deftypevr {paramètre de @code{service-configuration}} non-negative-integer process-min-avail +Nombre de processus à toujours garder en attente de connexions. La valeur +par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{service-configuration} parameter} non-negative-integer vsz-limit -If you set @samp{service-count 0}, you probably need to grow this. Defaults -to @samp{256000000}. +@deftypevr {paramètre de @code{service-configuration}} non-negative-integer vsz-limit +Si vous mettez @samp{service-count 0}, vous avez sans doute besoin +d'augmenter ce paramètre. La valeur par défaut est @samp{256000000}. @end deftypevr @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} dict-configuration dict -Dict configuration, as created by the @code{dict-configuration} constructor. +@deftypevr {paramètre de @code{dovecot-configuration}} dict-configuration dict +Configuration du dictionnaire, créé par le constructeur +@code{dict-configuration}. -Available @code{dict-configuration} fields are: +Les champs de @code{dict-configuration} disponibles sont : -@deftypevr {@code{dict-configuration} parameter} free-form-fields entries -A list of key-value pairs that this dict should hold. Defaults to -@samp{()}. +@deftypevr {paramètre de @code{dict-configuration}} free-form-fields entries +Une liste de paires de clefs-valeurs que ce dictionnaire contient. La +valeur par défaut est @samp{()}. @end deftypevr @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} passdb-configuration-list passdbs -A list of passdb configurations, each one created by the -@code{passdb-configuration} constructor. +@deftypevr {paramètre de @code{dovecot-configuration}} passdb-configuration-list passdbs +Une liste de configurations passdb, chacune créée par le constructeur +@code{passdb-configuration}. -Available @code{passdb-configuration} fields are: +Les champs de @code{passdb-configuration} disponibles sont : -@deftypevr {@code{passdb-configuration} parameter} string driver -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"}. +@deftypevr {paramètre de @code{passdb-configuration}} string driver +Le pilote à utiliser par passdb. Les valeur valides comprennent @samp{pam}, +@samp{passwd}, @samp{shadow}, @samp{bsdauth} et @samp{static}. La valeur +par défaut est @samp{"pam"}. @end deftypevr -@deftypevr {@code{passdb-configuration} parameter} space-separated-string-list args -Space separated list of arguments to the passdb driver. Defaults to -@samp{""}. +@deftypevr {paramètre de @code{passdb-configuration}} space-separated-string-list args +Liste d'arguments pour le pilote passdb séparés par des espaces. La valeur +par défaut est @samp{""}. @end deftypevr @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} userdb-configuration-list userdbs -List of userdb configurations, each one created by the -@code{userdb-configuration} constructor. +@deftypevr {paramètre de @code{dovecot-configuration}} userdb-configuration-list userdbs +Liste des configurations userdb, chacune créée par le constructeur +@code{userdb-configuration}. -Available @code{userdb-configuration} fields are: +Les champs de @code{userdb-configuration} disponibles sont : -@deftypevr {@code{userdb-configuration} parameter} string driver -The driver that the userdb should use. Valid values include @samp{passwd} -and @samp{static}. Defaults to @samp{"passwd"}. +@deftypevr {paramètre de @code{userdb-configuration}} string driver +Le pilote que userdb devrait utiliser. Les valeurs valides comprennent +@samp{passwd} et @samp{static}. La valeur par défaut est @samp{"passwd"}. @end deftypevr -@deftypevr {@code{userdb-configuration} parameter} space-separated-string-list args -Space separated list of arguments to the userdb driver. Defaults to -@samp{""}. +@deftypevr {paramètre de @code{userdb-configuration}} space-separated-string-list args +Liste des arguments du pilote userdb séparés par des espaces. La valeur par +défaut est @samp{""}. @end deftypevr -@deftypevr {@code{userdb-configuration} parameter} free-form-args override-fields -Override fields from passwd. Defaults to @samp{()}. +@deftypevr {paramètre de @code{userdb-configuration}} free-form-args override-fields +Remplace des champs de passwd. La valeur par défaut est @samp{()}. @end deftypevr @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} plugin-configuration plugin-configuration -Plug-in configuration, created by the @code{plugin-configuration} -constructor. +@deftypevr {paramètre de @code{dovecot-configuration}} plugin-configuration plugin-configuration +Configuration du greffon, créé par le constructeur +@code{plugin-configuration}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} list-of-namespace-configuration namespaces -List of namespaces. Each item in the list is created by the -@code{namespace-configuration} constructor. +@deftypevr {paramètre de @code{dovecot-configuration}} list-of-namespace-configuration namespaces +Liste d'espaces de noms. Chaque élément de la liste est créé par le +constructeur @code{namespace-configuration}. -Available @code{namespace-configuration} fields are: +Les champs de @code{namespace-configuration} disponibles sont : -@deftypevr {@code{namespace-configuration} parameter} string name -Name for this namespace. +@deftypevr {paramètre de @code{namespace-configuration}} string name +Nom de cet espace de nom. @end deftypevr -@deftypevr {@code{namespace-configuration} parameter} string type -Namespace type: @samp{private}, @samp{shared} or @samp{public}. Defaults to -@samp{"private"}. +@deftypevr {paramètre de @code{namespace-configuration}} string type +Type d'espace de nom : @samp{private}, @samp{shared} ou @samp{public}. La +valeur par défaut est @samp{"private"}. @end deftypevr -@deftypevr {@code{namespace-configuration} parameter} string separator -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{""}. +@deftypevr {paramètre de @code{namespace-configuration}} string separator +Séparateur de hiérarchie à utiliser. Vous devriez utiliser le même +séparateur pour tous les espaces de noms ou certains clients seront confus. +@samp{/} est généralement une bonne valeur. La valeur par défaut dépend +cependant du format de stockage sous-jacent. La valeur par défaut est +@samp{""}. @end deftypevr -@deftypevr {@code{namespace-configuration} parameter} string prefix -Prefix required to access this namespace. This needs to be different for -all namespaces. For example @samp{Public/}. Defaults to @samp{""}. +@deftypevr {paramètre de @code{namespace-configuration}} string prefix +Préfixe requis pour accéder à cet espace de nom. Ce paramètres doit être +différent pour tous les espaces de noms. Par exemple @samp{Public/}. La +valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{namespace-configuration} parameter} string location -Physical location of the mailbox. This is in the same format as -mail_location, which is also the default for it. Defaults to @samp{""}. +@deftypevr {paramètre de @code{namespace-configuration}} string location +Emplacement physique de la boîte aux lettres. C'est le même format que +mail_location, qui est aussi la valeur par défaut. La valeur par défaut est +@samp{""}. @end deftypevr -@deftypevr {@code{namespace-configuration} parameter} boolean inbox? -There can be only one INBOX, and this setting defines which namespace has -it. Defaults to @samp{#f}. +@deftypevr {paramètre de @code{namespace-configuration}} boolean inbox? +Il ne peut y avoir qu'un INBOX, et ce paramètre définit l'espace de nom qui +le possède. La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{namespace-configuration} parameter} boolean hidden? -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}. +@deftypevr {paramètre de @code{namespace-configuration}} boolean hidden? +Si l'espace de nom est caché, il n'est pas publié auprès des clients par +l'extension NAMESPACE. Vous voudrez aussi sans doute indiquer @samp{list? +#f}. C'est surtout utile lors de la conversion depuis un autre serveur avec +des espaces de noms différents que vous voulez rendre obsolètes sans les +casser. Par exemple vous pouvez cacher les espaces de noms avec les +préfixes @samp{~/mail/}, @samp{~%u/mail/} et @samp{mail/}. La valeur par +défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{namespace-configuration} parameter} boolean list? -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}. +@deftypevr {paramètre de @code{namespace-configuration}} boolean list? +Montre les boîtes aux lettres sons cet espace de nom avec la commande LIST. +Cela rend l'espace de nom visible pour les clients qui ne supportent pas +l'extension NAMESPACE. La valeur spéciale @code{children} liste les boîtes +aux lettres filles mais cache le préfixe de l'espace de nom. La valeur par +défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{namespace-configuration} parameter} boolean subscriptions? -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}. +@deftypevr {paramètre de @code{namespace-configuration}} boolean subscriptions? +Les espaces de noms gèrent leur propre souscription. Si la valeur est +@code{#f}, l'espace de nom parent s'en charge. Le préfixe vide devrait +toujours avoir cette valeur à @code{#t}. La valeur par défaut est +@samp{#t}. @end deftypevr -@deftypevr {@code{namespace-configuration} parameter} mailbox-configuration-list mailboxes -List of predefined mailboxes in this namespace. Defaults to @samp{()}. +@deftypevr {paramètre de @code{namespace-configuration}} mailbox-configuration-list mailboxes +Liste des boîtes aux lettres prédéfinies dans cet espace de nom. La valeur +par défaut est @samp{()}. -Available @code{mailbox-configuration} fields are: +Les champs de @code{mailbox-configuration} disponibles sont : -@deftypevr {@code{mailbox-configuration} parameter} string name -Name for this mailbox. +@deftypevr {paramètre de @code{mailbox-configuration}} string name +Nom de cette boîte aux lettres. @end deftypevr -@deftypevr {@code{mailbox-configuration} parameter} string auto -@samp{create} will automatically create this mailbox. @samp{subscribe} will -both create and subscribe to the mailbox. Defaults to @samp{"no"}. +@deftypevr {paramètre de @code{mailbox-configuration}} string auto +@samp{create} créera automatiquement cette boîte aux lettres. +@samp{subscribe} créera et souscrira à la boîte aux lettres. La valeur par +défaut est @samp{"no"}. @end deftypevr -@deftypevr {@code{mailbox-configuration} parameter} space-separated-string-list special-use -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{()}. +@deftypevr {paramètre de @code{mailbox-configuration}} space-separated-string-list special-use +Liste des attributs @code{SPECIAL-USE} IMAP spécifiés par la RFC 6154. Les +valeurs valides sont @code{\All}, @code{\Archive}, @code{\Drafts}, +@code{\Flagged}, @code{\Junk}, @code{\Sent} et @code{\Trash}. La valeur par +défaut est @samp{()}. @end deftypevr @end deftypevr @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} file-name base-dir -Base directory where to store runtime data. Defaults to -@samp{"/var/run/dovecot/"}. +@deftypevr {paramètre de @code{dovecot-configuration}} file-name base-dir +Répertoire de base où stocker les données d'exécution. La valeur par défaut +est @samp{"/var/run/dovecot/"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string login-greeting -Greeting message for clients. Defaults to @samp{"Dovecot ready."}. +@deftypevr {paramètre de @code{dovecot-configuration}} string login-greeting +Message d'accueil pour les clients. La valeur par défaut est @samp{"Dovecot +ready."}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} space-separated-string-list login-trusted-networks -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{()}. +@deftypevr {paramètre de @code{dovecot-configuration}} space-separated-string-list login-trusted-networks +Liste des groupes d'adresses de confiance. Les connexions depuis ces IP +sont autorisées à modifier leurs adresses IP et leurs ports (pour la +connexion et la vérification d'authentification). +@samp{disable-plaintext-auth} est aussi ignoré pour ces réseaux. +Typiquement vous voudrez spécifier votre mandataire IMAP ici. La valeur par +défaut est @samp{()}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} space-separated-string-list login-access-sockets -List of login access check sockets (e.g. tcpwrap). Defaults to @samp{()}. +@deftypevr {paramètre de @code{dovecot-configuration}} space-separated-string-list login-access-sockets +Liste des sockets de vérification d'accès de connexion (p.@: ex.@: +tcpwrap). La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean verbose-proctitle? -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}. +@deftypevr {paramètre de @code{dovecot-configuration}} boolean verbose-proctitle? +Montre des titres de processus plus verbeux (dans ps). Actuellement, montre +le nom d'utilisateur et l'adresse IP. Utile pour voir qui utilise les +processus IMAP (p.@: ex.@: des boîtes aux lettres partagées ou si le même +uid est utilisé pour plusieurs comptes). La valeur par défaut est +@samp{#f}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean shutdown-clients? -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}. +@deftypevr {paramètre de @code{dovecot-configuration}} boolean shutdown-clients? +Indique si les processus devraient toujours être tués lorsque le processus +maître de Dovecot est éteint. La valeur @code{#f} signifie que Dovecot peut +être mis à jour sans forcer les connexions clientes existantes à se fermer +(bien que cela puisse être un problème si la mise à jour est un correctif de +sécurité par exemple). La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer doveadm-worker-count -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}. +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer doveadm-worker-count +Si la valeur n'est pas zéro, lance les commandes de courriel via ce nombre +de connexions au serveur doveadm au lieu de les lancer dans le même +processus. La valeur par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string doveadm-socket-path -UNIX socket or host:port used for connecting to doveadm server. Defaults to -@samp{"doveadm-server"}. +@deftypevr {paramètre de @code{dovecot-configuration}} string doveadm-socket-path +Socket UNIX ou hôte:port utilisé pour se connecter au serveur doveadm. La +valeur par défaut est @samp{"doveadm-server"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} space-separated-string-list import-environment -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. +@deftypevr {paramètre de @code{dovecot-configuration}} space-separated-string-list import-environment +Liste des variables d'environnement qui sont préservées au démarrage de +Dovecot et passées à tous ses processus fils. Vous pouvez aussi donner des +paires clef=valeur pour toujours spécifier ce paramètre. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean disable-plaintext-auth? -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}. +@deftypevr {paramètre de @code{dovecot-configuration}} boolean disable-plaintext-auth? +Désactive la commande LOGIN et toutes les autres authentifications en texte +clair à moins que SSL/TLS ne soit utilisé (capacité LOGINDISABLED). +Remarquez que si l'IP distante correspond à l'IP locale (c.-à-d.@: que vous +vous connectez depuis le même ordinateur), la connexion est considérée comme +sécurisée et l'authentification en texte clair est permise. Voir aussi le +paramètre ssl=required. La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer auth-cache-size -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}. +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer auth-cache-size +Taille du cache d'authentification (p.@: ex.@: @samp{#e10e6}). 0 signifie +qu'il est désactivé. Remarquez que bsdauth, PAM et vpopmail ont besoin que +@samp{cache-key} soit indiqué pour que le cache soit utilisé. La valeur par +défaut est @samp{0}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string auth-cache-ttl -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"}. +@deftypevr {paramètre de @code{dovecot-configuration}} string auth-cache-ttl +Durée de vie des données en cache. Après l'expiration du TTL +l'enregistrement en cache n'est plus utilisé *sauf* si la requête à la base +de données principale revoie une erreur interne. Nous essayons aussi de +gérer les changements de mot de passe automatiquement : si +l'authentification précédente de l'utilisateur était réussie mais pas +celle-ci, le cache n'est pas utilisé. Pour l'instant cela fonctionne avec +l'authentification en texte clair uniquement. La valeur par défaut est +@samp{"1 hour"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string auth-cache-negative-ttl -TTL for negative hits (user not found, password mismatch). 0 disables -caching them completely. Defaults to @samp{"1 hour"}. +@deftypevr {paramètre de @code{dovecot-configuration}} string auth-cache-negative-ttl +TTL pour les résultats négatifs (l'utilisateur n'est pas trouvé ou le mot de +passe ne correspond pas). 0 désactive la mise en cache complètement. La +valeur par défaut est @samp{"1 hour"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} space-separated-string-list auth-realms -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{()}. +@deftypevr {paramètre de @code{dovecot-configuration}} space-separated-string-list auth-realms +Liste des domaines pour les mécanismes d'authentification SASL qui en ont +besoin. Vous pouvez laisser ce paramètre vide si vous ne voulez pas +utiliser plusieurs domaines. Beaucoup de clients utilisent le premier +domaine listé ici, donc gardez celui par défaut en premier. La valeur par +défaut est @samp{()} @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string auth-default-realm -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{""}. +@deftypevr {paramètre de @code{dovecot-configuration}} string auth-default-realm +Domaine par défaut à utiliser si aucun n'est spécifié. C'est utilisé pour +les domaines SASL et pour ajouter @@domaine au nom d'utilisateur dans les +authentification en texte clair. La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string auth-username-chars -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.-_@@"}. +@deftypevr {paramètre de @code{dovecot-configuration}} string auth-username-chars +Liste des caractères autorisés dans les noms d'utilisateur. Si le nom +d'utilisateur donné par l'utilisateur contient un caractère qui n'est pas +listé ici, la connexion échoue automatiquement. C'est juste une +vérification supplémentaire pour s'assure que l'utilisateur ne puisse pas +exploiter des vulnérabilités potentielles d'échappement de guillemets avec +les bases de données SQL/LDAP. Si vous voulez autoriser tous les +caractères, indiquez la liste vide. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string auth-username-translation -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{""}. +@deftypevr {paramètre de @code{dovecot-configuration}} string auth-username-translation +Traduction de caractères dans les noms d'utilisateur avant qu'ils ne soient +cherchés en base. La valeur contient une série de caractère de -> à. Par +exemple @samp{#@@/@@} signifie que @samp{#} et @samp{/} sont traduits en +@samp{@@}. La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string auth-username-format -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"}. +@deftypevr {paramètre de @code{dovecot-configuration}} string auth-username-format +Format des noms d'utilisateur avant qu'ils ne soient cherchés en base. Vous +pouvez utiliser les variables standard ici, p.@: ex.@: %Lu est le nom +d'utilisateur en minuscule, %n enlève le domaine s'il est donné ou +@samp{%n-AT-%d} changerait le @samp{@@} en @samp{-AT-}. Cette traduction +est faite après les changements de @samp{auth-username-translation}. La +valeur par défaut est @samp{"%Lu"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string auth-master-user-separator -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{""}. +@deftypevr {paramètre de @code{dovecot-configuration}} string auth-master-user-separator +Si vous voulez permettre aux utilisateurs maîtres de se connecter en +spécifiant le nom d'utilisateur maître dans la chaîne de nom d'utilisateur +normal (c.-à-d.@: sans utiliser le support du mécanisme SASL pour cela), +vous pouvez spécifier le caractère de séparation ici. Le format est ensuite +. UW-IMAP utilise +@samp{*} comme séparateur, donc ça pourrait être un bon choix. La valeur +par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string auth-anonymous-username -Username to use for users logging in with ANONYMOUS SASL mechanism. -Defaults to @samp{"anonymous"}. +@deftypevr {paramètre de @code{dovecot-configuration}} string auth-anonymous-username +Nom d'utilisateur à utiliser pour les utilisateurs qui se connectent avec le +mécanisme SASL ANONYMOUS. La valeur par défaut est @samp{"anonymous"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer auth-worker-max-count -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}. +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer auth-worker-max-count +Nombre maximum de processus de travail dovecot-auth. Ils sont utilisés pour +exécuter des requêtes passdb et userdb bloquantes (p.@: ex.@: MySQL et +PAM). Ils sont créés automatiquement et détruits au besoin. La valeur par +défaut est @samp{30}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string auth-gssapi-hostname -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{""}. +@deftypevr {paramètre de @code{dovecot-configuration}} string auth-gssapi-hostname +Nom d'hôte à utiliser dans les noms GSSAPI principaux. La valeur par défaut +est d'utiliser le nom renvoyé par gethostname(). Utilisez @samp{$ALL} (avec +des guillemets) pour permettre toutes les entrées keytab. La valeur par +défaut est @samp{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string auth-krb5-keytab -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{""}. +@deftypevr {paramètre de @code{dovecot-configuration}} string auth-krb5-keytab +Keytab Kerberos à utiliser pour le mécanisme GSSAPI. Utilisera la valeur +par défaut du système (typiquement @file{/etc/krb5.keytab}) s'il n'est pas +spécifié. Vous pourriez avoir besoin de faire en sorte que le service +d'authentification tourne en root pour pouvoir lire ce fichier. La valeur +par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean auth-use-winbind? -Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and -@samp{ntlm-auth} helper. . -Defaults to @samp{#f}. +@deftypevr {paramètre de @code{dovecot-configuration}} boolean auth-use-winbind? +Effectue l'authentification NTLM et GSS-SPNEGO avec le démon winbind de +Samba et l'utilitaire @samp{ntlm-auth}. +. La valeur par défaut est +@samp{#f}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} file-name auth-winbind-helper-path -Path for Samba's @samp{ntlm-auth} helper binary. Defaults to +@deftypevr {paramètre de @code{dovecot-configuration}} file-name auth-winbind-helper-path +Chemin du binaire @samp{ntlm-auth} de samba. La valeur par défaut est @samp{"/usr/bin/ntlm_auth"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string auth-failure-delay -Time to delay before replying to failed authentications. Defaults to -@samp{"2 secs"}. +@deftypevr {paramètre de @code{dovecot-configuration}} string auth-failure-delay +Durée d'attente avant de répondre à des authentifications échouées. La +valeur par défaut est @samp{"2 secs"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean auth-ssl-require-client-cert? -Require a valid SSL client certificate or the authentication fails. -Defaults to @samp{#f}. +@deftypevr {paramètre de @code{dovecot-configuration}} boolean auth-ssl-require-client-cert? +Requiert un certification client SSL valide ou l'authentification échoue. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean auth-ssl-username-from-cert? -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}. +@deftypevr {paramètre de @code{dovecot-configuration}} boolean auth-ssl-username-from-cert? +Prend le nom d'utilisateur du certificat SSL client, avec +@code{X509_NAME_get_text_by_NID()} qui renvoie le CommonName du DN du +sujet. La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} space-separated-string-list auth-mechanisms -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. +@deftypevr {paramètre de @code{dovecot-configuration}} space-separated-string-list auth-mechanisms +Liste des mécanismes d'authentification souhaités. Les mécanismes supportés +sont : @samp{plain}, @samp{login}, @samp{digest-md5}, @samp{cram-md5}, +@samp{ntlm}, @samp{rpa}, @samp{apop}, @samp{anonymous}, @samp{gssapi}, +@samp{otp}, @samp{skey} et @samp{gss-spnego}. Remarquez : Voir aussi le +paramètre @samp{disable-plaintext-auth}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} space-separated-string-list director-servers -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{()}. +@deftypevr {paramètre de @code{dovecot-configuration}} space-separated-string-list director-servers +Liste des IP ou des noms d'hôtes des serveurs directeurs, dont soi-même. +Les ports peuvent être spécifiés avec ip:port. Le port par défaut est le +même que le @samp{inet-listener} du service directeur. La valeur par défaut +est @samp{()}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} space-separated-string-list director-mail-servers -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{()}. +@deftypevr {paramètre de @code{dovecot-configuration}} space-separated-string-list director-mail-servers +Liste des IP ou des noms d'hôtes de tous les serveurs de courriel de la +grappe. Les intervalles sont aussi permis, comme 10.0.0.10-10.0.0.30. La +valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string director-user-expire -How long to redirect users to a specific server after it no longer has any -connections. Defaults to @samp{"15 min"}. +@deftypevr {paramètre de @code{dovecot-configuration}} string director-user-expire +Combien de temps avant de rediriger les utilisateurs à un serveur spécifique +après qu'il n'y a plus de connexion. La valeur par défaut est @samp{"15 +min"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string director-username-hash -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"}. +@deftypevr {paramètre de @code{dovecot-configuration}} string director-username-hash +La manière de traduire le nom d'utilisateur avant de le hasher. Les valeurs +utiles comprennent %Ln si l'utilisateur peut se connecter avec ou sans +@@domain, %Ld si les boîtes aux lettres sont partagées dans le domaine. La +valeur par défaut est @samp{"%Lu"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string log-path -Log file to use for error messages. @samp{syslog} logs to syslog, -@samp{/dev/stderr} logs to stderr. Defaults to @samp{"syslog"}. +@deftypevr {paramètre de @code{dovecot-configuration}} string log-path +Fichier de journal à utiliser pour les messages d'erreur. @samp{syslog} +journalise vers syslog, @samp{/dev/stderr} vers la sortie d'erreur. La +valeur par défaut est @samp{"syslog"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string info-log-path -Log file to use for informational messages. Defaults to @samp{log-path}. -Defaults to @samp{""}. +@deftypevr {paramètre de @code{dovecot-configuration}} string info-log-path +Fichier de journal à utiliser pour les messages d'information. La valeur +par défaut est @samp{log-path}. La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string debug-log-path -Log file to use for debug messages. Defaults to @samp{info-log-path}. -Defaults to @samp{""}. +@deftypevr {paramètre de @code{dovecot-configuration}} string debug-log-path +Fichier de journal à utiliser pour les messages de débogage. La valeur par +défaut est @samp{info-log-path}. La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string syslog-facility -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"}. +@deftypevr {paramètre de @code{dovecot-configuration}} string syslog-facility +Dispositif syslog à utiliser si vous journalisez avec syslog. Normalement +si vous ne voulez pas utiliser @samp{mail}, vous voudrez utiliser +local0..local7. D'autres dispositifs standard sont supportés. La valeur +par défaut est @samp{"mail"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean auth-verbose? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean auth-verbose? Log unsuccessful authentication attempts and the reasons why they failed. Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean auth-verbose-passwords? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean auth-verbose-passwords? 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 @@ -14255,48 +14545,48 @@ again. You can also truncate the value to n chars by appending ":n" (e.g. sha1:6). Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean auth-debug? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean auth-debug? Even more verbose logging for debugging purposes. Shows for example SQL queries. Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean auth-debug-passwords? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean auth-debug-passwords? 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean mail-debug? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean mail-debug? Enable mail process debugging. This can help you figure out why Dovecot isn't finding your mails. Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean verbose-ssl? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean verbose-ssl? Show protocol level SSL errors. Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string log-timestamp +@deftypevr {paramètre de @code{dovecot-configuration}} string log-timestamp Prefix for each line written to log file. % codes are in strftime(3) format. Defaults to @samp{"\"%b %d %H:%M:%S \""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} space-separated-string-list login-log-format-elements +@deftypevr {paramètre de @code{dovecot-configuration}} space-separated-string-list login-log-format-elements 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. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string login-log-format +@deftypevr {paramètre de @code{dovecot-configuration}} string login-log-format Login log format. %s contains @samp{login-log-format-elements} string, %$ contains the data we want to log. Defaults to @samp{"%$: %s"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mail-log-prefix +@deftypevr {paramètre de @code{dovecot-configuration}} string mail-log-prefix 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@}>: \""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string deliver-log-format +@deftypevr {paramètre de @code{dovecot-configuration}} string deliver-log-format Format to use for logging mail deliveries. You can use variables: @table @code @item %$ @@ -14312,10 +14602,10 @@ Physical size @item %w Virtual size. @end table -Defaults to @samp{"msgid=%m: %$"}. +La valeur par défaut est @samp{"msgid=%m: %$"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mail-location +@deftypevr {paramètre de @code{dovecot-configuration}} string mail-location 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 @@ -14345,28 +14635,28 @@ See doc/wiki/Variables.txt for full list. Some examples: @item mbox:~/mail:INBOX=/var/mail/%u @item mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/% @end table -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mail-uid +@deftypevr {paramètre de @code{dovecot-configuration}} string mail-uid 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{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mail-gid +@deftypevr {paramètre de @code{dovecot-configuration}} string mail-gid -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mail-privileged-group +@deftypevr {paramètre de @code{dovecot-configuration}} string mail-privileged-group 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{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mail-access-groups +@deftypevr {paramètre de @code{dovecot-configuration}} string mail-access-groups 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 @@ -14375,25 +14665,25 @@ mailboxes, or ln -s /secret/shared/box ~/mail/mybox would allow reading it). Defaults to @samp{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean mail-full-filesystem-access? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean mail-full-filesystem-access? 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean mmap-disable? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean mmap-disable? 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean dotlock-use-excl? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean dotlock-use-excl? 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mail-fsync +@deftypevr {paramètre de @code{dovecot-configuration}} string mail-fsync When to use fsync() or fdatasync() calls: @table @code @item optimized @@ -14403,62 +14693,62 @@ Useful with e.g. NFS when write()s are delayed @item never Never use it (best performance, but crashes can lose data). @end table -Defaults to @samp{"optimized"}. +La valeur par défaut est @samp{"optimized"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean mail-nfs-storage? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean mail-nfs-storage? 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean mail-nfs-index? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean mail-nfs-index? 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string lock-method +@deftypevr {paramètre de @code{dovecot-configuration}} string lock-method 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"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} file-name mail-temp-dir +@deftypevr {paramètre de @code{dovecot-configuration}} file-name mail-temp-dir Directory in which LDA/LMTP temporarily stores incoming mails >128 kB. Defaults to @samp{"/tmp"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer first-valid-uid +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer first-valid-uid 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer last-valid-uid +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer last-valid-uid -Defaults to @samp{0}. +La valeur par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer first-valid-gid +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer first-valid-gid 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer last-valid-gid +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer last-valid-gid -Defaults to @samp{0}. +La valeur par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer mail-max-keyword-length +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer mail-max-keyword-length Maximum allowed length for mail keyword name. It's only forced when trying to create new keywords. Defaults to @samp{50}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} colon-separated-file-name-list valid-chroot-dirs +@deftypevr {paramètre de @code{dovecot-configuration}} colon-separated-file-name-list valid-chroot-dirs 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 @@ -14468,7 +14758,7 @@ lead to root exploit. Usually this should be done only if you don't allow shell access for users. . Defaults to @samp{()}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mail-chroot +@deftypevr {paramètre de @code{dovecot-configuration}} string mail-chroot 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 @@ -14478,30 +14768,30 @@ chroot directory, append "/." to @samp{mail-chroot}. . Defaults to @samp{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} file-name auth-socket-path +@deftypevr {paramètre de @code{dovecot-configuration}} file-name auth-socket-path 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"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} file-name mail-plugin-dir +@deftypevr {paramètre de @code{dovecot-configuration}} file-name mail-plugin-dir Directory where to look up mail plugins. Defaults to @samp{"/usr/lib/dovecot"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} space-separated-string-list mail-plugins +@deftypevr {paramètre de @code{dovecot-configuration}} space-separated-string-list mail-plugins 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{()}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer mail-cache-min-mail-count +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer mail-cache-min-mail-count 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mailbox-idle-check-interval +@deftypevr {paramètre de @code{dovecot-configuration}} string mailbox-idle-check-interval 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 @@ -14509,7 +14799,7 @@ and kqueue to find out immediately when changes occur. Defaults to @samp{"30 secs"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean mail-save-crlf? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean mail-save-crlf? 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 @@ -14517,7 +14807,7 @@ note that if other software reads the mboxes/maildirs, they may handle the extra CRs wrong and cause problems. Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean maildir-stat-dirs? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean maildir-stat-dirs? 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 @@ -14525,19 +14815,19 @@ 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean maildir-copy-with-hardlinks? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean maildir-copy-with-hardlinks? 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean maildir-very-dirty-syncs? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean maildir-very-dirty-syncs? 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} space-separated-string-list mbox-read-locks +@deftypevr {paramètre de @code{dovecot-configuration}} space-separated-string-list mbox-read-locks Which locking methods to use for locking mbox. There are four available: @table @code @@ -14562,21 +14852,21 @@ locking methods as well. Some operating systems don't allow using some of them simultaneously. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} space-separated-string-list mbox-write-locks +@deftypevr {paramètre de @code{dovecot-configuration}} space-separated-string-list mbox-write-locks @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mbox-lock-timeout +@deftypevr {paramètre de @code{dovecot-configuration}} string mbox-lock-timeout Maximum time to wait for lock (all of them) before aborting. Defaults to @samp{"5 mins"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mbox-dotlock-change-timeout +@deftypevr {paramètre de @code{dovecot-configuration}} string mbox-dotlock-change-timeout 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"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean mbox-dirty-syncs? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean mbox-dirty-syncs? 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 @@ -14588,42 +14878,42 @@ immediately. Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK commands. Defaults to @samp{#t}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean mbox-very-dirty-syncs? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean mbox-very-dirty-syncs? 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean mbox-lazy-writes? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean mbox-lazy-writes? 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer mbox-min-index-size +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer mbox-min-index-size 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer mdbox-rotate-size +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer mdbox-rotate-size Maximum dbox file size until it's rotated. Defaults to @samp{10000000}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mdbox-rotate-interval +@deftypevr {paramètre de @code{dovecot-configuration}} string mdbox-rotate-interval 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"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean mdbox-preallocate-space? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean mdbox-preallocate-space? 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mail-attachment-dir +@deftypevr {paramètre de @code{dovecot-configuration}} string mail-attachment-dir 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. @@ -14634,13 +14924,13 @@ Directory root where to store mail attachments. Disabled, if empty. Defaults to @samp{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer mail-attachment-min-size +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer mail-attachment-min-size 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mail-attachment-fs +@deftypevr {paramètre de @code{dovecot-configuration}} string mail-attachment-fs File system backend to use for saving attachments: @table @code @item posix @@ -14650,10 +14940,10 @@ SiS with immediate byte-by-byte comparison during saving @item sis-queue posix SiS with delayed comparison and deduplication. @end table -Defaults to @samp{"sis posix"}. +La valeur par défaut est @samp{"sis posix"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string mail-attachment-hash +@deftypevr {paramètre de @code{dovecot-configuration}} string mail-attachment-hash 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 @@ -14661,126 +14951,126 @@ truncated, e.g. @code{%@{sha256:80@}} returns only first 80 bits. Defaults to @samp{"%@{sha1@}"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer default-process-limit +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer default-process-limit -Defaults to @samp{100}. +La valeur par défaut est @samp{100}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer default-client-limit +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer default-client-limit -Defaults to @samp{1000}. +La valeur par défaut est @samp{1000}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer default-vsz-limit +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer default-vsz-limit 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string default-login-user +@deftypevr {paramètre de @code{dovecot-configuration}} string default-login-user 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"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string default-internal-user +@deftypevr {paramètre de @code{dovecot-configuration}} string default-internal-user 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"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string ssl? +@deftypevr {paramètre de @code{dovecot-configuration}} string ssl? SSL/TLS support: yes, no, required. . Defaults to @samp{"required"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string ssl-cert +@deftypevr {paramètre de @code{dovecot-configuration}} string ssl-cert PEM encoded X.509 SSL/TLS certificate (public key). Defaults to @samp{" was automatically rejected:%n%r"}. +La valeur par défaut est @samp{"Your message to <%t> was automatically +rejected:%n%r"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string recipient-delimiter +@deftypevr {paramètre de @code{dovecot-configuration}} string recipient-delimiter Delimiter character between local-part and detail in email address. Defaults to @samp{"+"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string lda-original-recipient-header +@deftypevr {paramètre de @code{dovecot-configuration}} string lda-original-recipient-header 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{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean lda-mailbox-autocreate? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean lda-mailbox-autocreate? Should saving a mail to a nonexistent mailbox automatically create it?. Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} boolean lda-mailbox-autosubscribe? +@deftypevr {paramètre de @code{dovecot-configuration}} boolean lda-mailbox-autosubscribe? Should automatically created mailboxes be also automatically subscribed?. Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} non-negative-integer imap-max-line-length +@deftypevr {paramètre de @code{dovecot-configuration}} non-negative-integer imap-max-line-length 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}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string imap-logout-format +@deftypevr {paramètre de @code{dovecot-configuration}} string imap-logout-format IMAP logout format string: @table @code @item %i @@ -14840,30 +15131,30 @@ hdr_bytes=%@{fetch_hdr_bytes@} body_count=%@{fetch_body_count@} body_bytes=%@{fetch_body_bytes@}"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string imap-capability +@deftypevr {paramètre de @code{dovecot-configuration}} string imap-capability 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{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string imap-idle-notify-interval +@deftypevr {paramètre de @code{dovecot-configuration}} string imap-idle-notify-interval How long to wait between "OK Still here" notifications when client is IDLEing. Defaults to @samp{"2 mins"}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string imap-id-send +@deftypevr {paramètre de @code{dovecot-configuration}} string imap-id-send 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{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string imap-id-log +@deftypevr {paramètre de @code{dovecot-configuration}} string imap-id-log ID fields sent by client to log. * means everything. Defaults to @samp{""}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} space-separated-string-list imap-client-workarounds +@deftypevr {paramètre de @code{dovecot-configuration}} space-separated-string-list imap-client-workarounds Workarounds for various client bugs: @table @code @@ -14884,10 +15175,10 @@ Show \Noselect flags for LSUB replies with LAYOUT=fs (e.g. mbox). This makes Thunderbird realize they aren't selectable and show them greyed out, instead of only later giving "not selectable" popup error. @end table -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{dovecot-configuration} parameter} string imap-urlauth-host +@deftypevr {paramètre de @code{dovecot-configuration}} string imap-urlauth-host Host allowed in URLAUTH URLs sent by client. "*" allows all. Defaults to @samp{""}. @end deftypevr @@ -14905,13 +15196,13 @@ as the @code{#:config} parameter to @code{dovecot-service}. As its name indicates, an opaque configuration does not have easy reflective capabilities. -Available @code{opaque-dovecot-configuration} fields are: +Les champs de @code{opaque-dovecot-configuration} disponibles sont : -@deftypevr {@code{opaque-dovecot-configuration} parameter} package dovecot -The dovecot package. +@deftypevr {paramètre de @code{opaque-dovecot-configuration}} package dovecot +Le paquet dovecot @end deftypevr -@deftypevr {@code{opaque-dovecot-configuration} parameter} string string +@deftypevr {paramètre de @code{opaque-dovecot-configuration}} string string The contents of the @code{dovecot.conf}, as a string. @end deftypevr @@ -14926,7 +15217,7 @@ instantiate a dovecot service like this: @subsubheading OpenSMTPD Service -@deffn {Scheme Variable} opensmtpd-service-type +@deffn {Variable Scheme} opensmtpd-service-type This is the type of the @uref{https://www.opensmtpd.org, OpenSMTPD} service, whose value should be an @code{opensmtpd-configuration} object as in this example: @@ -14938,14 +15229,14 @@ example: @end example @end deffn -@deftp {Data Type} opensmtpd-configuration +@deftp {Type de données} opensmtpd-configuration Data type representing the configuration of opensmtpd. @table @asis -@item @code{package} (default: @var{opensmtpd}) +@item @code{package} (par défaut : @var{opensmtpd}) Package object of the OpenSMTPD SMTP server. -@item @code{config-file} (default: @var{%default-opensmtpd-file}) +@item @code{config-file} (par défaut : @var{%default-opensmtpd-file}) File-like object of the OpenSMTPD configuration file to use. By default it listens on the loopback network interface, and allows for mail from users and daemons on the local machine, as well as permitting email to remote @@ -14960,7 +15251,7 @@ servers. Run @command{man smtpd.conf} for more information. @cindex MTA (mail transfer agent) @cindex SMTP -@deffn {Scheme Variable} exim-service-type +@deffn {Variable Scheme} exim-service-type This is the type of the @uref{https://exim.org, Exim} mail transfer agent (MTA), whose value should be an @code{exim-configuration} object as in this example: @@ -14976,14 +15267,14 @@ In order to use an @code{exim-service-type} service you must also have a @code{mail-aliases-service-type} service present in your @code{operating-system} (even if it has no aliases). -@deftp {Data Type} exim-configuration +@deftp {Type de données} exim-configuration Data type representing the configuration of exim. @table @asis -@item @code{package} (default: @var{exim}) +@item @code{package} (par défaut : @var{exim}) Package object of the Exim server. -@item @code{config-file} (default: @code{#f}) +@item @code{config-file} (par défaut : @code{#f}) File-like object of the Exim configuration file to use. If its value is @code{#f} then use the default configuration file from the package provided in @code{package}. The resulting configuration file is loaded after setting @@ -14997,7 +15288,7 @@ the @code{exim_user} and @code{exim_group} configuration variables. @cindex email aliases @cindex aliases, for email addresses -@deffn {Scheme Variable} mail-aliases-service-type +@deffn {Variable Scheme} mail-aliases-service-type This is the type of the service which provides @code{/etc/aliases}, specifying how to deliver mail to users on this system. @@ -15031,7 +15322,7 @@ for messaging services: currently only Prosody is supported. @subsubheading Prosody Service -@deffn {Scheme Variable} prosody-service-type +@deffn {Variable Scheme} prosody-service-type This is the type for the @uref{https://prosody.im, Prosody XMPP communication server}. Its value must be a @code{prosody-configuration} record as in this example: @@ -15071,11 +15362,12 @@ them. See @url{https://prosody.im/doc/letsencrypt}. prosodyctl --root cert import /etc/letsencrypt/live @end example -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. Types -starting with @code{maybe-} denote parameters that won't show up in -@code{prosody.cfg.lua} when their value is @code{'disabled}. +Les paramètres de configuration disponibles sont les suivants. Chaque +définition des paramètres est précédé par son type ; par exemple, +@samp{string-list foo} indique que le paramètre @code{foo} devrait être +spécifié comme une liste de chaînes de caractères. Les types précédés de +@code{maybe-} signifient que le paramètre n'apparaîtra pas dans +@code{prosody.cfg.lua} lorsque sa valeur est @code{'disabled}. There is also a way to specify the configuration as a string, if you have an old @code{prosody.cfg.lua} file that you want to port over from some other @@ -15092,32 +15384,32 @@ The @code{file-object} type designates either a file-like object @c (generate-documentation) than to make it below and have to deal with @c the churn as Prosody updates. -Available @code{prosody-configuration} fields are: +Les champs de @code{prosody-configuration} disponibles sont : -@deftypevr {@code{prosody-configuration} parameter} package prosody +@deftypevr {paramètre de @code{prosody-configuration}} package prosody The Prosody package. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} file-name data-path +@deftypevr {paramètre de @code{prosody-configuration}} file-name data-path Location of the Prosody data storage directory. See @url{https://prosody.im/doc/configure}. Defaults to @samp{"/var/lib/prosody"}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} file-object-list plugin-paths +@deftypevr {paramètre de @code{prosody-configuration}} file-object-list plugin-paths Additional plugin directories. They are searched in all the specified paths in order. See @url{https://prosody.im/doc/plugins_directory}. Defaults to @samp{()}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} file-name certificates +@deftypevr {paramètre de @code{prosody-configuration}} file-name certificates Every virtual host and component needs a certificate so that clients and servers can securely verify its identity. Prosody will automatically load certificates/keys from the directory specified here. Defaults to @samp{"/etc/prosody/certs"}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} string-list admins +@deftypevr {paramètre de @code{prosody-configuration}} string-list admins This is a list of accounts that are admins for the server. Note that you must create the accounts separately. See @url{https://prosody.im/doc/admins} and @@ -15125,12 +15417,12 @@ must create the accounts separately. See '("user1@@example.com" "user2@@example.net"))} Defaults to @samp{()}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} boolean use-libevent? +@deftypevr {paramètre de @code{prosody-configuration}} boolean use-libevent? Enable use of libevent for better performance under high load. See @url{https://prosody.im/doc/libevent}. Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} module-list modules-enabled +@deftypevr {paramètre de @code{prosody-configuration}} module-list modules-enabled This is the list of modules Prosody will load on startup. It looks for @code{mod_modulename.lua} in the plugins folder, so make sure that exists too. Documentation on modules can be found at: @@ -15139,133 +15431,133 @@ too. Documentation on modules can be found at: "version" "uptime" "time" "ping" "pep" "register" "admin_adhoc")}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} string-list modules-disabled +@deftypevr {paramètre de @code{prosody-configuration}} string-list modules-disabled @samp{"offline"}, @samp{"c2s"} and @samp{"s2s"} are auto-loaded, but should you want to disable them then add them to this list. Defaults to @samp{()}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} file-object groups-file +@deftypevr {paramètre de @code{prosody-configuration}} file-object groups-file Path to a text file where the shared groups are defined. If this path is empty then @samp{mod_groups} does nothing. See @url{https://prosody.im/doc/modules/mod_groups}. Defaults to @samp{"/var/lib/prosody/sharedgroups.txt"}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} boolean allow-registration? +@deftypevr {paramètre de @code{prosody-configuration}} boolean allow-registration? Disable account creation by default, for security. See @url{https://prosody.im/doc/creating_accounts}. Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} maybe-ssl-configuration ssl +@deftypevr {paramètre de @code{prosody-configuration}} maybe-ssl-configuration ssl These are the SSL/TLS-related settings. Most of them are disabled so to use Prosody's defaults. If you do not completely understand these options, do not add them to your config, it is easy to lower the security of your server using them. See @url{https://prosody.im/doc/advanced_ssl_config}. -Available @code{ssl-configuration} fields are: +Les champs de @code{ssl-configuration} disponibles sont : -@deftypevr {@code{ssl-configuration} parameter} maybe-string protocol +@deftypevr {paramètre de @code{ssl-configuration}} maybe-string protocol This determines what handshake to use. @end deftypevr -@deftypevr {@code{ssl-configuration} parameter} maybe-file-name key +@deftypevr {paramètre de @code{ssl-configuration}} maybe-file-name key Path to your private key file. @end deftypevr -@deftypevr {@code{ssl-configuration} parameter} maybe-file-name certificate +@deftypevr {paramètre de @code{ssl-configuration}} maybe-file-name certificate Path to your certificate file. @end deftypevr -@deftypevr {@code{ssl-configuration} parameter} file-object capath +@deftypevr {paramètre de @code{ssl-configuration}} file-object capath Path to directory containing root certificates that you wish Prosody to trust when verifying the certificates of remote servers. Defaults to @samp{"/etc/ssl/certs"}. @end deftypevr -@deftypevr {@code{ssl-configuration} parameter} maybe-file-object cafile +@deftypevr {paramètre de @code{ssl-configuration}} maybe-file-object cafile Path to a file containing root certificates that you wish Prosody to trust. Similar to @code{capath} but with all certificates concatenated together. @end deftypevr -@deftypevr {@code{ssl-configuration} parameter} maybe-string-list verify +@deftypevr {paramètre de @code{ssl-configuration}} maybe-string-list verify A list of verification options (these mostly map to OpenSSL's @code{set_verify()} flags). @end deftypevr -@deftypevr {@code{ssl-configuration} parameter} maybe-string-list options +@deftypevr {paramètre de @code{ssl-configuration}} maybe-string-list options A list of general options relating to SSL/TLS. These map to OpenSSL's @code{set_options()}. For a full list of options available in LuaSec, see the LuaSec source. @end deftypevr -@deftypevr {@code{ssl-configuration} parameter} maybe-non-negative-integer depth +@deftypevr {paramètre de @code{ssl-configuration}} maybe-non-negative-integer depth How long a chain of certificate authorities to check when looking for a trusted root certificate. @end deftypevr -@deftypevr {@code{ssl-configuration} parameter} maybe-string ciphers +@deftypevr {paramètre de @code{ssl-configuration}} maybe-string ciphers An OpenSSL cipher string. This selects what ciphers Prosody will offer to clients, and in what order. @end deftypevr -@deftypevr {@code{ssl-configuration} parameter} maybe-file-name dhparam +@deftypevr {paramètre de @code{ssl-configuration}} maybe-file-name dhparam A path to a file containing parameters for Diffie-Hellman key exchange. You can create such a file with: @code{openssl dhparam -out /etc/prosody/certs/dh-2048.pem 2048} @end deftypevr -@deftypevr {@code{ssl-configuration} parameter} maybe-string curve +@deftypevr {paramètre de @code{ssl-configuration}} maybe-string curve Curve for Elliptic curve Diffie-Hellman. Prosody's default is @samp{"secp384r1"}. @end deftypevr -@deftypevr {@code{ssl-configuration} parameter} maybe-string-list verifyext +@deftypevr {paramètre de @code{ssl-configuration}} maybe-string-list verifyext A list of "extra" verification options. @end deftypevr -@deftypevr {@code{ssl-configuration} parameter} maybe-string password +@deftypevr {paramètre de @code{ssl-configuration}} maybe-string password Password for encrypted private keys. @end deftypevr @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} boolean c2s-require-encryption? +@deftypevr {paramètre de @code{prosody-configuration}} boolean c2s-require-encryption? Whether to force all client-to-server connections to be encrypted or not. See @url{https://prosody.im/doc/modules/mod_tls}. Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} string-list disable-sasl-mechanisms +@deftypevr {paramètre de @code{prosody-configuration}} string-list disable-sasl-mechanisms Set of mechanisms that will never be offered. See @url{https://prosody.im/doc/modules/mod_saslauth}. Defaults to @samp{("DIGEST-MD5")}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} boolean s2s-require-encryption? +@deftypevr {paramètre de @code{prosody-configuration}} boolean s2s-require-encryption? Whether to force all server-to-server connections to be encrypted or not. See @url{https://prosody.im/doc/modules/mod_tls}. Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} boolean s2s-secure-auth? +@deftypevr {paramètre de @code{prosody-configuration}} boolean s2s-secure-auth? Whether to require encryption and certificate authentication. This provides ideal security, but requires servers you communicate with to support encryption AND present valid, trusted certificates. See @url{https://prosody.im/doc/s2s#security}. Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} string-list s2s-insecure-domains +@deftypevr {paramètre de @code{prosody-configuration}} string-list s2s-insecure-domains Many servers don't support encryption or have invalid or self-signed certificates. You can list domains here that will not be required to authenticate using certificates. They will be authenticated using DNS. See @url{https://prosody.im/doc/s2s#security}. Defaults to @samp{()}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} string-list s2s-secure-domains +@deftypevr {paramètre de @code{prosody-configuration}} string-list s2s-secure-domains Even if you leave @code{s2s-secure-auth?} disabled, you can still require valid certificates for some domains by specifying a list here. See @url{https://prosody.im/doc/s2s#security}. Defaults to @samp{()}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} string authentication +@deftypevr {paramètre de @code{prosody-configuration}} string authentication Select the authentication backend to use. The default provider stores passwords in plaintext and uses Prosody's configured data storage to store the authentication data. If you do not trust your server please see @@ -15275,29 +15567,29 @@ information about using the hashed backend. See also @samp{"internal_plain"}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} maybe-string log +@deftypevr {paramètre de @code{prosody-configuration}} maybe-string log Set logging options. Advanced logging configuration is not yet supported by the GuixSD Prosody Service. See @url{https://prosody.im/doc/logging}. Defaults to @samp{"*syslog"}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} file-name pidfile +@deftypevr {paramètre de @code{prosody-configuration}} file-name pidfile File to write pid in. See @url{https://prosody.im/doc/modules/mod_posix}. Defaults to @samp{"/var/run/prosody/prosody.pid"}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} maybe-non-negative-integer http-max-content-size +@deftypevr {paramètre de @code{prosody-configuration}} maybe-non-negative-integer http-max-content-size Maximum allowed size of the HTTP body (in bytes). @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} maybe-string http-external-url +@deftypevr {paramètre de @code{prosody-configuration}} maybe-string http-external-url Some modules expose their own URL in various ways. This URL is built from the protocol, host and port used. If Prosody sits behind a proxy, the public URL will be @code{http-external-url} instead. See @url{https://prosody.im/doc/http#external_url}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} virtualhost-configuration-list virtualhosts +@deftypevr {paramètre de @code{prosody-configuration}} virtualhost-configuration-list virtualhosts A host in Prosody is a domain on which user accounts can be created. For example if you want your users to have addresses like @samp{"john.smith@@example.com"} then you need to add a host @@ -15312,7 +15604,7 @@ domain would have just one VirtualHost entry. See @url{https://prosody.im/doc/configure#virtual_host_settings}. -Available @code{virtualhost-configuration} fields are: +Les champs de @code{virtualhost-configuration} disponibles sont : all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @@ -15322,13 +15614,13 @@ all these @code{prosody-configuration} fields: @code{admins}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus: -@deftypevr {@code{virtualhost-configuration} parameter} string domain +@deftypevr {paramètre de @code{virtualhost-configuration}} string domain Domain you wish Prosody to serve. @end deftypevr @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} int-component-configuration-list int-components +@deftypevr {paramètre de @code{prosody-configuration}} int-component-configuration-list int-components Components are extra services on a server which are available to clients, usually on a subdomain of the main server (such as @samp{"mycomponent.example.com"}). Example components might be chatroom @@ -15340,7 +15632,7 @@ you wish to use for the component. See @url{https://prosody.im/doc/components}. Defaults to @samp{()}. -Available @code{int-component-configuration} fields are: +Les champs de @code{int-component-configuration} disponibles sont : all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @@ -15350,15 +15642,15 @@ all these @code{prosody-configuration} fields: @code{admins}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus: -@deftypevr {@code{int-component-configuration} parameter} string hostname +@deftypevr {paramètre de @code{int-component-configuration}} string hostname Hostname of the component. @end deftypevr -@deftypevr {@code{int-component-configuration} parameter} string plugin +@deftypevr {paramètre de @code{int-component-configuration}} string plugin Plugin you wish to use for the component. @end deftypevr -@deftypevr {@code{int-component-configuration} parameter} maybe-mod-muc-configuration mod-muc +@deftypevr {paramètre de @code{int-component-configuration}} maybe-mod-muc-configuration mod-muc Multi-user chat (MUC) is Prosody's module for allowing you to create hosted chatrooms/conferences for XMPP users. @@ -15369,14 +15661,14 @@ new to XMPP chatrooms. See also @url{https://prosody.im/doc/modules/mod_muc}. -Available @code{mod-muc-configuration} fields are: +Les champs de @code{mod-muc-configuration} disponibles sont : -@deftypevr {@code{mod-muc-configuration} parameter} string name +@deftypevr {paramètre de @code{mod-muc-configuration}} string name The name to return in service discovery responses. Defaults to @samp{"Prosody Chatrooms"}. @end deftypevr -@deftypevr {@code{mod-muc-configuration} parameter} string-or-boolean restrict-room-creation +@deftypevr {paramètre de @code{mod-muc-configuration}} string-or-boolean restrict-room-creation If @samp{#t}, this will only allow admins to create new chatrooms. Otherwise anyone can create a room. The value @samp{"local"} restricts room creation to users on the service's parent domain. @@ -15385,7 +15677,7 @@ The value @samp{"admin"} restricts to service administrators only. Defaults to @samp{#f}. @end deftypevr -@deftypevr {@code{mod-muc-configuration} parameter} non-negative-integer max-history-messages +@deftypevr {paramètre de @code{mod-muc-configuration}} non-negative-integer max-history-messages Maximum number of history messages that will be sent to the member that has just joined the room. Defaults to @samp{20}. @end deftypevr @@ -15394,12 +15686,12 @@ just joined the room. Defaults to @samp{20}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} ext-component-configuration-list ext-components +@deftypevr {paramètre de @code{prosody-configuration}} ext-component-configuration-list ext-components External components use XEP-0114, which most standalone components support. To add an external component, you simply fill the hostname field. See @url{https://prosody.im/doc/components}. Defaults to @samp{()}. -Available @code{ext-component-configuration} fields are: +Les champs de @code{ext-component-configuration} disponibles sont : all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @@ -15409,27 +15701,27 @@ all these @code{prosody-configuration} fields: @code{admins}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus: -@deftypevr {@code{ext-component-configuration} parameter} string component-secret +@deftypevr {paramètre de @code{ext-component-configuration}} string component-secret Password which the component will use to log in. @end deftypevr -@deftypevr {@code{ext-component-configuration} parameter} string hostname +@deftypevr {paramètre de @code{ext-component-configuration}} string hostname Hostname of the component. @end deftypevr @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} non-negative-integer-list component-ports +@deftypevr {paramètre de @code{prosody-configuration}} non-negative-integer-list component-ports Port(s) Prosody listens on for component connections. Defaults to @samp{(5347)}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} string component-interface +@deftypevr {paramètre de @code{prosody-configuration}} string component-interface Interface Prosody listens on for component connections. Defaults to @samp{"127.0.0.1"}. @end deftypevr -@deftypevr {@code{prosody-configuration} parameter} maybe-raw-content raw-content +@deftypevr {paramètre de @code{prosody-configuration}} maybe-raw-content raw-content Raw content that will be added to the configuration file. @end deftypevr @@ -15439,11 +15731,11 @@ record as the value of @code{prosody-service-type}. As its name indicates, an opaque configuration does not have easy reflective capabilities. Available @code{opaque-prosody-configuration} fields are: -@deftypevr {@code{opaque-prosody-configuration} parameter} package prosody +@deftypevr {paramètre de @code{opaque-prosody-configuration}} package prosody The prosody package. @end deftypevr -@deftypevr {@code{opaque-prosody-configuration} parameter} string prosody.cfg.lua +@deftypevr {paramètre de @code{opaque-prosody-configuration}} string prosody.cfg.lua The contents of the @code{prosody.cfg.lua} to use. @end deftypevr @@ -15465,7 +15757,7 @@ could instantiate a prosody service like this: @url{http://bitlbee.org,BitlBee} is a gateway that provides an IRC interface to a variety of messaging protocols such as XMPP. -@defvr {Scheme Variable} bitlbee-service-type +@defvr {Variable Scheme} bitlbee-service-type This is the service type for the @url{http://bitlbee.org,BitlBee} IRC gateway daemon. Its value is a @code{bitlbee-configuration} (see below). @@ -15477,12 +15769,12 @@ services: @end example @end defvr -@deftp {Data Type} bitlbee-configuration +@deftp {Type de données} bitlbee-configuration This is the configuration for BitlBee, with the following fields: @table @asis -@item @code{interface} (default: @code{"127.0.0.1"}) -@itemx @code{port} (default: @code{6667}) +@item @code{interface} (par défaut : @code{"127.0.0.1"}) +@itemx @code{port} (par défaut : @code{6667}) Listen on the network interface corresponding to the IP address specified in @var{interface}, on @var{port}. @@ -15490,13 +15782,13 @@ When @var{interface} is @code{127.0.0.1}, only local clients can connect; when it is @code{0.0.0.0}, connections can come from any networking interface. -@item @code{package} (default: @code{bitlbee}) -The BitlBee package to use. +@item @code{package} (par défaut : @code{bitlbee}) +Le paquet BitlBee à utiliser. @item @code{plugins} (par défaut : @code{'()}) List of plugin packages to use---e.g., @code{bitlbee-discord}. -@item @code{extra-settings} (default: @code{""}) +@item @code{extra-settings} (par défaut : @code{""}) Configuration snippet added as-is to the BitlBee configuration file. @end table @end deftp @@ -15510,7 +15802,7 @@ Configuration snippet added as-is to the BitlBee configuration file. This section describes how to set up and run a Murmur server. Murmur is the server of the @uref{https://mumble.info, Mumble} voice-over-IP (VoIP) suite. -@deftp {Data Type} murmur-configuration +@deftp {Type de données} murmur-configuration The service type for the Murmur server. An example configuration can look like this: @@ -15535,73 +15827,73 @@ with the name @code{SuperUser} use the @code{SuperUser} password that you set previously, and grant your newly registered mumble user administrator or moderator rights and create some channels. -Available @code{murmur-configuration} fields are: +Les champs de @code{murmur-configuration} disponibles sont : @table @asis -@item @code{package} (default: @code{mumble}) +@item @code{package} (par défaut : @code{mumble}) Package that contains @code{bin/murmurd}. -@item @code{user} (default: @code{"murmur"}) +@item @code{user} (par défaut : @code{"murmur"}) User who will run the Murmur server. -@item @code{group} (default: @code{"murmur"}) +@item @code{group} (par défaut : @code{"murmur"}) Group of the user who will run the murmur server. -@item @code{port} (default: @code{64738}) +@item @code{port} (par défaut : @code{64738}) Port on which the server will listen. -@item @code{welcome-text} (default: @code{""}) +@item @code{welcome-text} (par défaut : @code{""}) Welcome text sent to clients when they connect. -@item @code{server-password} (default: @code{""}) +@item @code{server-password} (par défaut : @code{""}) Password the clients have to enter in order to connect. -@item @code{max-users} (default: @code{100}) +@item @code{max-users} (par défaut : @code{100}) Maximum of users that can be connected to the server at once. -@item @code{max-user-bandwidth} (default: @code{#f}) +@item @code{max-user-bandwidth} (par défaut : @code{#f}) Maximum voice traffic a user can send per second. -@item @code{database-file} (default: @code{"/var/lib/murmur/db.sqlite"}) +@item @code{database-file} (par défaut : @code{"/var/lib/murmur/db.sqlite"}) File name of the sqlite database. The service's user will become the owner of the directory. -@item @code{log-file} (default: @code{"/var/log/murmur/murmur.log"}) +@item @code{log-file} (par défaut : @code{"/var/log/murmur/murmur.log"}) File name of the log file. The service's user will become the owner of the directory. -@item @code{autoban-attempts} (default: @code{10}) +@item @code{autoban-attempts} (par défaut : @code{10}) Maximum number of logins a user can make in @code{autoban-timeframe} without getting auto banned for @code{autoban-time}. -@item @code{autoban-timeframe} (default: @code{120}) +@item @code{autoban-timeframe} (par défaut : @code{120}) Timeframe for autoban in seconds. -@item @code{autoban-time} (default: @code{300}) +@item @code{autoban-time} (par défaut : @code{300}) Amount of time in seconds for which a client gets banned when violating the autoban limits. -@item @code{opus-threshold} (default: @code{100}) +@item @code{opus-threshold} (par défaut : @code{100}) Percentage of clients that need to support opus before switching over to opus audio codec. -@item @code{channel-nesting-limit} (default: @code{10}) +@item @code{channel-nesting-limit} (par défaut : @code{10}) How deep channels can be nested at maximum. -@item @code{channelname-regex} (default: @code{#f}) +@item @code{channelname-regex} (par défaut : @code{#f}) A string in from of a Qt regular expression that channel names must conform to. -@item @code{username-regex} (default: @code{#f}) +@item @code{username-regex} (par défaut : @code{#f}) A string in from of a Qt regular expression that user names must conform to. -@item @code{text-message-length} (default: @code{5000}) +@item @code{text-message-length} (par défaut : @code{5000}) Maximum size in bytes that a user can send in one text chat message. -@item @code{image-message-length} (default: @code{(* 128 1024)}) +@item @code{image-message-length} (par défaut : @code{(* 128 1024)}) Maximum size in bytes that a user can send in one image message. -@item @code{cert-required?} (default: @code{#f}) +@item @code{cert-required?} (par défaut : @code{#f}) If it is set to @code{#t} clients that use weak password authentification will not be accepted. Users must have completed the certificate wizard to join. @@ -15610,51 +15902,51 @@ join. Should murmur remember the last channel each user was in when they disconnected and put them into the remembered channel when they rejoin. -@item @code{allow-html?} (default: @code{#f}) +@item @code{allow-html?} (par défaut : @code{#f}) Should html be allowed in text messages, user comments, and channel descriptions. -@item @code{allow-ping?} (default: @code{#f}) +@item @code{allow-ping?} (par défaut : @code{#f}) Setting to true exposes the current user count, the maximum user count, and the server's maximum bandwidth per client to unauthenticated users. In the Mumble client, this information is shown in the Connect dialog. Disabling this setting will prevent public listing of the server. -@item @code{bonjour?} (default: @code{#f}) +@item @code{bonjour?} (par défaut : @code{#f}) Should the server advertise itself in the local network through the bonjour protocol. -@item @code{send-version?} (default: @code{#f}) +@item @code{send-version?} (par défaut : @code{#f}) Should the murmur server version be exposed in ping requests. -@item @code{log-days} (default: @code{31}) +@item @code{log-days} (par défaut : @code{31}) Murmur also stores logs in the database, which are accessible via RPC. The default is 31 days of months, but you can set this setting to 0 to keep logs forever, or -1 to disable logging to the database. -@item @code{obfuscate-ips?} (default @code{#t}) +@item @code{obfuscate-ips?} (par défaut : @code{#t}) Should logged ips be obfuscated to protect the privacy of users. -@item @code{ssl-cert} (default: @code{#f}) +@item @code{ssl-cert} (par défaut : @code{#f}) File name of the SSL/TLS certificate used for encrypted connections. @example (ssl-cert "/etc/letsencrypt/live/example.com/fullchain.pem") @end example -@item @code{ssl-key} (default: @code{#f}) +@item @code{ssl-key} (par défaut : @code{#f}) Filepath to the ssl private key used for encrypted connections. @example (ssl-key "/etc/letsencrypt/live/example.com/privkey.pem") @end example -@item @code{ssl-dh-params} (default: @code{#f}) +@item @code{ssl-dh-params} (par défaut : @code{#f}) File name of a PEM-encoded file with Diffie-Hellman parameters for the SSL/TLS encryption. Alternatively you set it to @code{"@@ffdhe2048"}, @code{"@@ffdhe3072"}, @code{"@@ffdhe4096"}, @code{"@@ffdhe6144"} or @code{"@@ffdhe8192"} to use bundled parameters from RFC 7919. -@item @code{ssl-ciphers} (default: @code{#f}) +@item @code{ssl-ciphers} (par défaut : @code{#f}) The @code{ssl-ciphers} option chooses the cipher suites to make available for use in SSL/TLS. @@ -15672,7 +15964,7 @@ 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. -@item @code{public-registration} (default: @code{#f}) +@item @code{public-registration} (par défaut : @code{#f}) Must be a @code{} record or @code{#f}. @@ -15683,12 +15975,12 @@ you have set a @code{server-password}, or set @code{allow-ping} to It might take a few hours until it shows up in the public list. -@item @code{file} (default: @code{#f}) +@item @code{file} (par défaut : @code{#f}) Optional alternative override for this configuration. @end table @end deftp -@deftp {Data Type} murmur-public-registration-configuration +@deftp {Type de données} murmur-public-registration-configuration Configuration for public registration of a murmur service. @table @asis @@ -15703,7 +15995,7 @@ same password. Don't lose your password. @item @code{url} This should be a @code{http://} or @code{https://} link to your web site. -@item @code{hostname} (default: @code{#f}) +@item @code{hostname} (par défaut : @code{#f}) 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. @end table @@ -15738,12 +16030,12 @@ The following example customises more of the Tailon configuration, adding @end example -@deftp {Data Type} tailon-configuration +@deftp {Type de données} tailon-configuration Data type representing the configuration of Tailon. This type has the following parameters: @table @asis -@item @code{config-file} (default: @code{(tailon-configuration-file)}) +@item @code{config-file} (par défaut : @code{(tailon-configuration-file)}) 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}). @@ -15757,53 +16049,53 @@ be used: (config-file (local-file "./my-tailon.conf")))) @end example -@item @code{package} (default: @code{tailon}) -The tailon package to use. +@item @code{package} (par défaut : @code{tailon}) +Le paquet tailon à utiliser. @end table @end deftp -@deftp {Data Type} tailon-configuration-file +@deftp {Type de données} tailon-configuration-file Data type representing the configuration options for Tailon. This type has the following parameters: @table @asis -@item @code{files} (default: @code{(list "/var/log")}) +@item @code{files} (par défaut : @code{(list "/var/log")}) 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. -@item @code{bind} (default: @code{"localhost:8080"}) +@item @code{bind} (par défaut : @code{"localhost:8080"}) Address and port to which Tailon should bind on. -@item @code{relative-root} (default: @code{#f}) +@item @code{relative-root} (par défaut : @code{#f}) URL path to use for Tailon, set to @code{#f} to not use a path. -@item @code{allow-transfers?} (default: @code{#t}) +@item @code{allow-transfers?} (par défaut : @code{#t}) Allow downloading the log files in the web interface. -@item @code{follow-names?} (default: @code{#t}) +@item @code{follow-names?} (par défaut : @code{#t}) Allow tailing of not-yet existent files. -@item @code{tail-lines} (default: @code{200}) +@item @code{tail-lines} (par défaut : @code{200}) Number of lines to read initially from each file. -@item @code{allowed-commands} (default: @code{(list "tail" "grep" "awk")}) +@item @code{allowed-commands} (par défaut : @code{(list "tail" "grep" "awk")}) Commands to allow running. By default, @code{sed} is disabled. -@item @code{debug?} (default: @code{#f}) +@item @code{debug?} (par défaut : @code{#f}) Set @code{debug?} to @code{#t} to show debug messages. -@item @code{wrap-lines} (default: @code{#t}) +@item @code{wrap-lines} (par défaut : @code{#t}) 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. -@item @code{http-auth} (default: @code{#f}) +@item @code{http-auth} (par défaut : @code{#f}) HTTP authentication type to use. Set to @code{#f} to disable authentication (the default). Supported values are @code{"digest"} or @code{"basic"}. -@item @code{users} (default: @code{#f}) +@item @code{users} (par défaut : @code{#f}) 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 @@ -15825,7 +16117,7 @@ element of the pair is the password. Darkstat is a packet sniffer that captures network traffic, calculates statistics about usage, and serves reports over HTTP. -@defvar {Scheme Variable} darkstat-service-type +@defvar {Variable Scheme} darkstat-service-type 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: @@ -15837,23 +16129,23 @@ as in this example: @end example @end defvar -@deftp {Data Type} darkstat-configuration +@deftp {Type de données} darkstat-configuration Data type representing the configuration of @command{darkstat}. @table @asis -@item @code{package} (default: @code{darkstat}) -The darkstat package to use. +@item @code{package} (par défaut : @code{darkstat}) +Le paquet darkstat à utiliser. @item @code{interface} Capture traffic on the specified network interface. -@item @code{port} (default: @code{"667"}) +@item @code{port} (par défaut : @code{"667"}) Bind the web interface to the specified port. -@item @code{bind-address} (default: @code{"127.0.0.1"}) +@item @code{bind-address} (par défaut : @code{"127.0.0.1"}) Bind the web interface to the specified address. -@item @code{base} (default: @code{"/"}) +@item @code{base} (par défaut : @code{"/"}) Specify the path of the base URL. This can be useful if @command{darkstat} is accessed via a reverse proxy. @@ -15912,7 +16204,7 @@ 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. -@defvr {Scheme Variable} krb5-service-type +@defvr {Variable Scheme} krb5-service-type A service type for Kerberos 5 clients. @end defvr @@ -15951,7 +16243,7 @@ more detailed explanation of each, see the MIT documentation. -@deftp {Data Type} krb5-realm +@deftp {Type de données} krb5-realm @cindex realm, kerberos @table @asis @item @code{name} @@ -15969,14 +16261,14 @@ realm. @end table @end deftp -@deftp {Data Type} krb5-configuration +@deftp {Type de données} krb5-configuration @table @asis -@item @code{allow-weak-crypto?} (default: @code{#f}) +@item @code{allow-weak-crypto?} (par défaut : @code{#f}) If this flag is @code{#t} then services which only offer encryption algorithms known to be weak will be accepted. -@item @code{default-realm} (default: @code{#f}) +@item @code{default-realm} (par défaut : @code{#f}) 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 @@ -15997,18 +16289,18 @@ 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. -@defvr {Scheme Variable} pam-krb5-service-type +@defvr {Variable Scheme} pam-krb5-service-type A service type for the Kerberos 5 PAM module. @end defvr -@deftp {Data Type} pam-krb5-configuration +@deftp {Type de données} pam-krb5-configuration Data type representing the configuration of the Kerberos 5 PAM module This type has the following parameters: @table @asis -@item @code{pam-krb5} (default: @code{pam-krb5}) -The pam-krb5 package to use. +@item @code{pam-krb5} (par défaut : @code{pam-krb5}) +Le paquet pam-krb5 à utiliser. -@item @code{minimum-uid} (default: @code{1000}) +@item @code{minimum-uid} (par défaut : @code{1000}) The smallest user ID for which Kerberos authentications should be attempted. Local accounts with lower values will silently fail to authenticate. @@ -16027,7 +16319,7 @@ nginx web server, and also a fastcgi wrapper daemon. @subsubheading Apache HTTP Server -@deffn {Scheme Variable} httpd-service-type +@deffn {Variable Scheme} httpd-service-type Service type for the @uref{https://httpd.apache.org/,Apache HTTP} server (@dfn{httpd}). The value for this service type is a @code{https-configuration} record. @@ -16061,17 +16353,17 @@ The details for the @code{httpd-configuration}, @code{httpd-module}, @code{httpd-config-file} and @code{httpd-virtualhost} record types are given below. -@deffn {Data Type} httpd-configuration +@deffn {Type de données} httpd-configuration This data type represents the configuration for the httpd service. @table @asis -@item @code{package} (default: @code{httpd}) -The httpd package to use. +@item @code{package} (par défaut : @code{httpd}) +Le paquet httpd à utiliser. -@item @code{pid-file} (default: @code{"/var/run/httpd"}) +@item @code{pid-file} (par défaut : @code{"/var/run/httpd"}) The pid file used by the shepherd-service. -@item @code{config} (default: @code{(httpd-config-file)}) +@item @code{config} (par défaut : @code{(httpd-config-file)}) 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 @@ -16080,7 +16372,7 @@ outside of the store can also be specified through a string. @end table @end deffn -@deffn {Data Type} httpd-module +@deffn {Type de données} httpd-module This data type represents a module for the httpd service. @table @asis @@ -16095,49 +16387,49 @@ the store, for example @code{(file-append mod-wsgi "/modules/mod_wsgi.so")}. @end table @end deffn -@deffn {Data Type} httpd-config-file +@deffn {Type de données} httpd-config-file This data type represents a configuration file for the httpd service. @table @asis -@item @code{modules} (default: @code{%default-httpd-modules}) +@item @code{modules} (par défaut : @code{%default-httpd-modules}) The modules to load. Additional modules can be added here, or loaded by additional configuration. -@item @code{server-root} (default: @code{httpd}) +@item @code{server-root} (par défaut : @code{httpd}) 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. -@item @code{server-name} (default: @code{#f}) +@item @code{server-name} (par défaut : @code{#f}) The @code{ServerName} in the configuration file, used to specify the request scheme, hostname and port that the server uses to identify itself. 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}. -@item @code{document-root} (default: @code{"/srv/http"}) +@item @code{document-root} (par défaut : @code{"/srv/http"}) The @code{DocumentRoot} from which files will be served. -@item @code{listen} (default: @code{'("80")}) +@item @code{listen} (par défaut : @code{'("80")}) 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. -@item @code{pid-file} (default: @code{"/var/run/httpd"}) +@item @code{pid-file} (par défaut : @code{"/var/run/httpd"}) 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. -@item @code{error-log} (default: @code{"/var/log/httpd/error_log"}) +@item @code{error-log} (par défaut : @code{"/var/log/httpd/error_log"}) The @code{ErrorLog} to which the server will log errors. -@item @code{user} (default: @code{"httpd"}) +@item @code{user} (par défaut : @code{"httpd"}) The @code{User} which the server will answer requests as. -@item @code{group} (default: @code{"httpd"}) +@item @code{group} (par défaut : @code{"httpd"}) The @code{Group} which the server will answer requests as. -@item @code{extra-config} (default: @code{(list "TypesConfig etc/httpd/mime.types")}) +@item @code{extra-config} (par défaut : @code{(list "TypesConfig etc/httpd/mime.types")}) A flat list of strings and G-expressions which will be added to the end of the configuration file. @@ -16146,7 +16438,7 @@ Any values which the service is extended with will be appended to this list. @end table @end deffn -@deffn {Data Type} httpd-virtualhost +@deffn {Type de données} httpd-virtualhost This data type represents a virtualhost configuration block for the httpd service. @@ -16175,7 +16467,7 @@ strings and G-expressions. @subsubheading NGINX -@deffn {Scheme Variable} nginx-service-type +@deffn {Variable Scheme} nginx-service-type Service type for the @uref{https://nginx.org/,NGinx} web server. The value for this service type is a @code{} record. @@ -16211,23 +16503,23 @@ configuration. In our case, startup error messages can be found in @file{/var/log/nginx/error.log}. The second location can be changed with the @var{log-directory} configuration option. -@deffn {Data Type} nginx-configuration +@deffn {Type de données} nginx-configuration 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. @table @asis -@item @code{nginx} (default: @code{nginx}) -The nginx package to use. +@item @code{nginx} (par défaut : @code{nginx}) +Le paquet nginx à utiliser. -@item @code{log-directory} (default: @code{"/var/log/nginx"}) +@item @code{log-directory} (par défaut : @code{"/var/log/nginx"}) The directory to which NGinx will write log files. -@item @code{run-directory} (default: @code{"/var/run/nginx"}) +@item @code{run-directory} (par défaut : @code{"/var/run/nginx"}) The directory in which NGinx will create a pid file, and write temporary files. -@item @code{server-blocks} (default: @code{'()}) +@item @code{server-blocks} (par défaut : @code{'()}) A list of @dfn{server blocks} to create in the generated configuration file, the elements should be of type @code{}. @@ -16242,7 +16534,7 @@ the @code{/srv/http/www.example.com} directory, without using HTTPS. (root "/srv/http/www.example.com")))))) @end example -@item @code{upstream-blocks} (default: @code{'()}) +@item @code{upstream-blocks} (par défaut : @code{'()}) A list of @dfn{upstream blocks} to create in the generated configuration file, the elements should be of type @code{}. @@ -16272,7 +16564,7 @@ configuration, which will handle requests with two servers. "server2.example.com"))))))) @end example -@item @code{file} (default: @code{#f}) +@item @code{file} (par défaut : @code{#f}) 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 @@ -16283,11 +16575,11 @@ This can be useful if you have an existing configuration file, or it's not possible to do what is required through the other parts of the nginx-configuration record. -@item @code{server-names-hash-bucket-size} (default: @code{#f}) +@item @code{server-names-hash-bucket-size} (par défaut : @code{#f}) Bucket size for the server names hash tables, defaults to @code{#f} to use the size of the processors cache line. -@item @code{server-names-hash-bucket-max-size} (default: @code{#f}) +@item @code{server-names-hash-bucket-max-size} (par défaut : @code{#f}) Maximum bucket size for the server names hash tables. @item @code{extra-content} (par défaut : @code{""}) @@ -16297,12 +16589,12 @@ valued G-expression. @end table @end deffn -@deftp {Data Type} nginx-server-configuration +@deftp {Type de données} nginx-server-configuration Data type representing the configuration of an nginx server block. This type has the following parameters: @table @asis -@item @code{listen} (default: @code{'("80" "443 ssl")}) +@item @code{listen} (par défaut : @code{'("80" "443 ssl")}) Each @code{listen} directive sets the address and port for IP, or the path for a UNIX-domain socket on which the server will accept requests. Both address and port, or only address or only port can be specified. An address @@ -16312,44 +16604,44 @@ may also be a hostname, for example: '("127.0.0.1:8000" "127.0.0.1" "8000" "*:8000" "localhost:8000") @end example -@item @code{server-name} (default: @code{(list 'default)}) +@item @code{server-name} (par défaut : @code{(list 'default)}) A list of server names this server represents. @code{'default} represents the default server for connections matching no other server. -@item @code{root} (default: @code{"/srv/http"}) +@item @code{root} (par défaut : @code{"/srv/http"}) Root of the website nginx will serve. -@item @code{locations} (default: @code{'()}) +@item @code{locations} (par défaut : @code{'()}) A list of @dfn{nginx-location-configuration} or @dfn{nginx-named-location-configuration} records to use within this server block. -@item @code{index} (default: @code{(list "index.html")}) +@item @code{index} (par défaut : @code{(list "index.html")}) 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. -@item @code{try-files} (default: @code{'()}) +@item @code{try-files} (par défaut : @code{'()}) A list of files whose existence is checked in the specified order. @code{nginx} will use the first file it finds to process the request. -@item @code{ssl-certificate} (default: @code{#f}) +@item @code{ssl-certificate} (par défaut : @code{#f}) Where to find the certificate for secure connections. Set it to @code{#f} if you don't have a certificate or you don't want to use HTTPS. -@item @code{ssl-certificate-key} (default: @code{#f}) +@item @code{ssl-certificate-key} (par défaut : @code{#f}) Where to find the private key for secure connections. Set it to @code{#f} if you don't have a key or you don't want to use HTTPS. -@item @code{server-tokens?} (default: @code{#f}) +@item @code{server-tokens?} (par défaut : @code{#f}) Whether the server should add its configuration to response. -@item @code{raw-content} (default: @code{'()}) +@item @code{raw-content} (par défaut : @code{'()}) A list of raw lines added to the server block. @end table @end deftp -@deftp {Data Type} nginx-upstream-configuration +@deftp {Type de données} nginx-upstream-configuration Data type representing the configuration of an nginx @code{upstream} block. This type has the following parameters: @@ -16367,7 +16659,7 @@ default port is 80, and a different port can be specified explicitly. @end table @end deftp -@deftp {Data Type} nginx-location-configuration +@deftp {Type de données} nginx-location-configuration Data type representing the configuration of an nginx @code{location} block. This type has the following parameters: @@ -16386,7 +16678,7 @@ http://upstream-name;")}. @end table @end deftp -@deftp {Data Type} nginx-named-location-configuration +@deftp {Type de données} nginx-named-location-configuration 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: @@ -16419,25 +16711,25 @@ 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. -@defvr {Scheme Variable} fcgiwrap-service-type +@defvr {Variable Scheme} fcgiwrap-service-type A service type for the @code{fcgiwrap} FastCGI proxy. @end defvr -@deftp {Data Type} fcgiwrap-configuration +@deftp {Type de données} fcgiwrap-configuration Data type representing the configuration of the @code{fcgiwrap} serice. This type has the following parameters: @table @asis -@item @code{package} (default: @code{fcgiwrap}) -The fcgiwrap package to use. +@item @code{package} (par défaut : @code{fcgiwrap}) +Le paquet fcgiwrap à utiliser. -@item @code{socket} (default: @code{tcp:127.0.0.1:9000}) +@item @code{socket} (par défaut : @code{tcp:127.0.0.1:9000}) 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}. -@item @code{user} (default: @code{fcgiwrap}) -@itemx @code{group} (default: @code{fcgiwrap}) +@item @code{user} (par défaut : @code{fcgiwrap}) +@itemx @code{group} (par défaut : @code{fcgiwrap}) 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 @@ -16473,16 +16765,16 @@ something time-consuming (video converting, stats processing, etc.) @end itemize ... and much more. -@defvr {Scheme Variable} php-fpm-service-type +@defvr {Variable Scheme} php-fpm-service-type A Service type for @code{php-fpm}. @end defvr -@deftp {Data Type} php-fpm-configuration +@deftp {Type de données} php-fpm-configuration Data Type for php-fpm service configuration. @table @asis -@item @code{php} (default: @code{php}) -The php package to use. -@item @code{socket} (default: @code{(string-append "/var/run/php" (version-major (package-version php)) "-fpm.sock")}) +@item @code{php} (par défaut : @code{php}) +Le paquet php à utiliser. +@item @code{socket} (par défaut : @code{(string-append "/var/run/php" (version-major (package-version php)) "-fpm.sock")}) The address on which to accept FastCGI requests. Valid syntaxes are: @table @asis @item @code{"ip.add.re.ss:port"} @@ -16493,35 +16785,35 @@ Listen on a TCP socket to all addresses on a specific port. Listen on a unix socket. @end table -@item @code{user} (default: @code{php-fpm}) +@item @code{user} (par défaut : @code{php-fpm}) User who will own the php worker processes. -@item @code{group} (default: @code{php-fpm}) +@item @code{group} (par défaut : @code{php-fpm}) Group of the worker processes. -@item @code{socket-user} (default: @code{php-fpm}) +@item @code{socket-user} (par défaut : @code{php-fpm}) User who can speak to the php-fpm socket. -@item @code{socket-group} (default: @code{php-fpm}) +@item @code{socket-group} (par défaut : @code{php-fpm}) Group that can speak to the php-fpm socket. -@item @code{pid-file} (default: @code{(string-append "/var/run/php" (version-major (package-version php)) "-fpm.pid")}) +@item @code{pid-file} (par défaut : @code{(string-append "/var/run/php" (version-major (package-version php)) "-fpm.pid")}) The process id of the php-fpm process is written to this file once the service has started. -@item @code{log-file} (default: @code{(string-append "/var/log/php" (version-major (package-version php)) "-fpm.log")}) +@item @code{log-file} (par défaut : @code{(string-append "/var/log/php" (version-major (package-version php)) "-fpm.log")}) Log for the php-fpm master process. -@item @code{process-manager} (default: @code{(php-fpm-dynamic-process-manager-configuration)}) +@item @code{process-manager} (par défaut : @code{(php-fpm-dynamic-process-manager-configuration)}) Detailed settings for the php-fpm process manager. Must be either: @table @asis @item @code{} @item @code{} @item @code{} @end table -@item @code{display-errors} (default @code{#f}) +@item @code{display-errors} (par défaut : @code{#f}) 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. -@item @code{workers-logfile} (default @code{(string-append "/var/log/php" (version-major (package-version php)) "-fpm.www.log")}) +@item @code{workers-logfile} (par défaut : @code{(string-append "/var/log/php" (version-major (package-version php)) "-fpm.www.log")}) This file will log the @code{stderr} outputs of php worker processes. Can be set to @code{#f} to disable logging. -@item @code{file} (default @code{#f}) +@item @code{file} (par défaut : @code{#f}) An optional override of the whole configuration. You can use the @code{mixed-text-file} function or an absolute filepath for it. @end table @@ -16532,13 +16824,13 @@ Data Type for the @code{dynamic} php-fpm process manager. With the @code{dynamic} process manager, spare worker processes are kept around based on it's configured limits. @table @asis -@item @code{max-children} (default: @code{5}) +@item @code{max-children} (par défaut : @code{5}) Maximum of worker processes. -@item @code{start-servers} (default: @code{2}) +@item @code{start-servers} (par défaut : @code{2}) How many worker processes should be started on start-up. -@item @code{min-spare-servers} (default: @code{1}) +@item @code{min-spare-servers} (par défaut : @code{1}) How many spare worker processes should be kept around at minimum. -@item @code{max-spare-servers} (default: @code{3}) +@item @code{max-spare-servers} (par défaut : @code{3}) How many spare worker processes should be kept around at maximum. @end table @end deftp @@ -16548,7 +16840,7 @@ Data Type for the @code{static} php-fpm process manager. With the @code{static} process manager, an unchanging number of worker processes are created. @table @asis -@item @code{max-children} (default: @code{5}) +@item @code{max-children} (par défaut : @code{5}) Maximum of worker processes. @end table @end deftp @@ -16558,15 +16850,15 @@ Data Type for the @code{on-demand} php-fpm process manager. With the @code{on-demand} process manager, worker processes are only created as requests arrive. @table @asis -@item @code{max-children} (default: @code{5}) +@item @code{max-children} (par défaut : @code{5}) Maximum of worker processes. -@item @code{process-idle-timeout} (default: @code{10}) +@item @code{process-idle-timeout} (par défaut : @code{10}) The time in seconds after which a process with no requests is killed. @end table @end deftp -@deffn {Scheme Procedure} nginx-php-fpm-location @ +@deffn {Procédure Scheme} nginx-php-fpm-location @ [#:nginx-package nginx] @ [socket (string-append "/var/run/php" @ (version-major (package-version php)) @ "-fpm.sock")] A helper function to quickly add php to an @code{nginx-server-configuration}. @@ -16593,7 +16885,7 @@ 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. -@deffn {Scheme Procedure} cat-avatar-generator-serice @ +@deffn {Procédure Scheme} cat-avatar-generator-serice @ [#:cache-dir "/var/cache/cat-avatar-generator"] @ [#:package cat-avatar-generator] @ [#:configuration (nginx-server-configuration)] Returns an nginx-server-configuration that inherits @code{configuration}. @@ -16624,7 +16916,7 @@ for users of high-performance computing (HPC) clusters. The service type for @code{hpcguix-web}. @end defvr -@deftp {Type de donnée} hpcguix-web-configuration +@deftp {Type de données} hpcguix-web-configuration Data type for the hpcguix-web service configuration. @table @asis @@ -16642,7 +16934,7 @@ La commande @command{guix} @item @code{package-filter-proc} (par défaut : @code{(const #t)}) Une procédure qui spécifie comment filtrer les paquets qui seront affichés. -@item @code{package-page-extension-procinputs} (par défaut : @code{(const '())}) +@item @code{package-page-extension-proc} (par défaut : @code{(const '())}) Extension package for @code{hpcguix-web}. @item @code{menu} (par défaut : @code{'()}) @@ -16653,7 +16945,7 @@ See the hpcguix-web repository for a @uref{https://github.com/UMCUGenetics/hpcguix-web/blob/master/hpcweb-configuration.scm, complete example}. -@item @code{packages} (par défaut : @code{hpcguix-web}) +@item @code{package} (par défaut : @code{hpcguix-web}) Le paquet hpcguix-web à utiliser. @end table @end deftp @@ -16708,7 +17000,7 @@ Let's Encrypt-initiated revocation happened for some reason. By using this service, you agree to the ACME Subscriber Agreement, which can be found there: @url{https://acme-v01.api.letsencrypt.org/directory}. -@defvr {Scheme Variable} certbot-service-type +@defvr {Variable Scheme} certbot-service-type A service type for the @code{certbot} Let's Encrypt client. Its value must be a @code{certbot-configuration} record as in this example: @@ -16734,19 +17026,19 @@ be a @code{certbot-configuration} record as in this example: See below for details about @code{certbot-configuration}. @end defvr -@deftp {Data Type} certbot-configuration +@deftp {Type de données} certbot-configuration Data type representing the configuration of the @code{certbot} service. This type has the following parameters: @table @asis -@item @code{package} (default: @code{certbot}) -The certbot package to use. +@item @code{package} (par défaut : @code{certbot}) +Le paquet certbot à utiliser. -@item @code{webroot} (default: @code{/var/www}) +@item @code{webroot} (par défaut : @code{/var/www}) The directory from which to serve the Let's Encrypt challenge/response files. -@item @code{certificates} (default: @code{()}) +@item @code{certificates} (par défaut : @code{()}) 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}. @@ -16755,7 +17047,7 @@ several @code{domains}. Mandatory email used for registration, recovery contact, and important account notifications. -@item @code{rsa-key-size} (default: @code{2048}) +@item @code{rsa-key-size} (par défaut : @code{2048}) Size of the RSA key. @item @code{default-location} (default: @i{see below}) @@ -16777,7 +17069,7 @@ Pass @code{#f} to not issue a default location. @end table @end deftp -@deftp {Data Type} certificate-configuration +@deftp {Type de données} certificate-configuration Data type representing the configuration of a certificate. This type has the following parameters: @@ -16789,11 +17081,11 @@ affect the content of the certificate itself. To see certificate names, run Its default is the first provided domain. -@item @code{domains} (default: @code{()}) +@item @code{domains} (par défaut : @code{()}) The first domain provided will be the subject CN of the certificate, and all domains will be Subject Alternative Names on the certificate. -@item @code{deploy-hook} (default: @code{#f}) +@item @code{deploy-hook} (par défaut : @code{#f}) 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, @@ -16860,7 +17152,7 @@ master and one slave, is: %base-services))) @end lisp -@deffn {Scheme Variable} knot-service-type +@deffn {Variable Scheme} knot-service-type This is the type for the Knot DNS server. Knot DNS is an authoritative DNS server, meaning that it can serve multiple @@ -16875,81 +17167,81 @@ slave. The following data types are used to configure the Knot DNS server: @end deffn -@deftp {Data Type} knot-key-configuration +@deftp {Type de données} knot-key-configuration Data type representing a key. This type has the following parameters: @table @asis -@item @code{id} (default: @code{""}) +@item @code{id} (par défaut : @code{""}) An identifier for other configuration fields to refer to this key. IDs must be unique and must not be empty. -@item @code{algorithm} (default: @code{#f}) +@item @code{algorithm} (par défaut : @code{#f}) 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}. -@item @code{secret} (default: @code{""}) +@item @code{secret} (par défaut : @code{""}) The secret key itself. @end table @end deftp -@deftp {Data Type} knot-acl-configuration +@deftp {Type de données} knot-acl-configuration Data type representing an Access Control List (ACL) configuration. This type has the following parameters: @table @asis -@item @code{id} (default: @code{""}) +@item @code{id} (par défaut : @code{""}) An identifier for ether configuration fields to refer to this key. IDs must be unique and must not be empty. -@item @code{address} (default: @code{'()}) +@item @code{address} (par défaut : @code{'()}) 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. -@item @code{key} (default: @code{'()}) +@item @code{key} (par défaut : @code{'()}) 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. -@item @code{action} (default: @code{'()}) +@item @code{action} (par défaut : @code{'()}) 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}. -@item @code{deny?} (default: @code{#f}) +@item @code{deny?} (par défaut : @code{#f}) When true, the ACL defines restrictions. Listed actions are forbidden. When false, listed actions are allowed. @end table @end deftp -@deftp {Data Type} zone-entry +@deftp {Type de données} zone-entry Data type represnting a record entry in a zone file. This type has the following parameters: @table @asis -@item @code{name} (default: @code{"@@"}) +@item @code{name} (par défaut : @code{"@@"}) 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}. -@item @code{ttl} (default: @code{""}) +@item @code{ttl} (par défaut : @code{""}) The Time-To-Live (TTL) of this record. If not set, the default TTL is used. -@item @code{class} (default: @code{"IN"}) +@item @code{class} (par défaut : @code{"IN"}) The class of the record. Knot currently supports only @code{"IN"} and partially @code{"CH"}. -@item @code{type} (default: @code{"A"}) +@item @code{type} (par défaut : @code{"A"}) 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. -@item @code{data} (default: @code{""}) +@item @code{data} (par défaut : @code{""}) 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. @@ -16957,12 +17249,12 @@ that domain names are relative to the origin unless they end with a dot. @end table @end deftp -@deftp {Data Type} zone-file +@deftp {Type de données} zone-file Data type representing the content of a zone file. This type has the following parameters: @table @asis -@item @code{entries} (default: @code{'()}) +@item @code{entries} (par défaut : @code{'()}) 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 @@ -16970,83 +17262,83 @@ 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}. -@item @code{origin} (default: @code{""}) +@item @code{origin} (par défaut : @code{""}) The name of your zone. This parameter cannot be empty. -@item @code{ns} (default: @code{"ns"}) +@item @code{ns} (par défaut : @code{"ns"}) 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. -@item @code{mail} (default: @code{"hostmaster"}) +@item @code{mail} (par défaut : @code{"hostmaster"}) An email address people can contact you at, as the owner of the zone. This is translated as @code{@@}. -@item @code{serial} (default: @code{1}) +@item @code{serial} (par défaut : @code{1}) 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. -@item @code{refresh} (default: @code{(* 2 24 3600)}) +@item @code{refresh} (par défaut : @code{(* 2 24 3600)}) 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)}. -@item @code{retry} (default: @code{(* 15 60)}) +@item @code{retry} (par défaut : @code{(* 15 60)}) The period after which a slave will retry to contact its master when it fails to do so a first time. -@item @code{expiry} (default: @code{(* 14 24 3600)}) +@item @code{expiry} (par défaut : @code{(* 14 24 3600)}) 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. -@item @code{nx} (default: @code{3600}) +@item @code{nx} (par défaut : @code{3600}) Default TTL of inexistant records. This delay is usually short because you want your new domains to reach everyone quickly. @end table @end deftp -@deftp {Data Type} knot-remote-configuration +@deftp {Type de données} knot-remote-configuration Data type representing a remote configuration. This type has the following parameters: @table @asis -@item @code{id} (default: @code{""}) +@item @code{id} (par défaut : @code{""}) An identifier for other configuration fields to refer to this remote. IDs must be unique and must not be empty. -@item @code{address} (default: @code{'()}) +@item @code{address} (par défaut : @code{'()}) 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. -@item @code{via} (default: @code{'()}) +@item @code{via} (par défaut : @code{'()}) 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. -@item @code{key} (default: @code{#f}) +@item @code{key} (par défaut : @code{#f}) A reference to a key, that is a string containing the identifier of a key defined in a @code{knot-key-configuration} field. @end table @end deftp -@deftp {Data Type} knot-keystore-configuration +@deftp {Type de données} knot-keystore-configuration Data type representing a keystore to hold dnssec keys. This type has the following parameters: @table @asis -@item @code{id} (default: @code{""}) +@item @code{id} (par défaut : @code{""}) The id of the keystore. It must not be empty. -@item @code{backend} (default: @code{'pem}) +@item @code{backend} (par défaut : @code{'pem}) The backend to store the keys in. Can be @code{'pem} or @code{'pkcs11}. -@item @code{config} (default: @code{"/var/lib/knot/keys/keys"}) +@item @code{config} (par défaut : @code{"/var/lib/knot/keys/keys"}) 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 @@ -17055,7 +17347,7 @@ reprensents a path in the file system. @end table @end deftp -@deftp {Data Type} knot-policy-configuration +@deftp {Type de données} knot-policy-configuration 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. @@ -17077,142 +17369,142 @@ often and use stronger parameters because they sign only one record. This type has the following parameters: @table @asis -@item @code{id} (default: @code{""}) +@item @code{id} (par défaut : @code{""}) The id of the policy. It must not be empty. -@item @code{keystore} (default: @code{"default"}) +@item @code{keystore} (par défaut : @code{"default"}) 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). -@item @code{manual?} (default: @code{#f}) +@item @code{manual?} (par défaut : @code{#f}) Whether the key management is manual or automatic. -@item @code{single-type-signing?} (default: @code{#f}) +@item @code{single-type-signing?} (par défaut : @code{#f}) When @code{#t}, use the Single-Type Signing Scheme. -@item @code{algorithm} (default: @code{"ecdsap256sha256"}) +@item @code{algorithm} (par défaut : @code{"ecdsap256sha256"}) An algorithm of signing keys and issued signatures. -@item @code{ksk-size} (default: @code{256}) +@item @code{ksk-size} (par défaut : @code{256}) The length of the KSK. Note that this value is correct for the default algorithm, but would be unsecure for other algorithms. -@item @code{zsk-size} (default: @code{256}) +@item @code{zsk-size} (par défaut : @code{256}) The length of the ZSK. Note that this value is correct for the default algorithm, but would be unsecure for other algorithms. -@item @code{dnskey-ttl} (default: @code{'default}) +@item @code{dnskey-ttl} (par défaut : @code{'default}) The TTL value for DNSKEY records added into zone apex. The special @code{'default} value means same as the zone SOA TTL. -@item @code{zsk-lifetime} (default: @code{(* 30 24 3600)}) +@item @code{zsk-lifetime} (par défaut : @code{(* 30 24 3600)}) The period between ZSK publication and the next rollover initiation. -@item @code{propagation-delay} (default: @code{(* 24 3600)}) +@item @code{propagation-delay} (par défaut : @code{(* 24 3600)}) 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. -@item @code{rrsig-lifetime} (default: @code{(* 14 24 3600)}) +@item @code{rrsig-lifetime} (par défaut : @code{(* 14 24 3600)}) A validity period of newly issued signatures. -@item @code{rrsig-refresh} (default: @code{(* 7 24 3600)}) +@item @code{rrsig-refresh} (par défaut : @code{(* 7 24 3600)}) A period how long before a signature expiration the signature will be refreshed. -@item @code{nsec3?} (default: @code{#f}) +@item @code{nsec3?} (par défaut : @code{#f}) When @code{#t}, NSEC3 will be used instead of NSEC. -@item @code{nsec3-iterations} (default: @code{5}) +@item @code{nsec3-iterations} (par défaut : @code{5}) The number of additional times the hashing is performed. -@item @code{nsec3-salt-length} (default: @code{8}) +@item @code{nsec3-salt-length} (par défaut : @code{8}) The length of a salt field in octets, which is appended to the original owner name before hashing. -@item @code{nsec3-salt-lifetime} (default: @code{(* 30 24 3600)}) +@item @code{nsec3-salt-lifetime} (par défaut : @code{(* 30 24 3600)}) The validity period of newly issued salt field. @end table @end deftp -@deftp {Data Type} knot-zone-configuration +@deftp {Type de données} knot-zone-configuration Data type representing a zone served by Knot. This type has the following parameters: @table @asis -@item @code{domain} (default: @code{""}) +@item @code{domain} (par défaut : @code{""}) The domain served by this configuration. It must not be empty. -@item @code{file} (default: @code{""}) +@item @code{file} (par défaut : @code{""}) The file where this zone is saved. This parameter is ignored by master zones. Empty means default location that depends on the domain name. -@item @code{zone} (default: @code{(zone-file)}) +@item @code{zone} (par défaut : @code{(zone-file)}) The content of the zone file. This parameter is ignored by slave zones. It must contain a zone-file record. -@item @code{master} (default: @code{'()}) +@item @code{master} (par défaut : @code{'()}) 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. -@item @code{ddns-master} (default: @code{#f}) +@item @code{ddns-master} (par défaut : @code{#f}) The main master. When empty, it defaults to the first master in the list of masters. -@item @code{notify} (default: @code{'()}) +@item @code{notify} (par défaut : @code{'()}) A list of slave remote identifiers. -@item @code{acl} (default: @code{'()}) +@item @code{acl} (par défaut : @code{'()}) A list of acl identifiers. -@item @code{semantic-checks?} (default: @code{#f}) +@item @code{semantic-checks?} (par défaut : @code{#f}) When set, this adds more semantic checks to the zone. -@item @code{disable-any?} (default: @code{#f}) +@item @code{disable-any?} (par défaut : @code{#f}) When set, this forbids queries of the ANY type. -@item @code{zonefile-sync} (default: @code{0}) +@item @code{zonefile-sync} (par défaut : @code{0}) The delay between a modification in memory and on disk. 0 means immediate synchronization. -@item @code{serial-policy} (default: @code{'increment}) +@item @code{serial-policy} (par défaut : @code{'increment}) A policy between @code{'increment} and @code{'unixtime}. @end table @end deftp -@deftp {Data Type} knot-configuration +@deftp {Type de données} knot-configuration Data type representing the Knot configuration. This type has the following parameters: @table @asis -@item @code{knot} (default: @code{knot}) +@item @code{knot} (par défaut : @code{knot}) The Knot package. -@item @code{run-directory} (default: @code{"/var/run/knot"}) +@item @code{run-directory} (par défaut : @code{"/var/run/knot"}) The run directory. This directory will be used for pid file and sockets. -@item @code{listen-v4} (default: @code{"0.0.0.0"}) +@item @code{listen-v4} (par défaut : @code{"0.0.0.0"}) An ip address on which to listen. -@item @code{listen-v6} (default: @code{"::"}) +@item @code{listen-v6} (par défaut : @code{"::"}) An ip address on which to listen. -@item @code{listen-port} (default: @code{53}) +@item @code{listen-port} (par défaut : @code{53}) A port on which to listen. -@item @code{keys} (default: @code{'()}) +@item @code{keys} (par défaut : @code{'()}) The list of knot-key-configuration used by this configuration. -@item @code{acls} (default: @code{'()}) +@item @code{acls} (par défaut : @code{'()}) The list of knot-acl-configuration used by this configuration. -@item @code{remotes} (default: @code{'()}) +@item @code{remotes} (par défaut : @code{'()}) The list of knot-remote-configuration used by this configuration. -@item @code{zones} (default: @code{'()}) +@item @code{zones} (par défaut : @code{'()}) The list of knot-zone-configuration used by this configuration. @end table @@ -17232,11 +17524,11 @@ This is the type of the dnsmasq service, whose value should be an @end example @end deffn -@deftp {Type de donnée} dnsmasq-configuration +@deftp {Type de données} dnsmasq-configuration Type de données qui représente la configuration de dnsmasq. @table @asis -@item @code{package} (par défaut : @code{dnsmasq}) +@item @code{package} (par défaut : @var{dnsmasq}) Package object of the dnsmasq server. @item @code{no-hosts?} (par défaut : @code{#f}) @@ -17259,7 +17551,7 @@ The file to read the IP address of the upstream nameservers from. @item @code{no-resolv?} (par défaut : @code{#f}) When true, don't read @var{resolv-file}. -@item @code{servers} (default: @code{'()}) +@item @code{servers} (par défaut : @code{'()}) Specify IP address of upstream servers directly. @item @code{cache-size} (par défaut : @code{150}) @@ -17283,13 +17575,13 @@ for your machine to connect to a VPN, and a @emph{servire} service for your machine to host a VPN. Both services use @uref{https://openvpn.net/, OpenVPN}. -@deffn {Scheme Procedure} openvpn-client-service @ +@deffn {Procédure Scheme} openvpn-client-service @ [#:config (openvpn-client-configuration)] Return a service that runs @command{openvpn}, a VPN daemon, as a client. @end deffn -@deffn {Scheme Procedure} openvpn-server-service @ +@deffn {Procédure Scheme} openvpn-server-service @ [#:config (openvpn-server-configuration)] Return a service that runs @command{openvpn}, a VPN daemon, as a server. @@ -17299,134 +17591,134 @@ Both can be run simultaneously. @c %automatically generated documentation -Available @code{openvpn-client-configuration} fields are: +Les champs de @code{openvpn-client-configuration} disponibles sont : -@deftypevr {@code{openvpn-client-configuration} parameter} package openvpn +@deftypevr {paramètre de @code{openvpn-client-configuration}} package openvpn The OpenVPN package. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} string pid-file +@deftypevr {paramètre de @code{openvpn-client-configuration}} string pid-file The OpenVPN pid file. -Defaults to @samp{"/var/run/openvpn/openvpn.pid"}. +La valeur par défaut est @samp{"/var/run/openvpn/openvpn.pid"}. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} proto proto +@deftypevr {paramètre de @code{openvpn-client-configuration}} proto proto The protocol (UDP or TCP) used to open a channel between clients and servers. -Defaults to @samp{udp}. +La valeur par défaut est @samp{udp}. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} dev dev +@deftypevr {paramètre de @code{openvpn-client-configuration}} dev dev The device type used to represent the VPN connection. -Defaults to @samp{tun}. +La valeur par défaut est @samp{tun}. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} string ca +@deftypevr {paramètre de @code{openvpn-client-configuration}} string ca The certificate authority to check connections against. -Defaults to @samp{"/etc/openvpn/ca.crt"}. +La valeur par défaut est @samp{"/etc/openvpn/ca.crt"}. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} string cert +@deftypevr {paramètre de @code{openvpn-client-configuration}} string cert The certificate of the machine the daemon is running on. It should be signed by the authority given in @code{ca}. -Defaults to @samp{"/etc/openvpn/client.crt"}. +La valeur par défaut est @samp{"/etc/openvpn/client.crt"}. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} string key +@deftypevr {paramètre de @code{openvpn-client-configuration}} string key The key of the machine the daemon is running on. It must be the key whose certificate is @code{cert}. -Defaults to @samp{"/etc/openvpn/client.key"}. +La valeur par défaut est @samp{"/etc/openvpn/client.key"}. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} boolean comp-lzo? +@deftypevr {paramètre de @code{openvpn-client-configuration}} boolean comp-lzo? Whether to use the lzo compression algorithm. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} boolean persist-key? +@deftypevr {paramètre de @code{openvpn-client-configuration}} boolean persist-key? Don't re-read key files across SIGUSR1 or --ping-restart. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} boolean persist-tun? +@deftypevr {paramètre de @code{openvpn-client-configuration}} boolean persist-tun? Don't close and reopen TUN/TAP device or run up/down scripts across SIGUSR1 or --ping-restart restarts. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} number verbosity +@deftypevr {paramètre de @code{openvpn-client-configuration}} number verbosity Verbosity level. -Defaults to @samp{3}. +La valeur par défaut est @samp{3}. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} tls-auth-client tls-auth +@deftypevr {paramètre de @code{openvpn-client-configuration}} tls-auth-client tls-auth Add an additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} key-usage verify-key-usage? +@deftypevr {paramètre de @code{openvpn-client-configuration}} key-usage verify-key-usage? Whether to check the server certificate has server usage extension. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} bind bind? +@deftypevr {paramètre de @code{openvpn-client-configuration}} bind bind? Bind to a specific local port number. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} resolv-retry resolv-retry? +@deftypevr {paramètre de @code{openvpn-client-configuration}} resolv-retry resolv-retry? Retry resolving server address. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{openvpn-client-configuration} parameter} openvpn-remote-list remote +@deftypevr {paramètre de @code{openvpn-client-configuration}} openvpn-remote-list remote A list of remote servers to connect to. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. -Available @code{openvpn-remote-configuration} fields are: +Les champs de @code{openvpn-remote-configuration} disponibles sont : -@deftypevr {@code{openvpn-remote-configuration} parameter} string name +@deftypevr {paramètre de @code{openvpn-remote-configuration}} string name Server name. -Defaults to @samp{"my-server"}. +La valeur par défaut est @samp{"my-server"}. @end deftypevr -@deftypevr {@code{openvpn-remote-configuration} parameter} number port +@deftypevr {paramètre de @code{openvpn-remote-configuration}} number port Port number the server listens to. -Defaults to @samp{1194}. +La valeur par défaut est @samp{1194}. @end deftypevr @@ -17435,145 +17727,145 @@ Defaults to @samp{1194}. @c %automatically generated documentation -Available @code{openvpn-server-configuration} fields are: +Les champs de @code{openvpn-server-configuration} disponibles sont : -@deftypevr {@code{openvpn-server-configuration} parameter} package openvpn +@deftypevr {paramètre de @code{openvpn-server-configuration}} package openvpn The OpenVPN package. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} string pid-file +@deftypevr {paramètre de @code{openvpn-server-configuration}} string pid-file The OpenVPN pid file. -Defaults to @samp{"/var/run/openvpn/openvpn.pid"}. +La valeur par défaut est @samp{"/var/run/openvpn/openvpn.pid"}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} proto proto +@deftypevr {paramètre de @code{openvpn-server-configuration}} proto proto The protocol (UDP or TCP) used to open a channel between clients and servers. -Defaults to @samp{udp}. +La valeur par défaut est @samp{udp}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} dev dev +@deftypevr {paramètre de @code{openvpn-server-configuration}} dev dev The device type used to represent the VPN connection. -Defaults to @samp{tun}. +La valeur par défaut est @samp{tun}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} string ca +@deftypevr {paramètre de @code{openvpn-server-configuration}} string ca The certificate authority to check connections against. -Defaults to @samp{"/etc/openvpn/ca.crt"}. +La valeur par défaut est @samp{"/etc/openvpn/ca.crt"}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} string cert +@deftypevr {paramètre de @code{openvpn-server-configuration}} string cert The certificate of the machine the daemon is running on. It should be signed by the authority given in @code{ca}. -Defaults to @samp{"/etc/openvpn/client.crt"}. +La valeur par défaut est @samp{"/etc/openvpn/client.crt"}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} string key +@deftypevr {paramètre de @code{openvpn-server-configuration}} string key The key of the machine the daemon is running on. It must be the key whose certificate is @code{cert}. -Defaults to @samp{"/etc/openvpn/client.key"}. +La valeur par défaut est @samp{"/etc/openvpn/client.key"}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} boolean comp-lzo? +@deftypevr {paramètre de @code{openvpn-server-configuration}} boolean comp-lzo? Whether to use the lzo compression algorithm. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} boolean persist-key? +@deftypevr {paramètre de @code{openvpn-server-configuration}} boolean persist-key? Don't re-read key files across SIGUSR1 or --ping-restart. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} boolean persist-tun? +@deftypevr {paramètre de @code{openvpn-server-configuration}} boolean persist-tun? Don't close and reopen TUN/TAP device or run up/down scripts across SIGUSR1 or --ping-restart restarts. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} number verbosity +@deftypevr {paramètre de @code{openvpn-server-configuration}} number verbosity Verbosity level. -Defaults to @samp{3}. +La valeur par défaut est @samp{3}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} tls-auth-server tls-auth +@deftypevr {paramètre de @code{openvpn-server-configuration}} tls-auth-server tls-auth Add an additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} number port +@deftypevr {paramètre de @code{openvpn-server-configuration}} number port Specifies the port number on which the server listens. -Defaults to @samp{1194}. +La valeur par défaut est @samp{1194}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} ip-mask server +@deftypevr {paramètre de @code{openvpn-server-configuration}} ip-mask server An ip and mask specifying the subnet inside the virtual network. -Defaults to @samp{"10.8.0.0 255.255.255.0"}. +La valeur par défaut est @samp{"10.8.0.0 255.255.255.0"}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} cidr6 server-ipv6 +@deftypevr {paramètre de @code{openvpn-server-configuration}} cidr6 server-ipv6 A CIDR notation specifying the IPv6 subnet inside the virtual network. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} string dh +@deftypevr {paramètre de @code{openvpn-server-configuration}} string dh The Diffie-Hellman parameters file. -Defaults to @samp{"/etc/openvpn/dh2048.pem"}. +La valeur par défaut est @samp{"/etc/openvpn/dh2048.pem"}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} string ifconfig-pool-persist +@deftypevr {paramètre de @code{openvpn-server-configuration}} string ifconfig-pool-persist The file that records client IPs. -Defaults to @samp{"/etc/openvpn/ipp.txt"}. +La valeur par défaut est @samp{"/etc/openvpn/ipp.txt"}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} gateway redirect-gateway? +@deftypevr {paramètre de @code{openvpn-server-configuration}} gateway redirect-gateway? When true, the server will act as a gateway for its clients. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} boolean client-to-client? +@deftypevr {paramètre de @code{openvpn-server-configuration}} boolean client-to-client? When true, clients are allowed to talk to each other inside the VPN. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} keepalive keepalive +@deftypevr {paramètre de @code{openvpn-server-configuration}} keepalive keepalive 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 @@ -17581,46 +17873,46 @@ the second element is the timeout before considering the other side down. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} number max-clients +@deftypevr {paramètre de @code{openvpn-server-configuration}} number max-clients The maximum number of clients. -Defaults to @samp{100}. +La valeur par défaut est @samp{100}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} string status +@deftypevr {paramètre de @code{openvpn-server-configuration}} string status The status file. This file shows a small report on current connection. It is truncated and rewritten every minute. -Defaults to @samp{"/var/run/openvpn/status"}. +La valeur par défaut est @samp{"/var/run/openvpn/status"}. @end deftypevr -@deftypevr {@code{openvpn-server-configuration} parameter} openvpn-ccd-list client-config-dir +@deftypevr {paramètre de @code{openvpn-server-configuration}} openvpn-ccd-list client-config-dir The list of configuration for some clients. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. -Available @code{openvpn-ccd-configuration} fields are: +Les champs de @code{openvpn-ccd-configuration} disponibles sont : -@deftypevr {@code{openvpn-ccd-configuration} parameter} string name +@deftypevr {paramètre de @code{openvpn-ccd-configuration}} string name Client name. -Defaults to @samp{"client"}. +La valeur par défaut est @samp{"client"}. @end deftypevr -@deftypevr {@code{openvpn-ccd-configuration} parameter} ip-mask iroute +@deftypevr {paramètre de @code{openvpn-ccd-configuration}} ip-mask iroute Client own network -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{openvpn-ccd-configuration} parameter} ip-mask ifconfig-push +@deftypevr {paramètre de @code{openvpn-ccd-configuration}} ip-mask ifconfig-push Client VPN IP. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr @@ -17645,19 +17937,19 @@ 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. -@defvr {Scheme Variable} rpcbind-service-type +@defvr {Variable Scheme} rpcbind-service-type A service type for the RPC portmapper daemon. @end defvr -@deftp {Data Type} rpcbind-configuration +@deftp {Type de données} rpcbind-configuration Data type representing the configuration of the RPC Bind Service. This type has the following parameters: @table @asis -@item @code{rpcbind} (default: @code{rpcbind}) -The rpcbind package to use. +@item @code{rpcbind} (par défaut : @code{rpcbind}) +Le paquet rpcbind à utiliser. -@item @code{warm-start?} (default: @code{#t}) +@item @code{warm-start?} (par défaut : @code{#t}) 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. @end table @@ -17671,15 +17963,15 @@ startup thus reloading state information saved by a previous instance. The pipefs file system is used to transfer NFS related data between the kernel and user space programs. -@defvr {Scheme Variable} pipefs-service-type +@defvr {Variable Scheme} pipefs-service-type A service type for the pipefs pseudo file system. @end defvr -@deftp {Data Type} pipefs-configuration +@deftp {Type de données} pipefs-configuration Data type representing the configuration of the pipefs pseudo file system service. This type has the following parameters: @table @asis -@item @code{mount-point} (default: @code{"/var/lib/nfs/rpc_pipefs"}) +@item @code{mount-point} (par défaut : @code{"/var/lib/nfs/rpc_pipefs"}) The directory to which the file system is to be attached. @end table @end deftp @@ -17696,18 +17988,18 @@ establish a security context. Typically this is done using the Kerberos command @command{kinit} or automatically at login time using PAM services (@pxref{Services Kerberos}). -@defvr {Scheme Variable} gss-service-type +@defvr {Variable Scheme} gss-service-type A service type for the Global Security System (GSS) daemon. @end defvr -@deftp {Data Type} gss-configuration +@deftp {Type de données} gss-configuration Data type representing the configuration of the GSS daemon service. This type has the following parameters: @table @asis -@item @code{nfs-utils} (default: @code{nfs-utils}) +@item @code{nfs-utils} (par défaut : @code{nfs-utils}) The package in which the @command{rpc.gssd} command is to be found. -@item @code{pipefs-directory} (default: @code{"/var/lib/nfs/rpc_pipefs"}) +@item @code{pipefs-directory} (par défaut : @code{"/var/lib/nfs/rpc_pipefs"}) The directory where the pipefs file system is mounted. @end table @@ -17721,21 +18013,21 @@ The directory where the pipefs file system is mounted. 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. -@defvr {Scheme Variable} idmap-service-type +@defvr {Variable Scheme} idmap-service-type A service type for the Identity Mapper (IDMAP) daemon. @end defvr -@deftp {Data Type} idmap-configuration +@deftp {Type de données} idmap-configuration Data type representing the configuration of the IDMAP daemon service. This type has the following parameters: @table @asis -@item @code{nfs-utils} (default: @code{nfs-utils}) +@item @code{nfs-utils} (par défaut : @code{nfs-utils}) The package in which the @command{rpc.idmapd} command is to be found. -@item @code{pipefs-directory} (default: @code{"/var/lib/nfs/rpc_pipefs"}) +@item @code{pipefs-directory} (par défaut : @code{"/var/lib/nfs/rpc_pipefs"}) The directory where the pipefs file system is mounted. -@item @code{domain} (default: @code{#f}) +@item @code{domain} (par défaut : @code{#f}) 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. @@ -17752,7 +18044,7 @@ and for providing substitutes to others (@pxref{Substituts}). The @code{(gnu services cuirass)} module provides the following service. -@defvr {Scheme Procedure} cuirass-service-type +@defvr {Procédure Scheme} cuirass-service-type The type of the Cuirass service. Its value must be a @code{cuirass-configuration} object, as described below. @end defvr @@ -17780,56 +18072,56 @@ 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. -@deftp {Data Type} cuirass-configuration +@deftp {Type de données} cuirass-configuration Data type representing the configuration of Cuirass. @table @asis -@item @code{log-file} (default: @code{"/var/log/cuirass.log"}) +@item @code{log-file} (par défaut : @code{"/var/log/cuirass.log"}) Location of the log file. -@item @code{cache-directory} (default: @code{"/var/cache/cuirass"}) +@item @code{cache-directory} (par défaut : @code{"/var/cache/cuirass"}) Location of the repository cache. -@item @code{user} (default: @code{"cuirass"}) +@item @code{user} (par défaut : @code{"cuirass"}) Owner of the @code{cuirass} process. -@item @code{group} (default: @code{"cuirass"}) +@item @code{group} (par défaut : @code{"cuirass"}) Owner's group of the @code{cuirass} process. -@item @code{interval} (default: @code{60}) +@item @code{interval} (par défaut : @code{60}) Number of seconds between the poll of the repositories followed by the Cuirass jobs. -@item @code{database} (default: @code{"/var/run/cuirass/cuirass.db"}) +@item @code{database} (par défaut : @code{"/var/run/cuirass/cuirass.db"}) Location of sqlite database which contains the build results and previously added specifications. -@item @code{port} (default: @code{8081}) +@item @code{port} (par défaut : @code{8081}) Port number used by the HTTP server. @item --listen=@var{hôte} Listen on the network interface for @var{host}. The default is to accept connections from localhost. -@item @code{specifications} (default: @code{#~'()}) +@item @code{specifications} (par défaut : @code{#~'()}) 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. -@item @code{use-substitutes?} (default: @code{#f}) +@item @code{use-substitutes?} (par défaut : @code{#f}) This allows using substitutes to avoid building every dependencies of a job from source. -@item @code{one-shot?} (default: @code{#f}) +@item @code{one-shot?} (par défaut : @code{#f}) Only evaluate specifications and build derivations once. -@item @code{fallback?} (default: @code{#f}) +@item @code{fallback?} (par défaut : @code{#f}) When substituting a pre-built binary fails, fall back to building packages locally. -@item @code{cuirass} (default: @code{cuirass}) -The Cuirass package to use. +@item @code{cuirass} (par défaut : @code{cuirass}) +Le paquet Cuirass à utiliser. @end table @end deftp @@ -17849,7 +18141,7 @@ apply custom settings each time a new power source is detected. More information can be found at @uref{http://linrunner.de/en/tlp/tlp.html, TLP home page}. -@deffn {Scheme Variable} tlp-service-type +@deffn {Variable Scheme} tlp-service-type The service type for the TLP tool. Its value should be a valid TLP configuration (see below). To use the default settings, simply write: @example @@ -17873,466 +18165,466 @@ that won't show up in TLP config file when their value is @code{'disabled}. @c (generate-documentation) than to make it below and have to deal with @c the churn as TLP updates. -Available @code{tlp-configuration} fields are: +Les champs de @code{tlp-configuration} disponibles sont : -@deftypevr {@code{tlp-configuration} parameter} package tlp +@deftypevr {paramètre de @code{tlp-configuration}} package tlp The TLP package. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} boolean tlp-enable? +@deftypevr {paramètre de @code{tlp-configuration}} boolean tlp-enable? Set to true if you wish to enable TLP. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string tlp-default-mode +@deftypevr {paramètre de @code{tlp-configuration}} string tlp-default-mode Default mode when no power supply can be detected. Alternatives are AC and BAT. -Defaults to @samp{"AC"}. +La valeur par défaut est @samp{"AC"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} non-negative-integer disk-idle-secs-on-ac Number of seconds Linux kernel has to wait after the disk goes idle, before syncing on AC. -Defaults to @samp{0}. +La valeur par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} non-negative-integer disk-idle-secs-on-bat Same as @code{disk-idle-ac} but on BAT mode. -Defaults to @samp{2}. +La valeur par défaut est @samp{2}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} non-negative-integer max-lost-work-secs-on-ac Dirty pages flushing periodicity, expressed in seconds. -Defaults to @samp{15}. +La valeur par défaut est @samp{15}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} non-negative-integer max-lost-work-secs-on-bat Same as @code{max-lost-work-secs-on-ac} but on BAT mode. -Defaults to @samp{60}. +La valeur par défaut est @samp{60}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} maybe-space-separated-string-list cpu-scaling-governor-on-ac 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. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} maybe-space-separated-string-list cpu-scaling-governor-on-bat Same as @code{cpu-scaling-governor-on-ac} but on BAT mode. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-scaling-min-freq-on-ac Set the min available frequency for the scaling governor on AC. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-scaling-max-freq-on-ac Set the max available frequency for the scaling governor on AC. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-scaling-min-freq-on-bat Set the min available frequency for the scaling governor on BAT. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-scaling-max-freq-on-bat Set the max available frequency for the scaling governor on BAT. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-min-perf-on-ac 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. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-max-perf-on-ac 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. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-min-perf-on-bat Same as @code{cpu-min-perf-on-ac} on BAT mode. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-max-perf-on-bat Same as @code{cpu-max-perf-on-ac} on BAT mode. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-ac? +@deftypevr {paramètre de @code{tlp-configuration}} maybe-boolean cpu-boost-on-ac? Enable CPU turbo boost feature on AC mode. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-bat? +@deftypevr {paramètre de @code{tlp-configuration}} maybe-boolean cpu-boost-on-bat? Same as @code{cpu-boost-on-ac?} on BAT mode. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} boolean sched-powersave-on-ac? +@deftypevr {paramètre de @code{tlp-configuration}} boolean sched-powersave-on-ac? Allow Linux kernel to minimize the number of CPU cores/hyper-threads used under light load conditions. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} boolean sched-powersave-on-bat? +@deftypevr {paramètre de @code{tlp-configuration}} boolean sched-powersave-on-bat? Same as @code{sched-powersave-on-ac?} but on BAT mode. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} boolean nmi-watchdog? +@deftypevr {paramètre de @code{tlp-configuration}} boolean nmi-watchdog? Enable Linux kernel NMI watchdog. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-string phc-controls +@deftypevr {paramètre de @code{tlp-configuration}} maybe-string phc-controls For Linux kernels with PHC patch applied, change CPU voltages. An example value would be @samp{"F:V F:V F:V F:V"}. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string energy-perf-policy-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} string energy-perf-policy-on-ac Set CPU performance versus energy saving policy on AC. Alternatives are performance, normal, powersave. -Defaults to @samp{"performance"}. +La valeur par défaut est @samp{"performance"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string energy-perf-policy-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} string energy-perf-policy-on-bat Same as @code{energy-perf-policy-ac} but on BAT mode. -Defaults to @samp{"powersave"}. +La valeur par défaut est @samp{"powersave"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} space-separated-string-list disks-devices +@deftypevr {paramètre de @code{tlp-configuration}} space-separated-string-list disks-devices Hard disk devices. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} space-separated-string-list disk-apm-level-on-ac Hard disk advanced power management level. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} space-separated-string-list disk-apm-level-on-bat Same as @code{disk-apm-bat} but on BAT mode. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} maybe-space-separated-string-list disk-spindown-timeout-on-ac Hard disk spin down timeout. One value has to be specified for each declared hard disk. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} maybe-space-separated-string-list disk-spindown-timeout-on-bat Same as @code{disk-spindown-timeout-on-ac} but on BAT mode. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-iosched +@deftypevr {paramètre de @code{tlp-configuration}} maybe-space-separated-string-list disk-iosched Select IO scheduler for disk devices. One value has to be specified for each declared hard disk. Example alternatives are cfq, deadline and noop. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string sata-linkpwr-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} string sata-linkpwr-on-ac SATA aggressive link power management (ALPM) level. Alternatives are min_power, medium_power, max_performance. -Defaults to @samp{"max_performance"}. +La valeur par défaut est @samp{"max_performance"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string sata-linkpwr-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} string sata-linkpwr-on-bat Same as @code{sata-linkpwr-ac} but on BAT mode. -Defaults to @samp{"min_power"}. +La valeur par défaut est @samp{"min_power"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-string sata-linkpwr-blacklist +@deftypevr {paramètre de @code{tlp-configuration}} maybe-string sata-linkpwr-blacklist Exclude specified SATA host devices for link power management. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-ac? +@deftypevr {paramètre de @code{tlp-configuration}} maybe-on-off-boolean ahci-runtime-pm-on-ac? Enable Runtime Power Management for AHCI controller and disks on AC mode. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-bat? +@deftypevr {paramètre de @code{tlp-configuration}} maybe-on-off-boolean ahci-runtime-pm-on-bat? Same as @code{ahci-runtime-pm-on-ac} on BAT mode. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} non-negative-integer ahci-runtime-pm-timeout +@deftypevr {paramètre de @code{tlp-configuration}} non-negative-integer ahci-runtime-pm-timeout Seconds of inactivity before disk is suspended. -Defaults to @samp{15}. +La valeur par défaut est @samp{15}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string pcie-aspm-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} string pcie-aspm-on-ac PCI Express Active State Power Management level. Alternatives are default, performance, powersave. -Defaults to @samp{"performance"}. +La valeur par défaut est @samp{"performance"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string pcie-aspm-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} string pcie-aspm-on-bat Same as @code{pcie-aspm-ac} but on BAT mode. -Defaults to @samp{"powersave"}. +La valeur par défaut est @samp{"powersave"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string radeon-power-profile-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} string radeon-power-profile-on-ac Radeon graphics clock speed level. Alternatives are low, mid, high, auto, default. -Defaults to @samp{"high"}. +La valeur par défaut est @samp{"high"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string radeon-power-profile-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} string radeon-power-profile-on-bat Same as @code{radeon-power-ac} but on BAT mode. -Defaults to @samp{"low"}. +La valeur par défaut est @samp{"low"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string radeon-dpm-state-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} string radeon-dpm-state-on-ac Radeon dynamic power management method (DPM). Alternatives are battery, performance. -Defaults to @samp{"performance"}. +La valeur par défaut est @samp{"performance"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string radeon-dpm-state-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} string radeon-dpm-state-on-bat Same as @code{radeon-dpm-state-ac} but on BAT mode. -Defaults to @samp{"battery"}. +La valeur par défaut est @samp{"battery"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} string radeon-dpm-perf-level-on-ac Radeon DPM performance level. Alternatives are auto, low, high. -Defaults to @samp{"auto"}. +La valeur par défaut est @samp{"auto"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} string radeon-dpm-perf-level-on-bat Same as @code{radeon-dpm-perf-ac} but on BAT mode. -Defaults to @samp{"auto"}. +La valeur par défaut est @samp{"auto"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-ac? +@deftypevr {paramètre de @code{tlp-configuration}} on-off-boolean wifi-pwr-on-ac? Wifi power saving mode. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-bat? +@deftypevr {paramètre de @code{tlp-configuration}} on-off-boolean wifi-pwr-on-bat? Same as @code{wifi-power-ac?} but on BAT mode. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} y-n-boolean wol-disable? +@deftypevr {paramètre de @code{tlp-configuration}} y-n-boolean wol-disable? Disable wake on LAN. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} non-negative-integer sound-power-save-on-ac Timeout duration in seconds before activating audio power saving on Intel HDA and AC97 devices. A value of 0 disables power saving. -Defaults to @samp{0}. +La valeur par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} non-negative-integer sound-power-save-on-bat Same as @code{sound-powersave-ac} but on BAT mode. -Defaults to @samp{1}. +La valeur par défaut est @samp{1}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} y-n-boolean sound-power-save-controller? +@deftypevr {paramètre de @code{tlp-configuration}} y-n-boolean sound-power-save-controller? Disable controller in powersaving mode on Intel HDA devices. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} boolean bay-poweroff-on-bat? +@deftypevr {paramètre de @code{tlp-configuration}} boolean bay-poweroff-on-bat? 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. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string bay-device +@deftypevr {paramètre de @code{tlp-configuration}} string bay-device Name of the optical drive device to power off. -Defaults to @samp{"sr0"}. +La valeur par défaut est @samp{"sr0"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string runtime-pm-on-ac +@deftypevr {paramètre de @code{tlp-configuration}} string runtime-pm-on-ac Runtime Power Management for PCI(e) bus devices. Alternatives are on and auto. -Defaults to @samp{"on"}. +La valeur par défaut est @samp{"on"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} string runtime-pm-on-bat +@deftypevr {paramètre de @code{tlp-configuration}} string runtime-pm-on-bat Same as @code{runtime-pm-ac} but on BAT mode. -Defaults to @samp{"auto"}. +La valeur par défaut est @samp{"auto"}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} boolean runtime-pm-all? +@deftypevr {paramètre de @code{tlp-configuration}} boolean runtime-pm-all? Runtime Power Management for all PCI(e) bus devices, except blacklisted ones. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-space-separated-string-list runtime-pm-blacklist +@deftypevr {paramètre de @code{tlp-configuration}} maybe-space-separated-string-list runtime-pm-blacklist Exclude specified PCI(e) device addresses from Runtime Power Management. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} space-separated-string-list runtime-pm-driver-blacklist +@deftypevr {paramètre de @code{tlp-configuration}} space-separated-string-list runtime-pm-driver-blacklist Exclude PCI(e) devices assigned to the specified drivers from Runtime Power Management. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} boolean usb-autosuspend? +@deftypevr {paramètre de @code{tlp-configuration}} boolean usb-autosuspend? Enable USB autosuspend feature. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-string usb-blacklist +@deftypevr {paramètre de @code{tlp-configuration}} maybe-string usb-blacklist Exclude specified devices from USB autosuspend. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} boolean usb-blacklist-wwan? +@deftypevr {paramètre de @code{tlp-configuration}} boolean usb-blacklist-wwan? Exclude WWAN devices from USB autosuspend. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-string usb-whitelist +@deftypevr {paramètre de @code{tlp-configuration}} maybe-string usb-whitelist Include specified devices into USB autosuspend, even if they are already excluded by the driver or via @code{usb-blacklist-wwan?}. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} maybe-boolean usb-autosuspend-disable-on-shutdown? +@deftypevr {paramètre de @code{tlp-configuration}} maybe-boolean usb-autosuspend-disable-on-shutdown? Enable USB autosuspend before shutdown. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{tlp-configuration} parameter} boolean restore-device-state-on-startup? +@deftypevr {paramètre de @code{tlp-configuration}} boolean restore-device-state-on-startup? Restore radio device state (bluetooth, wifi, wwan) from previous shutdown on system startup. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr @@ -18343,20 +18635,20 @@ Defaults to @samp{#f}. The @code{(gnu services pm)} module provides an interface to thermald, a CPU frequency scaling service which helps prevent overheating. -@defvr {Scheme Variable} thermald-service-type +@defvr {Variable Scheme} thermald-service-type 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. @end defvr -@deftp {Data Type} thermald-configuration +@deftp {Type de données} thermald-configuration Data type representing the configuration of @code{thermald-service-type}. @table @asis -@item @code{ignore-cpuid-check?} (default: @code{#f}) +@item @code{ignore-cpuid-check?} (par défaut : @code{#f}) Ignore cpuid check for supported CPU models. -@item @code{thermald} (default: @var{thermald}) +@item @code{thermald} (par défaut : @var{thermald}) Package object of thermald. @end table @@ -18385,27 +18677,27 @@ The following example shows how one might run @code{mpd} as user (port "6666"))) @end example -@defvr {Scheme Variable} mpd-service-type +@defvr {Variable Scheme} mpd-service-type The service type for @command{mpd} @end defvr -@deftp {Data Type} mpd-configuration +@deftp {Type de données} mpd-configuration Data type representing the configuration of @command{mpd}. @table @asis -@item @code{user} (default: @code{"mpd"}) +@item @code{user} (par défaut : @code{"mpd"}) The user to run mpd as. -@item @code{music-dir} (default: @code{"~/Music"}) +@item @code{music-dir} (par défaut : @code{"~/Music"}) The directory to scan for music files. -@item @code{playlist-dir} (default: @code{"~/.mpd/playlists"}) +@item @code{playlist-dir} (par défaut : @code{"~/.mpd/playlists"}) The directory to store playlists. -@item @code{port} (default: @code{"6600"}) +@item @code{port} (par défaut : @code{"6600"}) The port to run mpd on. -@item @code{address} (default: @code{"any"}) +@item @code{address} (par défaut : @code{"any"}) The address that mpd will bind to. To use a Unix domain socket, an absolute path can be specified here. @@ -18424,7 +18716,7 @@ services. virtualization management system. This daemon runs on host servers and performs required management tasks for virtualized guests. -@deffn {Scheme Variable} libvirt-service-type +@deffn {Variable Scheme} libvirt-service-type This is the type of the @uref{https://libvirt.org, libvirt daemon}. Its value must be a @code{libvirt-configuration}. @@ -18437,25 +18729,25 @@ value must be a @code{libvirt-configuration}. @end deffn @c Auto-generated with (generate-libvirt-documentation) -Available @code{libvirt-configuration} fields are: +Les champs de @code{libvirt-configuration} disponibles sont : -@deftypevr {@code{libvirt-configuration} parameter} package libvirt +@deftypevr {paramètre de @code{libvirt-configuration}} package libvirt Libvirt package. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} boolean listen-tls? +@deftypevr {paramètre de @code{libvirt-configuration}} boolean listen-tls? Flag listening for secure TLS connections on the public TCP/IP port. must set @code{listen} for this to have any effect. It is necessary to setup a CA and issue server certificates before using this capability. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} boolean listen-tcp? +@deftypevr {paramètre de @code{libvirt-configuration}} boolean listen-tcp? Listen for unencrypted TCP connections on the public TCP/IP port. must set @code{listen} for this to have any effect. @@ -18463,118 +18755,118 @@ 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) -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string tls-port +@deftypevr {paramètre de @code{libvirt-configuration}} string tls-port Port for accepting secure TLS connections This can be a port number, or service name -Defaults to @samp{"16514"}. +La valeur par défaut est @samp{"16514"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string tcp-port +@deftypevr {paramètre de @code{libvirt-configuration}} string tcp-port Port for accepting insecure TCP connections This can be a port number, or service name -Defaults to @samp{"16509"}. +La valeur par défaut est @samp{"16509"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string listen-addr +@deftypevr {paramètre de @code{libvirt-configuration}} string listen-addr IP address or hostname used for client connections. -Defaults to @samp{"0.0.0.0"}. +La valeur par défaut est @samp{"0.0.0.0"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} boolean mdns-adv? +@deftypevr {paramètre de @code{libvirt-configuration}} boolean mdns-adv? Flag toggling mDNS advertisement of the libvirt service. Alternatively can disable for all services on a host by stopping the Avahi daemon. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string mdns-name +@deftypevr {paramètre de @code{libvirt-configuration}} string mdns-name Default mDNS advertisement name. This must be unique on the immediate broadcast network. -Defaults to @samp{"Virtualization Host "}. +La valeur par défaut est @samp{"Virtualization Host "}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string unix-sock-group +@deftypevr {paramètre de @code{libvirt-configuration}} string unix-sock-group UNIX domain socket group ownership. This can be used to allow a 'trusted' set of users access to management capabilities without becoming root. -Defaults to @samp{"root"}. +La valeur par défaut est @samp{"root"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string unix-sock-ro-perms +@deftypevr {paramètre de @code{libvirt-configuration}} string unix-sock-ro-perms UNIX socket permissions for the R/O socket. This is used for monitoring VM status only. -Defaults to @samp{"0777"}. +La valeur par défaut est @samp{"0777"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string unix-sock-rw-perms +@deftypevr {paramètre de @code{libvirt-configuration}} string unix-sock-rw-perms 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) -Defaults to @samp{"0770"}. +La valeur par défaut est @samp{"0770"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string unix-sock-admin-perms +@deftypevr {paramètre de @code{libvirt-configuration}} string unix-sock-admin-perms 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. -Defaults to @samp{"0777"}. +La valeur par défaut est @samp{"0777"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string unix-sock-dir +@deftypevr {paramètre de @code{libvirt-configuration}} string unix-sock-dir The directory in which sockets will be found/created. -Defaults to @samp{"/var/run/libvirt"}. +La valeur par défaut est @samp{"/var/run/libvirt"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string auth-unix-ro +@deftypevr {paramètre de @code{libvirt-configuration}} string auth-unix-ro Authentication scheme for UNIX read-only sockets. By default socket permissions allow anyone to connect -Defaults to @samp{"polkit"}. +La valeur par défaut est @samp{"polkit"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string auth-unix-rw +@deftypevr {paramètre de @code{libvirt-configuration}} string auth-unix-rw 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. -Defaults to @samp{"polkit"}. +La valeur par défaut est @samp{"polkit"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string auth-tcp +@deftypevr {paramètre de @code{libvirt-configuration}} string auth-tcp 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. -Defaults to @samp{"sasl"}. +La valeur par défaut est @samp{"sasl"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string auth-tls +@deftypevr {paramètre de @code{libvirt-configuration}} string auth-tls Authentication scheme for TLS sockets. TLS sockets already have encryption provided by the TLS layer, and limited authentication is done by certificates. @@ -18582,208 +18874,208 @@ certificates. It is possible to make use of any SASL authentication mechanism as well, by using 'sasl' for this option -Defaults to @samp{"none"}. +La valeur par défaut est @samp{"none"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} optional-list access-drivers +@deftypevr {paramètre de @code{libvirt-configuration}} optional-list access-drivers API access control scheme. By default an authenticated user is allowed access to all APIs. Access drivers can place restrictions on this. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string key-file +@deftypevr {paramètre de @code{libvirt-configuration}} string key-file Server key file path. If set to an empty string, then no private key is loaded. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string cert-file +@deftypevr {paramètre de @code{libvirt-configuration}} string cert-file Server key file path. If set to an empty string, then no certificate is loaded. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string ca-file +@deftypevr {paramètre de @code{libvirt-configuration}} string ca-file Server key file path. If set to an empty string, then no CA certificate is loaded. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string crl-file +@deftypevr {paramètre de @code{libvirt-configuration}} string crl-file Certificate revocation list path. If set to an empty string, then no CRL is loaded. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} boolean tls-no-sanity-cert +@deftypevr {paramètre de @code{libvirt-configuration}} boolean tls-no-sanity-cert Disable verification of our own server certificates. When libvirtd starts it performs some sanity checks against its own certificates. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} boolean tls-no-verify-cert +@deftypevr {paramètre de @code{libvirt-configuration}} boolean tls-no-verify-cert Disable verification of client certificates. Client certificate verification is the primary authentication mechanism. Any client which does not present a certificate signed by the CA will be rejected. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} optional-list tls-allowed-dn-list +@deftypevr {paramètre de @code{libvirt-configuration}} optional-list tls-allowed-dn-list Whitelist of allowed x509 Distinguished Name. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} optional-list sasl-allowed-usernames +@deftypevr {paramètre de @code{libvirt-configuration}} optional-list sasl-allowed-usernames Whitelist of allowed SASL usernames. The format for username depends on the SASL authentication mechanism. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string tls-priority +@deftypevr {paramètre de @code{libvirt-configuration}} string tls-priority 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. -Defaults to @samp{"NORMAL"}. +La valeur par défaut est @samp{"NORMAL"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer max-clients +@deftypevr {paramètre de @code{libvirt-configuration}} integer max-clients Maximum number of concurrent client connections to allow over all sockets combined. -Defaults to @samp{5000}. +La valeur par défaut est @samp{5000}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer max-queued-clients +@deftypevr {paramètre de @code{libvirt-configuration}} integer max-queued-clients 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. -Defaults to @samp{1000}. +La valeur par défaut est @samp{1000}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer max-anonymous-clients +@deftypevr {paramètre de @code{libvirt-configuration}} integer max-anonymous-clients Maximum length of queue of accepted but not yet authenticated clients. Set this to zero to turn this feature off -Defaults to @samp{20}. +La valeur par défaut est @samp{20}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer min-workers +@deftypevr {paramètre de @code{libvirt-configuration}} integer min-workers Number of workers to start up initially. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer max-workers +@deftypevr {paramètre de @code{libvirt-configuration}} integer max-workers Maximum number of worker threads. 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. -Defaults to @samp{20}. +La valeur par défaut est @samp{20}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer prio-workers +@deftypevr {paramètre de @code{libvirt-configuration}} integer prio-workers 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. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer max-requests +@deftypevr {paramètre de @code{libvirt-configuration}} integer max-requests Total global limit on concurrent RPC calls. -Defaults to @samp{20}. +La valeur par défaut est @samp{20}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer max-client-requests +@deftypevr {paramètre de @code{libvirt-configuration}} integer max-client-requests 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. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer admin-min-workers +@deftypevr {paramètre de @code{libvirt-configuration}} integer admin-min-workers Same as @code{min-workers} but for the admin interface. -Defaults to @samp{1}. +La valeur par défaut est @samp{1}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer admin-max-workers +@deftypevr {paramètre de @code{libvirt-configuration}} integer admin-max-workers Same as @code{max-workers} but for the admin interface. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer admin-max-clients +@deftypevr {paramètre de @code{libvirt-configuration}} integer admin-max-clients Same as @code{max-clients} but for the admin interface. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer admin-max-queued-clients +@deftypevr {paramètre de @code{libvirt-configuration}} integer admin-max-queued-clients Same as @code{max-queued-clients} but for the admin interface. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer admin-max-client-requests +@deftypevr {paramètre de @code{libvirt-configuration}} integer admin-max-client-requests Same as @code{max-client-requests} but for the admin interface. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer log-level +@deftypevr {paramètre de @code{libvirt-configuration}} integer log-level Logging level. 4 errors, 3 warnings, 2 information, 1 debug. -Defaults to @samp{3}. +La valeur par défaut est @samp{3}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string log-filters +@deftypevr {paramètre de @code{libvirt-configuration}} string log-filters Logging filters. A filter allows to select a different logging level for a given category of @@ -18824,11 +19116,11 @@ should be logged: Multiple filters can be defined in a single filters statement, they just need to be separated by spaces. -Defaults to @samp{"3:remote 4:event"}. +La valeur par défaut est @samp{"3:remote 4:event"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string log-outputs +@deftypevr {paramètre de @code{libvirt-configuration}} string log-outputs Logging outputs. An output is one of the places to save logging information The format for an @@ -18868,11 +19160,11 @@ In all case the x prefix is the minimal level, acting as a filter Multiple outputs can be defined, they just need to be separated by spaces. -Defaults to @samp{"3:stderr"}. +La valeur par défaut est @samp{"3:stderr"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer audit-level +@deftypevr {paramètre de @code{libvirt-configuration}} integer audit-level Allows usage of the auditing subsystem to be altered @itemize @bullet @@ -18887,25 +19179,25 @@ Allows usage of the auditing subsystem to be altered @end itemize -Defaults to @samp{1}. +La valeur par défaut est @samp{1}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} boolean audit-logging +@deftypevr {paramètre de @code{libvirt-configuration}} boolean audit-logging Send audit messages via libvirt logging infrastructure. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} optional-string host-uuid +@deftypevr {paramètre de @code{libvirt-configuration}} optional-string host-uuid Host UUID. UUID must not have all digits be the same. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} string host-uuid-source +@deftypevr {paramètre de @code{libvirt-configuration}} string host-uuid-source Source to read host UUID. @itemize @bullet @@ -18920,21 +19212,21 @@ Source to read host UUID. If @code{dmidecode} does not provide a valid UUID a temporary UUID will be generated. -Defaults to @samp{"smbios"}. +La valeur par défaut est @samp{"smbios"}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer keepalive-interval +@deftypevr {paramètre de @code{libvirt-configuration}} integer keepalive-interval 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. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer keepalive-count +@deftypevr {paramètre de @code{libvirt-configuration}} integer keepalive-count Maximum number of keepalive messages that are allowed to be sent to the client without getting any response before the connection is considered broken. @@ -18945,32 +19237,32 @@ 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. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer admin-keepalive-interval +@deftypevr {paramètre de @code{libvirt-configuration}} integer admin-keepalive-interval Same as above but for admin interface. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer admin-keepalive-count +@deftypevr {paramètre de @code{libvirt-configuration}} integer admin-keepalive-count Same as above but for admin interface. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{libvirt-configuration} parameter} integer ovs-timeout +@deftypevr {paramètre de @code{libvirt-configuration}} integer ovs-timeout Timeout for Open vSwitch calls. 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. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr @@ -18987,7 +19279,7 @@ 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. -@deffn {Scheme Variable} virtlog-service-type +@deffn {Variable Scheme} virtlog-service-type This is the type of the virtlog daemon. Its value must be a @code{virtlog-configuration}. @@ -18998,14 +19290,14 @@ This is the type of the virtlog daemon. Its value must be a @end example @end deffn -@deftypevr {@code{virtlog-configuration} parameter} integer log-level +@deftypevr {paramètre de @code{virtlog-configuration}} integer log-level Logging level. 4 errors, 3 warnings, 2 information, 1 debug. -Defaults to @samp{3}. +La valeur par défaut est @samp{3}. @end deftypevr -@deftypevr {@code{virtlog-configuration} parameter} string log-filters +@deftypevr {paramètre de @code{virtlog-configuration}} string log-filters Logging filters. A filter allows to select a different logging level for a given category of @@ -19046,11 +19338,11 @@ should be logged: Multiple filters can be defined in a single filters statement, they just need to be separated by spaces. -Defaults to @samp{"3:remote 4:event"}. +La valeur par défaut est @samp{"3:remote 4:event"}. @end deftypevr -@deftypevr {@code{virtlog-configuration} parameter} string log-outputs +@deftypevr {paramètre de @code{virtlog-configuration}} string log-outputs Logging outputs. An output is one of the places to save logging information The format for an @@ -19090,26 +19382,26 @@ In all case the x prefix is the minimal level, acting as a filter Multiple outputs can be defined, they just need to be separated by spaces. -Defaults to @samp{"3:stderr"}. +La valeur par défaut est @samp{"3:stderr"}. @end deftypevr -@deftypevr {@code{virtlog-configuration} parameter} integer max-clients +@deftypevr {paramètre de @code{virtlog-configuration}} integer max-clients Maximum number of concurrent client connections to allow over all sockets combined. -Defaults to @samp{1024}. +La valeur par défaut est @samp{1024}. @end deftypevr -@deftypevr {@code{virtlog-configuration} parameter} integer max-size +@deftypevr {paramètre de @code{virtlog-configuration}} integer max-size Maximum file size before rolling over. Defaults to @samp{2MB} @end deftypevr -@deftypevr {@code{virtlog-configuration} parameter} integer max-backups +@deftypevr {paramètre de @code{virtlog-configuration}} integer max-backups Maximum number of backup files to keep. Defaults to @samp{3} @@ -19126,7 +19418,7 @@ 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. -@defvr {Scheme Variable} qemu-binfmt-service-type +@defvr {Variable Scheme} qemu-binfmt-service-type 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: @@ -19143,15 +19435,15 @@ platforms. Running @code{herd stop qemu-binfmt} turns it off, and running @command{herd} command,, shepherd, The GNU Shepherd Manual}). @end defvr -@deftp {Data Type} qemu-binfmt-configuration +@deftp {Type de données} qemu-binfmt-configuration This is the configuration for the @code{qemu-binfmt} service. @table @asis -@item @code{platforms} (default: @code{'()}) +@item @code{platforms} (par défaut : @code{'()}) The list of emulated QEMU platforms. Each item must be a @dfn{platform object} as returned by @code{lookup-qemu-platforms} (see below). -@item @code{guix-support?} (default: @code{#f}) +@item @code{guix-support?} (par défaut : @code{#f}) When it is true, QEMU and all its dependencies are added to the build environment of @command{guix-daemon} (@pxref{Invoquer guix-daemon, @code{--chroot-directory} option}). This allows the @code{binfmt_misc} @@ -19179,23 +19471,23 @@ 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! -@item @code{qemu} (default: @code{qemu}) -The QEMU package to use. +@item @code{qemu} (par défaut : @code{qemu}) +Le paquet QEMU à utiliser. @end table @end deftp -@deffn {Scheme Procedure} lookup-qemu-platforms @var{platforms}@dots{} +@deffn {Procédure Scheme} lookup-qemu-platforms @var{platforms}@dots{} 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. @end deffn -@deffn {Scheme Procedure} qemu-platform? @var{obj} +@deffn {Procédure Scheme} qemu-platform? @var{obj} Return true if @var{obj} is a platform object. @end deffn -@deffn {Scheme Procedure} qemu-platform-name @var{platform} +@deffn {Procédure Scheme} qemu-platform-name @var{platform} Return the name of @var{platform}---a string such as @code{"arm"}. @end deffn @@ -19209,7 +19501,7 @@ remote access to local Git repositories. There are three options: the server to proxy some requests to @code{git-http-backend}, or providing a web interface with @code{cgit-service-type}. -@deffn {Scheme Procedure} git-daemon-service [#:config (git-daemon-configuration)] +@deffn {Procédure Scheme} git-daemon-service [#:config (git-daemon-configuration)] Return a service that runs @command{git daemon}, a simple TCP server to expose repositories over the Git protocol for anonymous access. @@ -19222,14 +19514,14 @@ access to exported@footnote{By creating the magic file @end deffn -@deftp {Data Type} git-daemon-configuration +@deftp {Type de données} git-daemon-configuration Data type representing the configuration for @code{git-daemon-service}. @table @asis -@item @code{package} (default: @var{git}) +@item @code{package} (par défaut : @var{git}) Package object of the Git distributed version control system. -@item @code{export-all?} (default: @var{#f}) +@item @code{export-all?} (par défaut : @var{#f}) Whether to allow access for all Git repositories, even if they do not have the @file{git-daemon-export-ok} file. @@ -19239,7 +19531,7 @@ 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}. -@item @code{user-path} (default: @var{#f}) +@item @code{user-path} (par défaut : @var{#f}) 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 @@ -19247,16 +19539,16 @@ 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}. -@item @code{listen} (default: @var{'()}) +@item @code{listen} (par défaut : @var{'()}) Whether to listen on specific IP addresses or hostnames, defaults to all. -@item @code{port} (default: @var{#f}) +@item @code{port} (par défaut : @var{#f}) Whether to listen on an alternative port, which defaults to 9418. -@item @code{whitelist} (default: @var{'()}) +@item @code{whitelist} (par défaut : @var{'()}) If not empty, only allow access to this list of directories. -@item @code{extra-options} (default: @var{'()}) +@item @code{extra-options} (par défaut : @var{'()}) Extra options will be passed to @code{git daemon}, please run @command{man git-daemon} for more information. @@ -19276,17 +19568,17 @@ Git web service. It is designed to sit behind a FastCGI proxy. @xref{Services Guix has a separate configuration data type for serving Git repositories over HTTP. -@deftp {Data Type} git-http-configuration +@deftp {Type de données} git-http-configuration Data type representing the configuration for @code{git-http-service}. @table @asis -@item @code{package} (default: @var{git}) +@item @code{package} (par défaut : @var{git}) Package object of the Git distributed version control system. @item @code{git-root} (default: @file{/srv/git}) Directory containing the Git repositories to expose to the world. -@item @code{export-all?} (default: @var{#f}) +@item @code{export-all?} (par défaut : @var{#f}) 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. @@ -19296,7 +19588,7 @@ 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. -@item @code{fcgiwrap-socket} (default: @code{127.0.0.1:9000}) +@item @code{fcgiwrap-socket} (par défaut : @code{127.0.0.1:9000}) The socket on which the @code{fcgiwrap} daemon is listening. @xref{Services web}. @end table @end deftp @@ -19305,7 +19597,7 @@ 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. -@deffn {Scheme Procedure} git-http-nginx-location-configuration @ +@deffn {Procédure Scheme} git-http-nginx-location-configuration @ [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 @@ -19355,738 +19647,738 @@ The @code{file-object} type designates either a file-like object @c %start of fragment -Available @code{cgit-configuration} fields are: +Les champs de @code{cgit-configuration} disponibles sont : -@deftypevr {@code{cgit-configuration} parameter} package package +@deftypevr {paramètre de @code{cgit-configuration}} package package The CGIT package. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} nginx-server-configuration-list nginx +@deftypevr {paramètre de @code{cgit-configuration}} nginx-server-configuration-list nginx NGINX configuration. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} file-object about-filter +@deftypevr {paramètre de @code{cgit-configuration}} file-object about-filter Specifies a command which will be invoked to format the content of about pages (both top-level and for each repository). -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string agefile +@deftypevr {paramètre de @code{cgit-configuration}} string agefile 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. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} file-object auth-filter +@deftypevr {paramètre de @code{cgit-configuration}} file-object auth-filter Specifies a command that will be invoked for authenticating repository access. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string branch-sort +@deftypevr {paramètre de @code{cgit-configuration}} string branch-sort 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. -Defaults to @samp{"name"}. +La valeur par défaut est @samp{"name"}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string cache-root +@deftypevr {paramètre de @code{cgit-configuration}} string cache-root Path used to store the cgit cache entries. -Defaults to @samp{"/var/cache/cgit"}. +La valeur par défaut est @samp{"/var/cache/cgit"}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer cache-static-ttl +@deftypevr {paramètre de @code{cgit-configuration}} integer cache-static-ttl Number which specifies the time-to-live, in minutes, for the cached version of repository pages accessed with a fixed SHA1. -Defaults to @samp{-1}. +La valeur par défaut est @samp{-1}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer cache-dynamic-ttl +@deftypevr {paramètre de @code{cgit-configuration}} integer cache-dynamic-ttl Number which specifies the time-to-live, in minutes, for the cached version of repository pages accessed without a fixed SHA1. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer cache-repo-ttl +@deftypevr {paramètre de @code{cgit-configuration}} integer cache-repo-ttl Number which specifies the time-to-live, in minutes, for the cached version of the repository summary page. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer cache-root-ttl +@deftypevr {paramètre de @code{cgit-configuration}} integer cache-root-ttl Number which specifies the time-to-live, in minutes, for the cached version of the repository index page. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer cache-scanrc-ttl +@deftypevr {paramètre de @code{cgit-configuration}} integer cache-scanrc-ttl Number which specifies the time-to-live, in minutes, for the result of scanning a path for Git repositories. -Defaults to @samp{15}. +La valeur par défaut est @samp{15}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer cache-about-ttl +@deftypevr {paramètre de @code{cgit-configuration}} integer cache-about-ttl Number which specifies the time-to-live, in minutes, for the cached version of the repository about page. -Defaults to @samp{15}. +La valeur par défaut est @samp{15}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer cache-snapshot-ttl +@deftypevr {paramètre de @code{cgit-configuration}} integer cache-snapshot-ttl Number which specifies the time-to-live, in minutes, for the cached version of snapshots. -Defaults to @samp{5}. +La valeur par défaut est @samp{5}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer cache-size +@deftypevr {paramètre de @code{cgit-configuration}} integer cache-size The maximum number of entries in the cgit cache. When set to @samp{0}, caching is disabled. -Defaults to @samp{0}. +La valeur par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean case-sensitive-sort? +@deftypevr {paramètre de @code{cgit-configuration}} boolean case-sensitive-sort? Sort items in the repo list case sensitively. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} list clone-prefix +@deftypevr {paramètre de @code{cgit-configuration}} list clone-prefix List of common prefixes which, when combined with a repository URL, generates valid clone URLs for the repository. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} list clone-url +@deftypevr {paramètre de @code{cgit-configuration}} list clone-url List of @code{clone-url} templates. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} file-object commit-filter +@deftypevr {paramètre de @code{cgit-configuration}} file-object commit-filter Command which will be invoked to format commit messages. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string commit-sort +@deftypevr {paramètre de @code{cgit-configuration}} string commit-sort 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. -Defaults to @samp{"git log"}. +La valeur par défaut est @samp{"git log"}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} file-object css +@deftypevr {paramètre de @code{cgit-configuration}} file-object css URL which specifies the css document to include in all cgit pages. -Defaults to @samp{"/share/cgit/cgit.css"}. +La valeur par défaut est @samp{"/share/cgit/cgit.css"}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} file-object email-filter +@deftypevr {paramètre de @code{cgit-configuration}} file-object email-filter 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. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean embedded? +@deftypevr {paramètre de @code{cgit-configuration}} boolean embedded? Flag which, when set to @samp{#t}, will make cgit generate a HTML fragment suitable for embedding in other HTML pages. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean enable-commit-graph? +@deftypevr {paramètre de @code{cgit-configuration}} boolean enable-commit-graph? 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. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean enable-filter-overrides? +@deftypevr {paramètre de @code{cgit-configuration}} boolean enable-filter-overrides? Flag which, when set to @samp{#t}, allows all filter settings to be overridden in repository-specific cgitrc files. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean enable-follow-links? +@deftypevr {paramètre de @code{cgit-configuration}} boolean enable-follow-links? Flag which, when set to @samp{#t}, allows users to follow a file in the log view. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean enable-http-clone? +@deftypevr {paramètre de @code{cgit-configuration}} boolean enable-http-clone? If set to @samp{#t}, cgit will act as an dumb HTTP endpoint for Git clones. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean enable-index-links? +@deftypevr {paramètre de @code{cgit-configuration}} boolean enable-index-links? Flag which, when set to @samp{#t}, will make cgit generate extra links "summary", "commit", "tree" for each repo in the repository index. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean enable-index-owner? +@deftypevr {paramètre de @code{cgit-configuration}} boolean enable-index-owner? Flag which, when set to @samp{#t}, will make cgit display the owner of each repo in the repository index. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean enable-log-filecount? +@deftypevr {paramètre de @code{cgit-configuration}} boolean enable-log-filecount? Flag which, when set to @samp{#t}, will make cgit print the number of modified files for each commit on the repository log page. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean enable-log-linecount? +@deftypevr {paramètre de @code{cgit-configuration}} boolean enable-log-linecount? 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. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean enable-remote-branches? +@deftypevr {paramètre de @code{cgit-configuration}} boolean enable-remote-branches? Flag which, when set to @code{#t}, will make cgit display remote branches in the summary and refs views. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean enable-subject-links? +@deftypevr {paramètre de @code{cgit-configuration}} boolean enable-subject-links? 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. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean enable-html-serving? +@deftypevr {paramètre de @code{cgit-configuration}} boolean enable-html-serving? 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. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean enable-tree-linenumbers? +@deftypevr {paramètre de @code{cgit-configuration}} boolean enable-tree-linenumbers? Flag which, when set to @samp{#t}, will make cgit generate linenumber links for plaintext blobs printed in the tree view. -Defaults to @samp{#t}. +La valeur par défaut est @samp{#t}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean enable-git-config? +@deftypevr {paramètre de @code{cgit-configuration}} boolean enable-git-config? Flag which, when set to @samp{#f}, will allow cgit to use Git config to set any repo specific settings. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} file-object favicon +@deftypevr {paramètre de @code{cgit-configuration}} file-object favicon URL used as link to a shortcut icon for cgit. -Defaults to @samp{"/favicon.ico"}. +La valeur par défaut est @samp{"/favicon.ico"}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string footer +@deftypevr {paramètre de @code{cgit-configuration}} string footer 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). -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string head-include +@deftypevr {paramètre de @code{cgit-configuration}} string head-include The content of the file specified with this option will be included verbatim in the HTML HEAD section on all pages. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string header +@deftypevr {paramètre de @code{cgit-configuration}} string header The content of the file specified with this option will be included verbatim at the top of all pages. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} file-object include +@deftypevr {paramètre de @code{cgit-configuration}} file-object include Name of a configfile to include before the rest of the current config- file is parsed. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string index-header +@deftypevr {paramètre de @code{cgit-configuration}} string index-header The content of the file specified with this option will be included verbatim above the repository index. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string index-info +@deftypevr {paramètre de @code{cgit-configuration}} string index-info The content of the file specified with this option will be included verbatim below the heading on the repository index page. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean local-time? +@deftypevr {paramètre de @code{cgit-configuration}} boolean local-time? Flag which, if set to @samp{#t}, makes cgit print commit and tag times in the servers timezone. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} file-object logo +@deftypevr {paramètre de @code{cgit-configuration}} file-object logo URL which specifies the source of an image which will be used as a logo on all cgit pages. -Defaults to @samp{"/share/cgit/cgit.png"}. +La valeur par défaut est @samp{"/share/cgit/cgit.png"}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string logo-link +@deftypevr {paramètre de @code{cgit-configuration}} string logo-link URL loaded when clicking on the cgit logo image. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} file-object owner-filter +@deftypevr {paramètre de @code{cgit-configuration}} file-object owner-filter Command which will be invoked to format the Owner column of the main page. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer max-atom-items +@deftypevr {paramètre de @code{cgit-configuration}} integer max-atom-items Number of items to display in atom feeds view. -Defaults to @samp{10}. +La valeur par défaut est @samp{10}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer max-commit-count +@deftypevr {paramètre de @code{cgit-configuration}} integer max-commit-count Number of entries to list per page in "log" view. -Defaults to @samp{50}. +La valeur par défaut est @samp{50}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer max-message-length +@deftypevr {paramètre de @code{cgit-configuration}} integer max-message-length Number of commit message characters to display in "log" view. -Defaults to @samp{80}. +La valeur par défaut est @samp{80}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer max-repo-count +@deftypevr {paramètre de @code{cgit-configuration}} integer max-repo-count Specifies the number of entries to list per page on the repository index page. -Defaults to @samp{50}. +La valeur par défaut est @samp{50}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer max-repodesc-length +@deftypevr {paramètre de @code{cgit-configuration}} integer max-repodesc-length Specifies the maximum number of repo description characters to display on the repository index page. -Defaults to @samp{80}. +La valeur par défaut est @samp{80}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer max-blob-size +@deftypevr {paramètre de @code{cgit-configuration}} integer max-blob-size Specifies the maximum size of a blob to display HTML for in KBytes. -Defaults to @samp{0}. +La valeur par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string max-stats +@deftypevr {paramètre de @code{cgit-configuration}} string max-stats Maximum statistics period. Valid values are @samp{week},@samp{month}, @samp{quarter} and @samp{year}. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} mimetype-alist mimetype +@deftypevr {paramètre de @code{cgit-configuration}} mimetype-alist mimetype Mimetype for the specified filename extension. -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"))}. +La valeur par défaut est @samp{((gif "image/gif") (html "text/html") (jpg +"image/jpeg") (jpeg "image/jpeg") (pdf "application/pdf") (png "image/png") +(svg "image/svg+xml"))}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} file-object mimetype-file +@deftypevr {paramètre de @code{cgit-configuration}} file-object mimetype-file Specifies the file to use for automatic mimetype lookup. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string module-link +@deftypevr {paramètre de @code{cgit-configuration}} string module-link Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean nocache? +@deftypevr {paramètre de @code{cgit-configuration}} boolean nocache? If set to the value @samp{#t} caching will be disabled. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean noplainemail? +@deftypevr {paramètre de @code{cgit-configuration}} boolean noplainemail? If set to @samp{#t} showing full author email addresses will be disabled. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean noheader? +@deftypevr {paramètre de @code{cgit-configuration}} boolean noheader? Flag which, when set to @samp{#t}, will make cgit omit the standard header on all pages. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} project-list project-list +@deftypevr {paramètre de @code{cgit-configuration}} project-list project-list 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. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} file-object readme +@deftypevr {paramètre de @code{cgit-configuration}} file-object readme Text which will be used as default value for @code{cgit-repo-readme}. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean remove-suffix? +@deftypevr {paramètre de @code{cgit-configuration}} boolean remove-suffix? 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. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer renamelimit +@deftypevr {paramètre de @code{cgit-configuration}} integer renamelimit Maximum number of files to consider when detecting renames. -Defaults to @samp{-1}. +La valeur par défaut est @samp{-1}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string repository-sort +@deftypevr {paramètre de @code{cgit-configuration}} string repository-sort The way in which repositories in each section are sorted. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} robots-list robots +@deftypevr {paramètre de @code{cgit-configuration}} robots-list robots Text used as content for the @code{robots} meta-tag. -Defaults to @samp{("noindex" "nofollow")}. +La valeur par défaut est @samp{("noindex" "nofollow")}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string root-desc +@deftypevr {paramètre de @code{cgit-configuration}} string root-desc Text printed below the heading on the repository index page. -Defaults to @samp{"a fast webinterface for the git dscm"}. +La valeur par défaut est @samp{"a fast webinterface for the git dscm"}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string root-readme +@deftypevr {paramètre de @code{cgit-configuration}} string root-readme The content of the file specified with this option will be included verbatim below thef "about" link on the repository index page. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string root-title +@deftypevr {paramètre de @code{cgit-configuration}} string root-title Text printed as heading on the repository index page. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean scan-hidden-path +@deftypevr {paramètre de @code{cgit-configuration}} boolean scan-hidden-path 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. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} list snapshots +@deftypevr {paramètre de @code{cgit-configuration}} list snapshots Text which specifies the default set of snapshot formats that cgit generates links for. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} repository-directory repository-directory +@deftypevr {paramètre de @code{cgit-configuration}} repository-directory repository-directory Name of the directory to scan for repositories (represents @code{scan-path}). -Defaults to @samp{"/srv/git"}. +La valeur par défaut est @samp{"/srv/git"}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string section +@deftypevr {paramètre de @code{cgit-configuration}} string section The name of the current repository section - all repositories defined after this option will inherit the current section name. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string section-sort +@deftypevr {paramètre de @code{cgit-configuration}} string section-sort Flag which, when set to @samp{1}, will sort the sections on the repository listing by name. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer section-from-path +@deftypevr {paramètre de @code{cgit-configuration}} integer section-from-path 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. -Defaults to @samp{0}. +La valeur par défaut est @samp{0}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} boolean side-by-side-diffs? +@deftypevr {paramètre de @code{cgit-configuration}} boolean side-by-side-diffs? If set to @samp{#t} shows side-by-side diffs instead of unidiffs per default. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} file-object source-filter +@deftypevr {paramètre de @code{cgit-configuration}} file-object source-filter Specifies a command which will be invoked to format plaintext blobs in the tree view. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer summary-branches +@deftypevr {paramètre de @code{cgit-configuration}} integer summary-branches Specifies the number of branches to display in the repository "summary" view. -Defaults to @samp{10}. +La valeur par défaut est @samp{10}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer summary-log +@deftypevr {paramètre de @code{cgit-configuration}} integer summary-log Specifies the number of log entries to display in the repository "summary" view. -Defaults to @samp{10}. +La valeur par défaut est @samp{10}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} integer summary-tags +@deftypevr {paramètre de @code{cgit-configuration}} integer summary-tags Specifies the number of tags to display in the repository "summary" view. -Defaults to @samp{10}. +La valeur par défaut est @samp{10}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string strict-export +@deftypevr {paramètre de @code{cgit-configuration}} string strict-export Filename which, if specified, needs to be present within the repository for cgit to allow access to that repository. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} string virtual-root +@deftypevr {paramètre de @code{cgit-configuration}} string virtual-root URL which, if specified, will be used as root for all cgit links. -Defaults to @samp{"/"}. +La valeur par défaut est @samp{"/"}. @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} repository-cgit-configuration-list repositories +@deftypevr {paramètre de @code{cgit-configuration}} repository-cgit-configuration-list repositories A list of @dfn{cgit-repo} records to use with config. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. -Available @code{repository-cgit-configuration} fields are: +Les champs de @code{repository-cgit-configuration} disponibles sont : -@deftypevr {@code{repository-cgit-configuration} parameter} repo-list snapshots +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-list snapshots A mask of snapshot formats for this repo that cgit generates links for, restricted by the global @code{snapshots} setting. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-file-object source-filter +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-file-object source-filter Override the default @code{source-filter}. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-string url +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-string url The relative URL used to access the repository. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-file-object about-filter +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-file-object about-filter Override the default @code{about-filter}. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-string branch-sort +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-string branch-sort 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. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-list clone-url +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-list clone-url A list of URLs which can be used to clone repo. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-file-object commit-filter +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-file-object commit-filter Override the default @code{commit-filter}. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-string commit-sort +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-string commit-sort 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. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-string defbranch +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-string defbranch 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. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-string desc +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-string desc The value to show as repository description. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-string homepage +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-string homepage The value to show as repository homepage. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-file-object email-filter +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-file-object email-filter Override the default @code{email-filter}. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr @@ -20094,7 +20386,7 @@ Defaults to @samp{""}. A flag which can be used to disable the global setting @code{enable-commit-graph?}. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr @@ -20102,7 +20394,7 @@ Defaults to @samp{disabled}. A flag which can be used to disable the global setting @code{enable-log-filecount?}. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr @@ -20110,7 +20402,7 @@ Defaults to @samp{disabled}. A flag which can be used to disable the global setting @code{enable-log-linecount?}. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr @@ -20118,7 +20410,7 @@ Defaults to @samp{disabled}. Flag which, when set to @code{#t}, will make cgit display remote branches in the summary and refs views. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr @@ -20126,7 +20418,7 @@ Defaults to @samp{disabled}. A flag which can be used to override the global setting @code{enable-subject-links?}. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr @@ -20134,121 +20426,121 @@ Defaults to @samp{disabled}. A flag which can be used to override the global setting @code{enable-html-serving?}. -Defaults to @samp{disabled}. +La valeur par défaut est @samp{disabled}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-boolean hide? +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-boolean hide? Flag which, when set to @code{#t}, hides the repository from the repository index. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-boolean ignore? +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-boolean ignore? Flag which, when set to @samp{#t}, ignores the repository. -Defaults to @samp{#f}. +La valeur par défaut est @samp{#f}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-file-object logo +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-file-object logo URL which specifies the source of an image which will be used as a logo on this repo’s pages. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-string logo-link +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-string logo-link URL loaded when clicking on the cgit logo image. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-file-object owner-filter +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-file-object owner-filter Override the default @code{owner-filter}. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-string module-link +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-string module-link 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. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} module-link-path module-link-path +@deftypevr {paramètre de @code{repository-cgit-configuration}} module-link-path module-link-path 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. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-string max-stats +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-string max-stats Override the default maximum statistics period. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-string name +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-string name The value to show as repository name. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-string owner +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-string owner A value used to identify the owner of the repository. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-string path +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-string path An absolute path to the repository directory. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-string readme +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-string readme A path (relative to repo) which specifies a file to include verbatim as the "About" page for this repo. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-string section +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-string section The name of the current repository section - all repositories defined after this option will inherit the current section name. -Defaults to @samp{""}. +La valeur par défaut est @samp{""}. @end deftypevr -@deftypevr {@code{repository-cgit-configuration} parameter} repo-list extra-options +@deftypevr {paramètre de @code{repository-cgit-configuration}} repo-list extra-options Extra options will be appended to cgitrc file. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr @end deftypevr -@deftypevr {@code{cgit-configuration} parameter} list extra-options +@deftypevr {paramètre de @code{cgit-configuration}} list extra-options Extra options will be appended to cgitrc file. -Defaults to @samp{()}. +La valeur par défaut est @samp{()}. @end deftypevr @@ -20260,13 +20552,13 @@ 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. -Available @code{opaque-cgit-configuration} fields are: +Les champs de @code{opaque-cgit-configuration} disponibles sont : -@deftypevr {@code{opaque-cgit-configuration} parameter} package cgit +@deftypevr {paramètre de @code{opaque-cgit-configuration}} package cgit The cgit package. @end deftypevr -@deftypevr {@code{opaque-cgit-configuration} parameter} string string +@deftypevr {paramètre de @code{opaque-cgit-configuration}} string string The contents of the @code{cgitrc}, as a string. @end deftypevr @@ -20289,7 +20581,7 @@ instantiate a cgit service like this: tactical strategy game, with several single player campaigns, and multiplayer games (both networked and local). -@defvar {Scheme Variable} wesnothd-service-type +@defvar {Variable Scheme} wesnothd-service-type 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: @@ -20299,14 +20591,14 @@ configuration, instantiate it as: @end example @end defvar -@deftp {Data Type} wesnothd-configuration +@deftp {Type de données} wesnothd-configuration Data type representing the configuration of @command{wesnothd}. @table @asis -@item @code{package} (default: @code{wesnoth-server}) +@item @code{package} (par défaut : @code{wesnoth-server}) The wesnoth server package to use. -@item @code{port} (default: @code{15000}) +@item @code{port} (par défaut : @code{15000}) The port to bind the server to. @end table @end deftp @@ -20335,7 +20627,7 @@ reading capability. The @code{(gnu services sysctl)} provides a service to configure kernel parameters at boot. -@defvr {Scheme Variable} sysctl-service-type +@defvr {Variable Scheme} sysctl-service-type The service type for @command{sysctl}, which modifies kernel parameters under @file{/proc/sys/}. To enable IPv4 forwarding, it can be instantiated as: @@ -20347,24 +20639,56 @@ as: @end example @end defvr -@deftp {Data Type} sysctl-configuration +@deftp {Type de données} sysctl-configuration The data type representing the configuration of @command{sysctl}. @table @asis -@item @code{sysctl} (default: @code{(file-append procps "/sbin/sysctl"}) +@item @code{sysctl} (par défaut : @code{(file-append procps "/sbin/sysctl"}) The @command{sysctl} executable to use. -@item @code{settings} (default: @code{'()}) +@item @code{settings} (par défaut : @code{'()}) An association list specifies kernel parameters and their values. @end table @end deftp +@cindex pcscd +@subsubheading PC/SC Smart Card Daemon Service + +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. + +@defvr {Scheme Variable} pcscd-service-type +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: + +@example +(service pcscd-service-type) +@end example +@end defvr + +@deftp {Data Type} pcscd-configuration +The data type representing the configuration of @command{pcscd}. + +@table @asis +@item @code{pcsc-lite} (default: @code{pcsc-lite}) +The pcsc-lite package that provides pcscd. +@item @code{usb-drivers} (default: @code{(list ccid)}) +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. +@end table +@end deftp + @cindex lirc @subsubheading Lirc Service The @code{(gnu services lirc)} module provides the following service. -@deffn {Scheme Procedure} lirc-service [#:lirc lirc] @ +@deffn {Procédure Scheme} lirc-service [#:lirc lirc] @ [#: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. @@ -20381,7 +20705,7 @@ passed to @command{lircd}. The @code{(gnu services spice)} module provides the following service. -@deffn {Scheme Procedure} spice-vdagent-service [#:spice-vdagent] +@deffn {Procédure Scheme} spice-vdagent-service [#:spice-vdagent] Returns a service that runs @url{http://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. @@ -20391,7 +20715,7 @@ display resolution when the graphical console window resizes. @cindex dictionary The @code{(gnu services dict)} module provides the following service: -@deffn {Scheme Procedure} dicod-service [#:config (dicod-configuration)] +@deffn {Procédure Scheme} dicod-service [#:config (dicod-configuration)] Return a service that runs the @command{dicod} daemon, an implementation of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual}). @@ -20404,34 +20728,34 @@ You can add @command{open localhost} to your @file{~/.dico} file to make (@pxref{Initialization File,,, dico, GNU Dico Manual}). @end deffn -@deftp {Data Type} dicod-configuration +@deftp {Type de données} dicod-configuration Data type representing the configuration of dicod. @table @asis -@item @code{dico} (default: @var{dico}) +@item @code{dico} (par défaut : @var{dico}) Package object of the GNU Dico dictionary server. -@item @code{interfaces} (default: @var{'("localhost")}) +@item @code{interfaces} (par défaut : @var{'("localhost")}) 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}). -@item @code{handlers} (default: @var{'()}) +@item @code{handlers} (par défaut : @var{'()}) List of @code{} objects denoting handlers (module instances). -@item @code{databases} (default: @var{(list %dicod-database:gcide)}) +@item @code{databases} (par défaut : @var{(list %dicod-database:gcide)}) List of @code{} objects denoting dictionaries to be served. @end table @end deftp -@deftp {Data Type} dicod-handler +@deftp {Type de données} dicod-handler Data type representing a dictionary handler (module instance). @table @asis @item @code{name} Name of the handler (module instance). -@item @code{module} (default: @var{#f}) +@item @code{module} (par défaut : @var{#f}) 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}). @@ -20441,7 +20765,7 @@ List of strings or gexps representing the arguments for the module handler @end table @end deftp -@deftp {Data Type} dicod-database +@deftp {Type de données} dicod-database Data type representing a dictionary database. @table @asis @@ -20452,7 +20776,7 @@ Name of the database, will be used in DICT commands. Name of the dicod handler (module instance) used by this database (@pxref{Handlers,,, dico, GNU Dico Manual}). -@item @code{complex?} (default: @var{#f}) +@item @code{complex?} (par défaut : @var{#f}) Whether the database configuration complex. The complex configuration will need a corresponding @code{} object, otherwise not. @@ -20462,7 +20786,7 @@ List of strings or gexps representing the arguments for the database @end table @end deftp -@defvr {Scheme Variable} %dicod-database:gcide +@defvr {Variable Scheme} %dicod-database:gcide A @code{} object serving the GNU Collaborative International Dictionary of English using the @code{gcide} package. @end defvr @@ -20518,7 +20842,7 @@ designated by this G-expression (@pxref{G-Expressions}): A default set of setuid programs is defined by the @code{%setuid-programs} variable of the @code{(gnu system)} module. -@defvr {Scheme Variable} %setuid-programs +@defvr {Variable Scheme} %setuid-programs A list of G-expressions denoting common programs that are setuid-root. The list includes commands such as @command{passwd}, @command{ping}, @@ -20655,12 +20979,12 @@ the name service cache daemon (@pxref{Services de base, @code{nscd-service}}). For convenience, the following variables provide typical NSS configurations. -@defvr {Scheme Variable} %default-nss +@defvr {Variable Scheme} %default-nss This is the default name service switch configuration, a @code{name-service-switch} object. @end defvr -@defvr {Scheme Variable} %mdns-host-lookup-nss +@defvr {Variable Scheme} %mdns-host-lookup-nss This is the name service switch configuration with support for host name lookup over multicast DNS (mDNS) for host names ending in @code{.local}. @end defvr @@ -20674,7 +20998,7 @@ 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}. -@deftp {Data Type} name-service-switch +@deftp {Type de données} name-service-switch This is the data type representation the configuration of libc's name service switch (NSS). Each field below represents one of the supported @@ -20699,7 +21023,7 @@ list of @code{} objects (see below). @end table @end deftp -@deftp {Data Type} name-service +@deftp {Type de données} name-service This is the data type representing an actual name service and the associated lookup action. @@ -20730,7 +21054,7 @@ Reference Manual}). For example: @subsection Disque de RAM initial @cindex initrd -@cindex initial RAM disk +@cindex disque de RAM initial 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 @@ -20751,7 +21075,7 @@ default modules to be able to access your root file system, you would write: (initrd-modules (cons "megaraid_sas" %base-initrd-modules))) @end example -@defvr {Scheme Variable} %base-initrd-modules +@defvr {Variable Scheme} %base-initrd-modules This is the list of kernel modules included in the initrd by default. @end defvr @@ -20830,7 +21154,7 @@ Now that you know all the features that initial RAM disks produced by customize it further. @cindex initrd -@cindex initial RAM disk +@cindex disque de RAM initial @deffn {Monadic Procedure} raw-initrd @var{file-systems} @ [#:linux-modules '()] [#:mapped-devices '()] @ [#:helper-packages '()] [#:qemu-networking? #f] [#:volatile-root? #f] Return a monadic derivation @@ -20898,7 +21222,7 @@ 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. -@deftp {Data Type} bootloader-configuration +@deftp {Type de données} bootloader-configuration The type of a bootloader configuration declaration. @table @asis @@ -20938,24 +21262,24 @@ by the bootloader @command{installer} command, such as @code{/dev/sda} or @code{grub-efi-bootloader}, it should be the mount point of the EFI file system, usually @file{/boot/efi}. -@item @code{menu-entries} (default: @code{()}) +@item @code{menu-entries} (par défaut : @code{()}) 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. -@item @code{default-entry} (default: @code{0}) +@item @code{default-entry} (par défaut : @code{0}) The index of the default boot menu entry. Index 0 is for the entry of the current system. -@item @code{timeout} (default: @code{5}) +@item @code{timeout} (par défaut : @code{5}) The number of seconds to wait for keyboard input before booting. Set to 0 to boot immediately, and to -1 to wait indefinitely. -@item @code{theme} (default: @var{#f}) +@item @code{theme} (par défaut : @var{#f}) 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. -@item @code{terminal-outputs} (default: @code{'gfxterm}) +@item @code{terminal-outputs} (par défaut : @code{'gfxterm}) 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}, @@ -20963,7 +21287,7 @@ symbols. GRUB accepts the values: @code{console}, @code{serial}, variable @code{GRUB_TERMINAL_OUTPUT} (@pxref{Simple configuration,,, grub,GNU GRUB manual}). -@item @code{terminal-inputs} (default: @code{'()}) +@item @code{terminal-inputs} (par défaut : @code{'()}) 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}, @@ -20972,12 +21296,12 @@ determined at run-time. GRUB accepts the values: @code{console}, @code{GRUB_TERMINAL_INPUT} (@pxref{Simple configuration,,, grub,GNU GRUB manual}). -@item @code{serial-unit} (default: @code{#f}) +@item @code{serial-unit} (par défaut : @code{#f}) 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}). -@item @code{serial-speed} (default: @code{#f}) +@item @code{serial-speed} (par défaut : @code{#f}) 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}). @@ -21003,7 +21327,7 @@ lines: Details below. -@deftp {Data Type} menu-entry +@deftp {Type de données} menu-entry The type of an entry in the bootloader menu. @table @asis @@ -21029,14 +21353,14 @@ grub, GNU GRUB manual}), for example: If the device is specified explicitly as above, then the @code{device} field is ignored entirely. -@item @code{linux-arguments} (default: @code{()}) +@item @code{linux-arguments} (par défaut : @code{()}) The list of extra Linux kernel command-line arguments---e.g., @code{("console=ttyS0")}. @item @code{initrd} A G-Expression or string denoting the file name of the initial RAM disk to use (@pxref{G-Expressions}). -@item @code{device} (default: @code{#f}) +@item @code{device} (par défaut : @code{#f}) 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}). @@ -21053,7 +21377,7 @@ bootloader will search the device containing the file specified by the Fow now only GRUB has theme support. GRUB themes are created using the @code{grub-theme} form, which is not documented yet. -@defvr {Scheme Variable} %default-theme +@defvr {Variable Scheme} %default-theme This is the default GRUB theme used by the operating system if no @code{theme} field is specified in @code{bootloader-configuration} record. @@ -21062,7 +21386,7 @@ It comes with a fancy background image displaying the GNU and Guix logos. @node Invoquer guix system -@subsection Invoking @code{guix system} +@subsection Invoquer @code{guix system} Once you have written an operating system declaration as seen in the previous section, it can be @dfn{instantiated} using the @command{guix @@ -21531,7 +21855,7 @@ download}. @subsubsection Connecting Through SSH @cindex SSH -@cindex SSH server +@cindex serveur SSH To enable SSH inside a VM you need to add a SSH server like @code{(dropbear-service)} or @code{(lsh-service)} to your VM. The @code{(lsh-service}) doesn't currently boot unsupervised. It requires you @@ -21785,7 +22109,7 @@ We have seen an overview of service types (@pxref{Types service et services}). and service types. This interface is provided by the @code{(gnu services)} module. -@deffn {Scheme Procedure} service @var{type} [@var{value}] +@deffn {Procédure Scheme} service @var{type} [@var{value}] 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. @@ -21811,15 +22135,15 @@ In both cases the result is an instance of @code{openssh-service-type} with the default configuration. @end deffn -@deffn {Scheme Procedure} service? @var{obj} +@deffn {Procédure Scheme} service? @var{obj} Return true if @var{obj} is a service. @end deffn -@deffn {Scheme Procedure} service-kind @var{service} +@deffn {Procédure Scheme} service-kind @var{service} Return the type of @var{service}---i.e., a @code{} object. @end deffn -@deffn {Scheme Procedure} service-value @var{service} +@deffn {Procédure Scheme} service-value @var{service} Return the value associated with @var{service}. It represents its parameters. @end deffn @@ -21881,7 +22205,7 @@ you want to know when writing new service definitions, but not necessarily when simply looking for ways to customize your @code{operating-system} declaration. -@deftp {Data Type} service-type +@deftp {Type de données} service-type @cindex service type This is the representation of a @dfn{service type} (@pxref{Types service et services}). @@ -21892,7 +22216,7 @@ This is a symbol, used only to simplify inspection and debugging. @item @code{extensions} A non-empty list of @code{} objects (see below). -@item @code{compose} (default: @code{#f}) +@item @code{compose} (par défaut : @code{#f}) 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. @@ -21901,7 +22225,7 @@ 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. -@item @code{extend} (default: @code{#f}) +@item @code{extend} (par défaut : @code{#f}) If this is @code{#f}, services of this type cannot be extended. Otherwise, it must be a two-argument procedure: @code{fold-services} calls @@ -21914,7 +22238,7 @@ service instance. @xref{Types service et services}, for examples. @end deftp -@deffn {Scheme Procedure} service-extension @var{target-type} @ +@deffn {Procédure Scheme} service-extension @var{target-type} @ @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 @@ -21922,7 +22246,7 @@ service that provides the extension; it must return a valid value for the target service. @end deffn -@deffn {Scheme Procedure} service-extension? @var{obj} +@deffn {Procédure Scheme} service-extension? @var{obj} Return true if @var{obj} is a service extension. @end deffn @@ -21931,7 +22255,7 @@ 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. -@deffn {Scheme Procedure} simple-service @var{name} @var{target} @var{value} +@deffn {Procédure Scheme} simple-service @var{name} @var{target} @var{value} 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. @@ -21953,7 +22277,7 @@ system---the directory shown by the @command{guix system build} command extensions down the service graph, updating each node parameters on the way, until it reaches the root node. -@deffn {Scheme Procedure} fold-services @var{services} @ +@deffn {Procédure Scheme} fold-services @var{services} @ [#: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. @@ -21962,17 +22286,17 @@ service adjusted accordingly. Lastly, the @code{(gnu services)} module also defines several essential service types, some of which are listed below. -@defvr {Scheme Variable} system-service-type +@defvr {Variable Scheme} system-service-type This is the root of the service graph. It produces the system directory as returned by the @command{guix system build} command. @end defvr -@defvr {Scheme Variable} boot-service-type +@defvr {Variable Scheme} boot-service-type The type of the ``boot service'', which produces the @dfn{boot script}. The boot script is what the initial RAM disk runs when booting. @end defvr -@defvr {Scheme Variable} etc-service-type +@defvr {Variable Scheme} etc-service-type 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: @@ -21985,13 +22309,13 @@ In this example, the effect would be to add an @file{/etc/issue} file pointing to the given file. @end defvr -@defvr {Scheme Variable} setuid-program-service-type +@defvr {Variable Scheme} setuid-program-service-type 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{Programmes setuid}). @end defvr -@defvr {Scheme Variable} profile-service-type +@defvr {Variable Scheme} profile-service-type 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. @@ -22024,7 +22348,7 @@ The @var{%shepherd-root-service} is a service object representing PID@tie{}1, of type @var{shepherd-root-service-type}; it can be extended by passing it lists of @code{} objects. -@deftp {Data Type} shepherd-service +@deftp {Type de données} shepherd-service The data type representing a service managed by the Shepherd. @table @asis @@ -22036,15 +22360,15 @@ These are the names that may be passed to @command{herd start}, shepherd, The GNU Shepherd Manual}). @xref{Slots of services, the @code{provides} slot,, shepherd, The GNU Shepherd Manual}, for details. -@item @code{requirements} (default: @code{'()}) +@item @code{requirements} (par défaut : @code{'()}) List of symbols denoting the Shepherd services this one depends on. -@item @code{respawn?} (default: @code{#t}) +@item @code{respawn?} (par défaut : @code{#t}) Whether to restart the service when it stops, for instance when the underlying process dies. @item @code{start} -@itemx @code{stop} (default: @code{#~(const #f)}) +@itemx @code{stop} (par défaut : @code{#~(const #f)}) 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 @@ -22071,7 +22395,7 @@ herd doc @var{service-name} where @var{service-name} is one of the symbols in @var{provision} (@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual}). -@item @code{modules} (default: @var{%default-modules}) +@item @code{modules} (par défaut : @var{%default-modules}) This is the list of modules that must be in scope when @code{start} and @code{stop} are evaluated. @@ -22127,7 +22451,7 @@ This, as you can see, is a fairly sophisticated way to say hello. info on actions. @end deftp -@defvr {Scheme Variable} shepherd-root-service-type +@defvr {Variable Scheme} shepherd-root-service-type The service type for the Shepherd ``root service''---i.e., PID@tie{}1. This is the service type that extensions target when they want to create @@ -22135,7 +22459,7 @@ shepherd services (@pxref{Types service et services}, for an example). Each extension must pass a list of @code{}. @end defvr -@defvr {Scheme Variable} %shepherd-root-service +@defvr {Variable Scheme} %shepherd-root-service This service represents PID@tie{}1. @end defvr @@ -22303,7 +22627,7 @@ d'être reconstruite. Cela aide d'utiliser des binaires pré-construits (@pxref{Substituts}), mais le déploiement peut toujours prendre plus de temps de souhaité. -@cindex grafts +@cindex greffes 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 @@ -22978,8 +23302,8 @@ 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. -@image{images/bootstrap-packages,6in,,Dependency graph of the early -packages} +@image{images/bootstrap-packages,6in,,Graphe de dépendance des premiers +paquets} @c See . The first tool that gets built with the bootstrap binaries is @@ -23051,7 +23375,7 @@ auditable assembler. Your help is welcome! @node Porter -@section Porting to a New Platform +@section Porter vers une nouvelle plateforme As discussed above, the GNU distribution is self-contained, and self-containment is achieved by relying on pre-built ``bootstrap binaries'' diff --git a/po/doc/guix-manual.fr.po b/po/doc/guix-manual.fr.po index e539992c18..1171ff3a46 100644 --- a/po/doc/guix-manual.fr.po +++ b/po/doc/guix-manual.fr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: guix-manual 0.15.0\n" "Report-Msgid-Bugs-To: ludo@gnu.org\n" "POT-Creation-Date: 2018-06-22 14:12+0200\n" -"PO-Revision-Date: 2018-08-15 18:07+0200\n" +"PO-Revision-Date: 2018-08-26 11:43+0200\n" "Last-Translator: Julien Lepiller \n" "Language-Team: French \n" "Language: fr\n" @@ -7265,7 +7265,7 @@ msgstr "Sous le capot, une dérivation qui correspond à un objet @code{package" -msgstr "" +msgstr "specification->package" #. type: Plain text #: doc/guix.texi:9002 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 "" +msgstr "Se référer aux paquets par le nom de leur variable, comme @code{bind} ci-dessus, a l'avantage d'être sans ambiguïté ; cela permet aussi de se rendre rapidement compte de coquilles quand on a des « variables non liées ». L'inconvénient est qu'on a besoin de savoir dans quel module est défini le paquet, et de modifier la ligne @code{use-package-modules} en conséquence. Pour éviter cela, on peut utiliser la procédure @code{specification->package} du module @code{(gnu packages)}, qui renvoie le meilleur paquet pour un nom donné ou un nom et une version :" #. type: lisp #: doc/guix.texi:9005 @@ -15805,6 +15839,8 @@ msgid "" "(use-modules (gnu packages))\n" "\n" msgstr "" +"(use-modules (gnu packages))\n" +"\n" #. type: lisp #: doc/guix.texi:9011 @@ -15816,51 +15852,56 @@ msgid "" " '(\"tcpdump\" \"htop\" \"gnupg@@2.0\"))\n" " %base-packages)))\n" msgstr "" +"(operating-system\n" +" ;; ...\n" +" (packages (append (map specification->package\n" +" '(\"tcpdump\" \"htop\" \"gnupg@@2.0\"))\n" +" %base-packages)))\n" #. type: unnumberedsubsubsec #: doc/guix.texi:9013 #, no-wrap msgid "System Services" -msgstr "" +msgstr "Services systèmes" #. type: cindex #: doc/guix.texi:9015 doc/guix.texi:20417 doc/guix.texi:21335 #, no-wrap msgid "services" -msgstr "" +msgstr "services" #. type: vindex #: doc/guix.texi:9016 #, no-wrap msgid "%base-services" -msgstr "" +msgstr "%base-services" #. type: Plain text #: doc/guix.texi:9026 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 @command{lshd} secure shell daemon listening on port 2222 (@pxref{Networking Services, @code{lsh-service}}). Under the hood, @code{lsh-service} arranges so that @code{lshd} is started with the right command-line options, possibly with supporting configuration files generated as needed (@pxref{Defining Services})." -msgstr "" +msgstr "Le champ @code{services} liste les @dfn{services système} à rendre disponible lorsque le système démarre (@pxref{Services}). La déclaration @code{operating-system} au-dessus spécifie que, en plus des services de base, on veut que le démon ssh @command{lshd} écoute sur le port 2222 (@pxref{Networking Services, @code{lsh-service}}). Sous le capot, @code{lsh-service} s'arrange pour que @code{lshd} soit lancé avec les bonnes options de la ligne de commande, éventuellement en générant des fichiers de configuration (@pxref{Defining Services})." #. type: cindex #: doc/guix.texi:9027 #, no-wrap msgid "customization, of services" -msgstr "" +msgstr "personnalisation des services" #. type: findex #: doc/guix.texi:9028 #, no-wrap msgid "modify-services" -msgstr "" +msgstr "modify-services" #. type: Plain text #: doc/guix.texi:9032 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 "" +msgstr "Parfois, plutôt que d'utiliser les services de base tels-quels, on peut vouloir les personnaliser. Pour cela, utilisez @code{modify-services} (@pxref{Service Reference, @code{modify-services}}) pour modifier la liste." #. type: Plain text #: doc/guix.texi:9037 msgid "For example, suppose you want to modify @code{guix-daemon} and Mingetty (the console log-in) in the @var{%base-services} list (@pxref{Base Services, @code{%base-services}}). To do that, you can write the following in your operating system declaration:" -msgstr "" +msgstr "Par exemple, supposons que vous souhaitiez modifier @code{guix-daemon} et Mingetty (l'écran de connexion en console) dans la liste @var{%base-services} (@pxref{Base Services, @code{%base-services}}). Pour cela, vous pouvez écrire ce qui suit dans votre déclaration de système d'exploitation :" #. type: lisp #: doc/guix.texi:9050 @@ -15879,6 +15920,17 @@ msgid "" " (inherit config)))))\n" "\n" msgstr "" +"(define %my-services\n" +" ;; Ma propre liste de services.\n" +" (modify-services %base-services\n" +" (guix-service-type config =>\n" +" (guix-configuration\n" +" (inherit config)\n" +" (use-substitutes? #f)\n" +" (extra-options '(\"--gc-keep-derivations\"))))\n" +" (mingetty-service-type config =>\n" +" (mingetty-configuration\n" +" (inherit config)))))\n" #. type: lisp #: doc/guix.texi:9054 @@ -15888,54 +15940,57 @@ msgid "" " ;; @dots{}\n" " (services %my-services))\n" msgstr "" +"(operating-system\n" +" ;; @dots{}\n" +" (services %my-services))\n" #. type: Plain text #: doc/guix.texi:9065 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 @var{%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 "" +msgstr "Cela modifie la configuration — c.-à-d.@: les paramètres du service — de l'instance de @code{guix-service-type}, et de toutes les instances de @code{mingetty-service-type} dans la liste @var{%base-services}. Remarquez comment on fait cela : d'abord, on s'arrange pour que la configuration de départ soit liée à l'identifiant @code{config} dans @var{body} puis on écrit @var{body} pour qu'il s'évalue en la configuration désirée. En particulier, remarquez comment on utilise @code{inherit} pour créer une nouvelle configuration qui a les même valeurs que l'ancienne configuration, avec seulement quelques modifications." #. type: Plain text #: doc/guix.texi:9072 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 "" +msgstr "La configuration pour une utilisation de « bureau » typique, avec une partition racine chiffrée, le serveur d'affichage X11, GNOME et Xfce (les utilisateurs peuvent choisir l'environnement de bureau sur l'écran de connexion en appuyant sur @kbd{F1}), la gestion du réseau, la gestion de l'énergie, et bien plus, ressemblerait à ceci :" #. type: include #: doc/guix.texi:9074 #, no-wrap msgid "os-config-desktop.texi" -msgstr "" +msgstr "os-config-desktop.texi" #. type: cindex #: doc/guix.texi:9077 #, no-wrap msgid "UEFI" -msgstr "" +msgstr "UEFI" #. type: Plain text #: doc/guix.texi:9080 msgid "A graphical UEFI system with a choice of lightweight window managers instead of full-blown desktop environments would look like this:" -msgstr "" +msgstr "Un système UEFI graphique avec un panel de gestionnaires de fenêtres légers plutôt que des environnements de bureaux complets ressemblerait à ceci :" #. type: include #: doc/guix.texi:9082 #, no-wrap msgid "os-config-lightweight-desktop.texi" -msgstr "" +msgstr "os-config-lightweight-desktop.texi" #. type: Plain text #: doc/guix.texi:9088 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 "" +msgstr "Cet exemple se réfère au système de fichier @file{/boot/efi} par son UUID, @code{1234-ABCD}. Remplacez cet UUID par le bon UUID de votre système, renvoyé par la commande @command{blkid}." #. type: Plain text #: doc/guix.texi:9092 msgid "@xref{Desktop Services}, for the exact list of services provided by @var{%desktop-services}. @xref{X.509 Certificates}, for background information about the @code{nss-certs} package that is used here." -msgstr "" +msgstr "@xref{Desktop Services}, pour la liste exacte des services fournis par @var{%desktop-services}. @xref{X.509 Certificates}, pour des informations sur le paquet @code{nss-certs} utilisé ici." #. type: Plain text #: doc/guix.texi:9099 msgid "Again, @var{%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 @var{%desktop-services} minus the Avahi service:" -msgstr "" +msgstr "Encore une fois, @var{%desktop-services} n'est qu'une liste d'objets service. Si vous voulez en supprimer des services, vous pouvez le faire avec des procédures pour les listes (@pxref{SRFI-1 Filtering and Partitioning,,, guile, GNU Guile Reference Manual}). Par exemple, l'expression suivante renvoie une liste qui contient tous les services dans @var{%desktop-services} sauf le service Avahi :" #. type: example #: doc/guix.texi:9104 @@ -15945,287 +16000,290 @@ msgid "" " (eq? (service-kind service) avahi-service-type))\n" " %desktop-services)\n" msgstr "" +"(remove (lambda (service)\n" +" (eq? (service-kind service) avahi-service-type))\n" +" %desktop-services)\n" #. type: unnumberedsubsubsec #: doc/guix.texi:9106 #, no-wrap msgid "Instantiating the System" -msgstr "" +msgstr "Instancier le système" #. type: Plain text #: doc/guix.texi:9113 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 "" +msgstr "En supposant que la déclaration @code{operating-system} est stockée dans le fichier @file{my-system-config.scm}, la commande @command{guix system reconfigure my-system-config.scm} instancie cette configuration et en fait l'entrée par défaut dans GRUB (@pxref{Invoking guix system})." #. type: Plain text #: doc/guix.texi:9121 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 "" +msgstr "Pour changer la configuration du système, on met normalement à jour ce fichier et on relance @command{guix system reconfigure}. On ne devrait jamais avoir à modifier de fichiers dans @file{/etc} ou à lancer des commandes qui modifient l'état du système comme @command{useradd} ou @command{grub-install}. En fait, vous devez les éviter parce que non seulement ça annulerait vos garanties, mais ça empêcherait aussi de revenir à des versions précédents du système, si vous en avez besoin." #. type: cindex #: doc/guix.texi:9122 #, no-wrap msgid "roll-back, of the operating system" -msgstr "" +msgstr "revenir en arrière dans la configuration du système" #. type: Plain text #: doc/guix.texi:9132 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 "" +msgstr "En parlant de revenir en arrière, à chaque fois que vous lancez @command{guix system reconfigure}, une nouvelle @dfn{génération} du système est crée — sans modifier ou supprimer les générations précédentes. Les anciennes générations du système ont une entrée dans le menu du chargeur d'amorçage, ce qui vous permet de démarrer dessus au cas où quelque chose se serait mal passé avec la dernière génération. C'est rassurant, non ? La commande @command{guix system list-generations} liste les générations du système disponibles sur le disque. Il est possible de revenir à une ancienne génération via les commandes @command{guix system roll-back} et @command{guix system switch-generation}." #. type: Plain text #: doc/guix.texi:9138 msgid "Although the command @command{guix system reconfigure} will not modify previous generations, 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 "" +msgstr "Bien que la commande @command{guix system reconfigure} ne modifiera pas les générations précédentes, vous devez faire attention lorsque votre génération actuelle n'est pas la dernière (p.@: ex.@: après avoir invoqué @command{guix system roll-back}), puisque l'opération pourrait remplacer une génération suivante (@pxref{Invoking guix system})." #. type: unnumberedsubsubsec #: doc/guix.texi:9139 #, no-wrap msgid "The Programming Interface" -msgstr "" +msgstr "L'interface de programmation" #. type: Plain text #: doc/guix.texi:9144 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 "" +msgstr "Au niveau Scheme, la grosse déclaration @code{operating-system} est instanciée avec la procédure monadique suivante (@pxref{The Store Monad}) :" #. type: deffn #: doc/guix.texi:9145 #, no-wrap msgid "{Monadic Procedure} operating-system-derivation os" -msgstr "" +msgstr "{Procédure Monadique} operating-system-derivation os" #. type: deffn #: doc/guix.texi:9148 msgid "Return a derivation that builds @var{os}, an @code{operating-system} object (@pxref{Derivations})." -msgstr "" +msgstr "Renvoie une dérivation qui construit @var{os}, un objet @code{operating-system} (@pxref{Derivations})." #. type: deffn #: doc/guix.texi:9152 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 "" +msgstr "La sortie de la dérivation est un répertoire qui se réfère à tous les paquets et d'autres fichiers supports requis pour instancier @var{os}." #. type: Plain text #: doc/guix.texi:9157 msgid "This procedure is provided by the @code{(gnu system)} module. Along with @code{(gnu services)} (@pxref{Services}), this module contains the guts of GuixSD. Make sure to visit it!" -msgstr "" +msgstr "Cette procédure est fournie par le module @code{(gnu system)}. Avec @code{(gnu srevices)} (@pxref{Services}), ce module contient les entrailles de GuixSD. Ouvrez-le un jour !" #. type: subsection #: doc/guix.texi:9160 #, no-wrap msgid "@code{operating-system} Reference" -msgstr "" +msgstr "Référence de @code{operating-system}" #. type: Plain text #: doc/guix.texi:9165 msgid "This section summarizes all the options available in @code{operating-system} declarations (@pxref{Using the Configuration System})." -msgstr "" +msgstr "Cette section résume toutes les options disponibles dans les déclarations @code{operating-system} (@pxref{Using the Configuration System})." #. type: deftp #: doc/guix.texi:9166 #, no-wrap msgid "{Data Type} operating-system" -msgstr "" +msgstr "{Type de données} operating-system" #. type: deftp #: doc/guix.texi:9170 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 "" +msgstr "C'est le type de données représentant une configuration d'un système d'exploitation. On veut dire par là toute la configuration globale du système, mais pas la configuration par utilisateur (@pxref{Using the Configuration System})." #. type: item #: doc/guix.texi:9172 #, no-wrap msgid "@code{kernel} (default: @var{linux-libre})" -msgstr "" +msgstr "@code{kernel} (par défaut : @var{linux-libre})" #. type: table #: doc/guix.texi:9176 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 "" +msgstr "L'objet paquet d'un noyau de système d'exploitation à utiliser@footnote{Actuellement seul le noyau Linux-libre est supporté. Dans le futur, il sera possible d'utiliser GNU@tie{}Hurd.}." #. type: item #: doc/guix.texi:9177 #, no-wrap msgid "@code{kernel-arguments} (default: @code{'()})" -msgstr "" +msgstr "@code{kernel-arguments} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:9180 msgid "List of strings or gexps representing additional arguments to pass on the command-line of the kernel---e.g., @code{(\"console=ttyS0\")}." -msgstr "" +msgstr "Liste de chaînes ou de gexps représentant des arguments supplémentaires à passer sur la ligne de commande du noyau — p.@: ex.@: @code{(\"console=ttyS0\")}." #. type: code{#1} #: doc/guix.texi:9181 doc/guix.texi:20614 doc/guix.texi:20633 #, no-wrap msgid "bootloader" -msgstr "" +msgstr "bootloader" #. type: table #: doc/guix.texi:9183 msgid "The system bootloader configuration object. @xref{Bootloader Configuration}." -msgstr "" +msgstr "L'objet de configuration du chargeur d'amorçage. @xref{Bootloader Configuration}." #. type: item #: doc/guix.texi:9184 #, no-wrap msgid "@code{initrd-modules} (default: @code{%base-initrd-modules})" -msgstr "" +msgstr "@code{initrd-modules} (par défaut : @code{%base-initrd-modules})" #. type: code{#1} #: doc/guix.texi:9185 doc/guix.texi:20454 doc/guix.texi:20557 #: doc/guix.texi:20752 #, no-wrap msgid "initrd" -msgstr "" +msgstr "initrd" #. type: cindex #: doc/guix.texi:9186 doc/guix.texi:20455 doc/guix.texi:20558 #, no-wrap msgid "initial RAM disk" -msgstr "" +msgstr "disque de RAM initial" #. type: table #: doc/guix.texi:9189 msgid "The list of Linux kernel modules that need to be available in the initial RAM disk. @xref{Initial RAM Disk}." -msgstr "" +msgstr "La liste des modules du noyau linux requis dans l'image disque de RAM initiale. @xref{Initial RAM Disk}." #. type: item #: doc/guix.texi:9190 #, no-wrap msgid "@code{initrd} (default: @code{base-initrd})" -msgstr "" +msgstr "@code{initrd} (par défaut : @code{base-initrd})" #. type: table #: doc/guix.texi:9194 msgid "A monadic 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 "" +msgstr "Une procédure monadique qui renvoie un disque de RAM initial pour le noyau Linux. Ce champ est fournit pour pouvoir personnaliser son système à bas-niveau et n'est que rarement utile dans le cas général. @xref{Initial RAM Disk}." #. type: item #: doc/guix.texi:9195 #, no-wrap msgid "@code{firmware} (default: @var{%base-firmware})" -msgstr "" +msgstr "@code{firmware} (par défaut : @var{%base-firmware})" #. type: cindex #: doc/guix.texi:9196 #, no-wrap msgid "firmware" -msgstr "" +msgstr "firmware" #. type: table #: doc/guix.texi:9198 msgid "List of firmware packages loadable by the operating system kernel." -msgstr "" +msgstr "Liste les paquets de microgiciels chargeables pour le noyau de système d'exploitation." #. type: table #: doc/guix.texi:9203 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 "" +msgstr "La valeur par défaut contient les microgiciels requis pour les périphériques WiFi Atheros et Broadcom (modules @code{ath9k} et @code{b43-open} de Linux-libre, respectivement). @xref{Hardware Considerations}, pour plus d'info sur les périphériques supportés." #. type: code{#1} #: doc/guix.texi:9204 #, no-wrap msgid "host-name" -msgstr "" +msgstr "host-name" #. type: table #: doc/guix.texi:9206 msgid "The host name." -msgstr "" +msgstr "Le nom d'hôte." #. type: code{#1} #: doc/guix.texi:9207 #, no-wrap msgid "hosts-file" -msgstr "" +msgstr "hosts-file" #. type: cindex #: doc/guix.texi:9208 #, no-wrap msgid "hosts file" -msgstr "" +msgstr "fichier hosts" #. type: table #: doc/guix.texi:9213 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 "" +msgstr "Un objet simili-fichier (@pxref{G-Expressions, file-like objects}) à utiliser comme @file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library Reference Manual}). La valeur par défaut est un fichier avec des entrées pour @code{localhost} et @var{host-name}." #. type: item #: doc/guix.texi:9214 #, no-wrap msgid "@code{mapped-devices} (default: @code{'()})" -msgstr "" +msgstr "@code{mapped-devices} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:9216 msgid "A list of mapped devices. @xref{Mapped Devices}." -msgstr "" +msgstr "Une liste de périphériques mappés. @xref{Mapped Devices}." #. type: code{#1} #: doc/guix.texi:9217 #, no-wrap msgid "file-systems" -msgstr "" +msgstr "file-systems" #. type: table #: doc/guix.texi:9219 msgid "A list of file systems. @xref{File Systems}." -msgstr "" +msgstr "Une liste de systèmes de fichiers. @xref{File Systems}." #. type: item #: doc/guix.texi:9220 #, no-wrap msgid "@code{swap-devices} (default: @code{'()})" -msgstr "" +msgstr "@code{swap-devices} (par défaut : @code{'()})" #. type: cindex #: doc/guix.texi:9221 #, no-wrap msgid "swap devices" -msgstr "" +msgstr "espaces d'échange" #. type: table #: doc/guix.texi:9228 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 "" +msgstr "Une liste de chaînes identifiant les périphériques ou les fichiers utilisé pour « l'espace d'échange » (@pxref{Memory Concepts,,, libc, The GNU C Library Reference Manual}). Par exemple, @code{'(\"/dev/sda3\")} ou @code{'(\"/swapfile\")}. Il est possible de spécifier un fichier d'échange sur un périphérique mappé, tant que le périphérique nécessaire et le système de fichiers sont aussi spécifiés. @xref{Mapped Devices} et @ref{File Systems}." #. type: item #: doc/guix.texi:9229 #, no-wrap msgid "@code{users} (default: @code{%base-user-accounts})" -msgstr "" +msgstr "@code{users} (par défaut : @code{%base-user-accounts})" #. type: itemx #: doc/guix.texi:9230 #, no-wrap msgid "@code{groups} (default: @var{%base-groups})" -msgstr "" +msgstr "@code{groups} (par défaut : @var{%base-groups})" #. type: table #: doc/guix.texi:9232 msgid "List of user accounts and groups. @xref{User Accounts}." -msgstr "" +msgstr "Liste les comptes utilisateurs et les groupes. @xref{User Accounts}." #. type: table #: doc/guix.texi:9235 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 "" +msgstr "Si la liste @code{users} n'a pas de compte lié à l'UID@tie{}0, un compte « root » avec l'UID@tie{}0 est automatiquement ajouté." #. type: item #: doc/guix.texi:9236 #, no-wrap msgid "@code{skeletons} (default: @code{(default-skeletons)})" -msgstr "" +msgstr "@code{skeletons} (par défaut : @code{(default-skeletons)})" #. type: table #: doc/guix.texi:9240 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 "" +msgstr "Une liste de couples composés d'un nom de fichier cible et d'un objet simili-fichier (@pxref{G-Expressions, file-like objects}). Ce sont les fichiers squelettes qui seront ajoutés au répertoire personnel des comptes utilisateurs nouvellement créés." #. type: table #: doc/guix.texi:9242 msgid "For instance, a valid value may look like this:" -msgstr "" +msgstr "Par exemple, un valeur valide ressemblerait à cela :" #. type: example #: doc/guix.texi:9248 @@ -16236,165 +16294,169 @@ msgid "" " \"(use-modules (ice-9 readline))\n" " (activate-readline)\")))\n" msgstr "" +"`((\".bashrc\" ,(plain-file \"bashrc\" \"echo Hello\\n\"))\n" +" (\".guile\" ,(plain-file \"guile\"\n" +" \"(use-modules (ice-9 readline))\n" +" (activate-readline)\")))\n" #. type: item #: doc/guix.texi:9250 #, no-wrap msgid "@code{issue} (default: @var{%default-issue})" -msgstr "" +msgstr "@code{issue} (par défaut : @var{%default-issue})" #. type: table #: doc/guix.texi:9253 msgid "A string denoting the contents of the @file{/etc/issue} file, which is displayed when users log in on a text console." -msgstr "" +msgstr "Une chaîne qui dénote le contenu du fichier @file{/etc/issue} qui est affiché lorsqu'un utilisateur se connecte sur la console." #. type: item #: doc/guix.texi:9254 #, no-wrap msgid "@code{packages} (default: @var{%base-packages})" -msgstr "" +msgstr "@code{packages} (par défaut : @var{%base-packages})" #. type: table #: doc/guix.texi:9257 msgid "The set of packages installed in the global profile, which is accessible at @file{/run/current-system/profile}." -msgstr "" +msgstr "L'ensemble des paquets installés dans le profil global, qui est accessible à partir de @file{/run/current-system/profile}." #. type: table #: doc/guix.texi:9261 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 "" +msgstr "L'ensemble par défaut contient les utilitaires de base et c'est une bonne pratique d'installer les utilitaires non essentiels dans les profils utilisateurs (@pxref{Invoking guix package})." #. type: code{#1} #: doc/guix.texi:9262 #, no-wrap msgid "timezone" -msgstr "" +msgstr "timezone" #. type: table #: doc/guix.texi:9264 msgid "A timezone identifying string---e.g., @code{\"Europe/Paris\"}." -msgstr "" +msgstr "Une chaîne identifiant un fuseau horaire — p.@: ex.@: @code{\"Europe/Paris\"}." #. type: table #: doc/guix.texi:9268 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 "" +msgstr "Vous pouvez lancer la commande @command{tzselect} pour trouver le fuseau horaire correspondant à votre région. Si vous choisissez un nom de fuseau horaire invalide, @command{guix system} échouera." #. type: item #: doc/guix.texi:9269 #, no-wrap msgid "@code{locale} (default: @code{\"en_US.utf8\"})" -msgstr "" +msgstr "@code{locale} (par défaut : @code{\"en_US.utf8\"})" #. type: table #: doc/guix.texi:9272 msgid "The name of the default locale (@pxref{Locale Names,,, libc, The GNU C Library Reference Manual}). @xref{Locales}, for more information." -msgstr "" +msgstr "Le nom du paramètre régional par défaut (@pxref{Locale Names,,, libc, The GNU C Library Reference Manual}). @xref{Locales}, pour plus d'informations." #. type: item #: doc/guix.texi:9273 #, no-wrap msgid "@code{locale-definitions} (default: @var{%default-locale-definitions})" -msgstr "" +msgstr "@code{locale-definitions} (par défaut : @var{%default-locale-definitions})" #. type: table #: doc/guix.texi:9276 msgid "The list of locale definitions to be compiled and that may be used at run time. @xref{Locales}." -msgstr "" +msgstr "La liste des définitions de locales à compiler et qui devraient être utilisées à l'exécution. @xref{Locales}." #. type: item #: doc/guix.texi:9277 #, no-wrap msgid "@code{locale-libcs} (default: @code{(list @var{glibc})})" -msgstr "" +msgstr "@code{locale-libcs} (par défaut : @code{(list @var{glibc})})" #. type: table #: doc/guix.texi:9281 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 "" +msgstr "La liste des paquets GNU@tie{}libc dont les données des paramètres linguistiques sont utilisées pour construire les définitions des paramètres linguistiques. @xref{Locales}, pour des considérations sur la compatibilité qui justifient cette option." #. type: item #: doc/guix.texi:9282 #, no-wrap msgid "@code{name-service-switch} (default: @var{%default-nss})" -msgstr "" +msgstr "@code{name-service-switch} (par défaut : @var{%default-nss})" #. type: table #: doc/guix.texi:9286 msgid "Configuration of the libc name service switch (NSS)---a @code{} object. @xref{Name Service Switch}, for details." -msgstr "" +msgstr "La configuration de NSS de la libc (name service switch) — un objet @code{}. @xref{Name Service Switch}, pour des détails." #. type: item #: doc/guix.texi:9287 #, no-wrap msgid "@code{services} (default: @var{%base-services})" -msgstr "" +msgstr "@code{services} (par défaut : @var{%base-services})" #. type: table #: doc/guix.texi:9289 msgid "A list of service objects denoting system services. @xref{Services}." -msgstr "" +msgstr "Une liste d'objets services qui dénotent les services du système. @xref{Services}." #. type: item #: doc/guix.texi:9290 #, no-wrap msgid "@code{pam-services} (default: @code{(base-pam-services)})" -msgstr "" +msgstr "@code{pam-services} (par défaut : @code{(base-pam-services)})" #. type: cindex #: doc/guix.texi:9291 #, no-wrap msgid "PAM" -msgstr "" +msgstr "PAM" #. type: cindex #: doc/guix.texi:9292 #, no-wrap msgid "pluggable authentication modules" -msgstr "" +msgstr "pluggable authentication modules" #. type: table #: doc/guix.texi:9295 msgid "Linux @dfn{pluggable authentication module} (PAM) services." -msgstr "" +msgstr "Services PAM (@dfn{pluggable authentication module}) Linux." #. type: item #: doc/guix.texi:9296 #, no-wrap msgid "@code{setuid-programs} (default: @var{%setuid-programs})" -msgstr "" +msgstr "@code{setuid-programs} (par défaut : @var{%setuid-programs})" #. type: table #: doc/guix.texi:9299 msgid "List of string-valued G-expressions denoting setuid programs. @xref{Setuid Programs}." -msgstr "" +msgstr "Liste de G-expressions qui s'évaluent en chaînes de caractères qui dénotent les programmes setuid. @xref{Setuid Programs}." #. type: item #: doc/guix.texi:9300 #, no-wrap msgid "@code{sudoers-file} (default: @var{%sudoers-specification})" -msgstr "" +msgstr "@code{sudoers-file} (par défaut : @var{%sudoers-specification})" #. type: cindex #: doc/guix.texi:9301 #, no-wrap msgid "sudoers file" -msgstr "" +msgstr "fichier sudoers" #. type: table #: doc/guix.texi:9304 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 "" +msgstr "Le contenu du fichier @file{/etc/sudoers} comme un objet simili-fichier (@pxref{G-Expressions, @code{local-file} et @code{plain-file}})." #. type: table #: doc/guix.texi:9309 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 "" +msgstr "Ce fichier spécifier quels utilisateurs peuvent utiliser la commande @command{sudo}, ce qu'ils ont le droit de faire, et quels privilèges ils peuvent gagner. La valeur par défaut est que seul @code{root} et les membres du groupe @code{wheel} peuvent utiliser @code{sudo}." #. type: Plain text #: doc/guix.texi:9320 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 "" +msgstr "La liste des systèmes de fichiers à monter est spécifiée dans le champ @code{file-systems} de la déclaration de système d'exploitation (@pxref{Using the Configuration System}). Chaque système de fichier est déclaré avec la forme @code{file-system}, comme ceci :" #. type: example #: doc/guix.texi:9326 @@ -16405,55 +16467,59 @@ msgid "" " (device \"/dev/sda3\")\n" " (type \"ext4\"))\n" msgstr "" +"(file-system\n" +" (mount-point \"/home\")\n" +" (device \"/dev/sda3\")\n" +" (type \"ext4\"))\n" #. type: Plain text #: doc/guix.texi:9330 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 "" +msgstr "Comme d'habitude, certains de ces champs sont obligatoire — comme le montre l'exemple au-dessus — alors que d'autres peuvent être omis. Ils sont décrits plus bas." #. type: deftp #: doc/guix.texi:9331 #, no-wrap msgid "{Data Type} file-system" -msgstr "" +msgstr "{Type de données} file-system" #. type: deftp #: doc/guix.texi:9334 msgid "Objects of this type represent file systems to be mounted. They contain the following members:" -msgstr "" +msgstr "Les objets de ce type représentent des systèmes de fichiers à monter. Ils contiennent les membres suivants :" #. type: item #: doc/guix.texi:9336 doc/guix.texi:9522 #, no-wrap msgid "type" -msgstr "" +msgstr "type" #. type: table #: doc/guix.texi:9339 msgid "This is a string specifying the type of the file system---e.g., @code{\"ext4\"}." -msgstr "" +msgstr "C'est une chaîne de caractères spécifiant le type du système de fichier — p.@: ex.@: @code{\"ext4\"}." #. type: code{#1} #: doc/guix.texi:9340 #, no-wrap msgid "mount-point" -msgstr "" +msgstr "mount-point" #. type: table #: doc/guix.texi:9342 msgid "This designates the place where the file system is to be mounted." -msgstr "" +msgstr "Désigne l'emplacement où le système de fichier sera monté." #. type: code{#1} #: doc/guix.texi:9343 #, no-wrap msgid "device" -msgstr "" +msgstr "device" #. type: table #: doc/guix.texi:9353 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 "" +msgstr "Ce champ nomme le système de fichier « source ». il peut être l'une de ces trois choses : une étiquette de système de fichiers, un UUID de système de fichier ou le nom d'un nœud dans @file{/dev}. Les étiquettes et les UUID offrent une manière de se référer à des systèmes de fichiers sans avoir à coder en dur le nom de périphérique@footnote{Remarquez que, s'il est tentant d'utiliser @file{/dev/disk/by-uuid} et autres chemins similaires pour obtenir le même résultat, ce n'est pas recommandé : ces nœuds de périphériques spéciaux sont créés par le démon udev et peuvent ne pas être disponibles au moment de monter le périphérique.}." #. type: findex #: doc/guix.texi:9354 @@ -16464,7 +16530,7 @@ msgstr "file-system-label" #. type: table #: doc/guix.texi:9359 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 "" +msgstr "Les étiquettes de systèmes de fichiers sont crées avec la procédure @code{file-system-label}, les UUID avec @code{uuid} et les nœuds de @file{/dev} sont de simples chaînes de caractères. Voici un exemple d'un système de fichiers référencé par son étiquette, donnée par la commande @command{e2label} :" #. type: example #: doc/guix.texi:9365 @@ -16475,17 +16541,21 @@ msgid "" " (type \"ext4\")\n" " (device (file-system-label \"my-home\")))\n" msgstr "" +"(file-system\n" +" (mount-point \"/home\")\n" +" (type \"ext4\")\n" +" (device (file-system-label \"my-home\")))\n" #. type: findex #: doc/guix.texi:9367 #, no-wrap msgid "uuid" -msgstr "" +msgstr "uuid" #. type: table #: doc/guix.texi:9375 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 "" +msgstr "Les UUID sont convertis à partir de leur représentation en chaîne de caractères (montrée par la command @command{tune2fs -l}) en utilisant la forme @code{uuid}@footnote{La forme @code{uuid} s'attend à des UUID sur 16 octets définis dans la @uref{https://tools.ietf.org/html/rfc4122, RFC@tie{}4122}. C'est la forme des UUID utilisées par la famille de systèmes de fichiers ext2 et d'autres, mais ce n'est pas le même type d'UUID que ceux qui se trouvent sur les systèmes de fichiers FAT par exemple}, comme ceci :" #. type: example #: doc/guix.texi:9381 @@ -16496,267 +16566,271 @@ msgid "" " (type \"ext4\")\n" " (device (uuid \"4dab5feb-d176-45de-b287-9b0a6e4c01cb\")))\n" msgstr "" +"(file-system\n" +" (mount-point \"/home\")\n" +" (type \"ext4\")\n" +" (device (uuid \"4dab5feb-d176-45de-b287-9b0a6e4c01cb\")))\n" #. type: table #: doc/guix.texi:9389 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 "" +msgstr "Lorsque la source d'un système de fichiers est un périphérique mappé (@pxref{Mapped Devices}), sont champ @code{device} @emph{doit} se référer au nom du périphérique mappé — p.@: ex.@: @file{\"/dev/mapper/root-partition\"}. Cela est requis pour que le système sache que monter ce système de fichier dépend de la présence du périphérique mappé correspondant." #. type: item #: doc/guix.texi:9390 #, no-wrap msgid "@code{flags} (default: @code{'()})" -msgstr "" +msgstr "@code{flags} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:9395 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), and @code{no-exec} (disallow program execution.)" -msgstr "" +msgstr "C'est une liste de symboles qui dénotent des drapeaux de montage. Les drapeaux reconnus sont @code{read-only}, @code{bind-mount}, @code{no-dev} (interdit l'accès aux fichiers spéciaux), @code{no-suid} (ignore les bits setuid et setgid) et @code{no-exec} (interdit l'exécution de programmes)." #. type: item #: doc/guix.texi:9396 #, no-wrap msgid "@code{options} (default: @code{#f})" -msgstr "" +msgstr "@code{options} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:9398 msgid "This is either @code{#f}, or a string denoting mount options." -msgstr "" +msgstr "C'est soit @code{#f} soit une chaîne de caractères dénotant des options de montage." #. type: item #: doc/guix.texi:9399 #, no-wrap msgid "@code{mount?} (default: @code{#t})" -msgstr "" +msgstr "@code{mount?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:9404 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 "" +msgstr "Cette valeur indique s'il faut monter automatiquement le système de fichier au démarrage du système. Lorsque la valeur est @code{#f}, le système de fichier reçoit une entrée dans @file{/etc/fstab} (lue par la commande @command{mount}) mais n'est pas monté automatiquement." #. type: item #: doc/guix.texi:9405 #, no-wrap msgid "@code{needed-for-boot?} (default: @code{#f})" -msgstr "" +msgstr "@code{needed-for-boot?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:9410 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 "" +msgstr "Cette valeur booléenne indique si le système de fichier est nécessaire au démarrage. Si c'est vrai alors le système de fichier est monté au chargement du disque de RAM initial. C'est toujours le cas par exemple du système de fichiers racine." #. type: item #: doc/guix.texi:9411 #, no-wrap msgid "@code{check?} (default: @code{#t})" -msgstr "" +msgstr "@code{check?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:9414 msgid "This Boolean indicates whether the file system needs to be checked for errors before being mounted." -msgstr "" +msgstr "Cette valeur booléenne indique si le système de fichier doit être vérifié avant de le monter." #. type: item #: doc/guix.texi:9415 #, no-wrap msgid "@code{create-mount-point?} (default: @code{#f})" -msgstr "" +msgstr "@code{create-mount-point?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:9417 msgid "When true, the mount point is created if it does not exist yet." -msgstr "" +msgstr "Lorsque cette valeur est vraie, le point de montage est créé s'il n'existe pas déjà." #. type: item #: doc/guix.texi:9418 #, no-wrap msgid "@code{dependencies} (default: @code{'()})" -msgstr "" +msgstr "@code{dependencies} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:9422 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 "" +msgstr "C'est une liste d'objets @code{} ou @code{} qui représentent les systèmes de fichiers qui doivent être montés ou les périphériques mappés qui doivent être ouverts avant (et monté ou fermés après) celui-ci." #. type: table #: doc/guix.texi:9426 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 "" +msgstr "Par exemple, considérons une hiérarchie de montage : @file{/sys/fs/cgroup} est une dépendance de @file{/sys/fs/cgroup/cpu} et @file{/sys/fs/cgroup/memory}." #. type: table #: doc/guix.texi:9429 msgid "Another example is a file system that depends on a mapped device, for example for an encrypted partition (@pxref{Mapped Devices})." -msgstr "" +msgstr "Un autre exemple est un système de fichier qui dépend d'un périphérique mappé, par exemple pour une partition chiffrée (@pxref{Mapped Devices})." #. type: Plain text #: doc/guix.texi:9434 msgid "The @code{(gnu system file-systems)} exports the following useful variables." -msgstr "" +msgstr "Le module @code{(gnu system file-systems)} exporte les variables utiles suivantes." #. type: defvr #: doc/guix.texi:9435 #, no-wrap msgid "{Scheme Variable} %base-file-systems" -msgstr "" +msgstr "{Variable Scheme} %base-file-systems" #. type: defvr #: doc/guix.texi:9440 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 "" +msgstr "Ce sont les systèmes de fichiers essentiels qui sont requis sur les systèmes normaux, comme @var{%pseudo-terminal-file-system} et @var{%immutable-store} (voir plus bas). Les déclarations de systèmes d'exploitation devraient au moins les contenir." #. type: defvr #: doc/guix.texi:9442 #, no-wrap msgid "{Scheme Variable} %pseudo-terminal-file-system" -msgstr "" +msgstr "{Variable Scheme} %pseudo-terminal-file-system" #. type: defvr #: doc/guix.texi:9448 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 "" +msgstr "C'est le système de fichier monté sur @file{/dev/pts}. Il supporte les @dfn{pseudo-terminaux} créés via @code{openpty} et les fonctions similaires (@pxref{Pseudo-Terminals,,, libc, The GNU C Library Reference Manual}). Les pseudo-terminaux sont utilisés par les émulateurs de terminaux comme @command{xterm}." #. type: defvr #: doc/guix.texi:9450 #, no-wrap msgid "{Scheme Variable} %shared-memory-file-system" -msgstr "" +msgstr "{Variable Scheme} %shared-memory-file-system" #. type: defvr #: doc/guix.texi:9454 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 "" +msgstr "Ce système de fichier est monté dans @file{/dev/shm} et est utilisé pour le partage de mémoire entre processus (@pxref{Memory-mapped I/O, @code{shm_open},, libc, The GNU C Library Reference Manual})." #. type: defvr #: doc/guix.texi:9456 #, no-wrap msgid "{Scheme Variable} %immutable-store" -msgstr "" +msgstr "{Variable Scheme} %immutable-store" #. type: defvr #: doc/guix.texi:9461 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 "" +msgstr "Ce système de fichiers effectue un « montage lié » en lecture-seule de @file{/gnu/store}, ce qui en fait un répertoire en lecture-seule pour tous les utilisateurs dont @code{root}. Cela évite que des logiciels qui tournent en @code{root} ou des administrateurs systèmes ne modifient accidentellement le dépôt." #. type: defvr #: doc/guix.texi:9464 msgid "The daemon itself is still able to write to the store: it remounts it read-write in its own ``name space.''" -msgstr "" +msgstr "Le démon lui-même est toujours capable d'écrire dans le dépôt : il est remonté en lecture-écriture dans son propre « espace de nom »." #. type: defvr #: doc/guix.texi:9466 #, no-wrap msgid "{Scheme Variable} %binary-format-file-system" -msgstr "" +msgstr "{Variable Scheme} %binary-format-file-system" #. type: defvr #: doc/guix.texi:9470 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 "" +msgstr "Le système de fichiers @code{binfmt_misc}, qui permet de gérer n'importe quel type de fichiers exécutables à déléguer en espace utilisateur. Cela demande que le module du noyau @code{binfmt.ko} soit chargé." #. type: defvr #: doc/guix.texi:9472 #, no-wrap msgid "{Scheme Variable} %fuse-control-file-system" -msgstr "" +msgstr "{Variable Scheme} %fuse-control-file-system" #. type: defvr #: doc/guix.texi:9476 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 "" +msgstr "Le système de fichiers @code{fusectl}, qui permet à des utilisateurs non privilégiés de monter et de démonter des systèmes de fichiers FUSE en espace utilisateur. Cela requiert que le module du noyau @code{fuse.ko} soit chargé." #. type: cindex #: doc/guix.texi:9481 #, no-wrap msgid "device mapping" -msgstr "" +msgstr "mappage de périphériques" #. type: cindex #: doc/guix.texi:9482 #, no-wrap msgid "mapped devices" -msgstr "" +msgstr "périphériques mappés" #. type: Plain text #: doc/guix.texi:9500 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 "" +msgstr "Le noyau Linux a une notion de @dfn{mappage de périphériques} : un périphérique bloc, comme une partition sur un disque dur, peut être @dfn{mappé} sur un autre périphérique, typiquement dans @code{/dev/mapper}, avec des calculs supplémentaires sur les données qui naviguent entre les deux@footnote{Remarquez que le Hurd ne fait pas de différence entre le concept de « périphérique mappé » et celle d'un système de fichiers : les deux correspondent à la @emph{traduction} des opérations d'entrée-sortie faites sur un fichier en des opérations sur ce qui le contient. Ainsi, le Hurd implémente les périphériques mappés, comme les systèmes de fichiers, avec le mécanisme des @dfn{traducteurs} générique (@pxref{Translators,,, hurd, The GNU Hurd Reference Manual}).}. Un exemple typique est le mappage de périphériques chiffrés : toutes les écritures sont sur le périphérique mappé sont chiffrées, toutes les lectures déchiffrées, de manière transparente. Guix étend cette notion en considérant que tout périphérique ou ensemble de périphériques qui sont @dfn{transformés} d'une certaine manière créent un nouveau périphérique ; par exemple, les périphériques RAID sont obtenus en @dfn{assemblant} plusieurs autres périphériques, comme des disque ou des partitions, en un nouveau périphérique en tant qu'unique partition. Un autre exemple, qui n'est pas encore disponible, sont les volumes logiques LVM." #. type: Plain text #: doc/guix.texi:9503 msgid "Mapped devices are declared using the @code{mapped-device} form, defined as follows; for examples, see below." -msgstr "" +msgstr "Les périphériques mappés sont déclarés avec la forme @code{mapped-device}, définie comme suit ; par exemple, voir ci-dessous." #. type: deftp #: doc/guix.texi:9504 #, no-wrap msgid "{Data Type} mapped-device" -msgstr "" +msgstr "{Type de données} mapped-device" #. type: deftp #: doc/guix.texi:9507 msgid "Objects of this type represent device mappings that will be made when the system boots up." -msgstr "" +msgstr "Les objets de ce type représentent des mappages de périphériques qui seront effectués au démarrage du système." #. type: table #: doc/guix.texi:9513 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 "" +msgstr "C'est soit une chaîne qui spécifie le nom d'un périphérique bloc à mapper, comme @code{\"/dev/sda3\"}, soit une liste de plusieurs périphériques à assembler pour en créer un nouveau." #. type: code{#1} #: doc/guix.texi:9514 doc/guix.texi:20646 #, no-wrap msgid "target" -msgstr "" +msgstr "target" #. type: table #: doc/guix.texi:9521 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 "" +msgstr "Cette chaîne spécifie le nom du périphérique mappé qui en résulte. Pour les mappeurs noyaux comme les périphériques chiffrés de type @code{luks-device-mapping}, spécifier @code{\"ma-partition\"} crée le périphérique @code{\"/dev/mapper/ma-partition\"}. Pour les périphériques RAID de type @code{raid-device-mapping}, il faut donner le nom complet comme @code{\"/dev/md0\"}." #. type: table #: doc/guix.texi:9525 msgid "This must be a @code{mapped-device-kind} object, which specifies how @var{source} is mapped to @var{target}." -msgstr "" +msgstr "Ce doit être un objets @code{mapped-device-kind}, qui spécifie comment @var{source} est mappés sur @var{target}." #. type: defvr #: doc/guix.texi:9528 #, no-wrap msgid "{Scheme Variable} luks-device-mapping" -msgstr "" +msgstr "{Variable Scheme} luks-device-mapping" #. type: defvr #: doc/guix.texi:9532 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 "" +msgstr "Cela définie les périphériques blocs chiffrés en LUKS avec @command{cryptsetup} du paquet du même nom. Elle s'appuie sur le module du noyau Linux @code{dm-crypt}." #. type: defvr #: doc/guix.texi:9534 #, no-wrap msgid "{Scheme Variable} raid-device-mapping" -msgstr "" +msgstr "{Variable Scheme} raid-device-mapping" #. type: defvr #: doc/guix.texi:9539 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 "" +msgstr "Cela définie un périphérique RAID qui est assemblé avec la commande @code{mdadm} du paquet du même nom. Elle nécessite un module noyau Linux approprié pour le niveau RAID chargé, comme @code{raid456} pour RAID-4, RAID-5 et RAID-6 ou @code{raid10} pour RAID-10." #. type: cindex #: doc/guix.texi:9541 #, no-wrap msgid "disk encryption" -msgstr "" +msgstr "chiffrement du disque" #. type: cindex #: doc/guix.texi:9542 #, no-wrap msgid "LUKS" -msgstr "" +msgstr "LUKS" #. type: Plain text #: doc/guix.texi:9550 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 "" +msgstr "L'exemple suivant spécifie un mappage de @file{/dev/sda3} vers @file{/dev/mapper/home} avec LUKS — @url{https://gitlab.com/cryptsetup/cryptsetup,Linux Unified Key Setup}, un mécanisme standard pour chiffrer les disques. Le périphérique @file{/dev/mapper/home} peut ensuite être utilisé comme @code{device} d'une déclaration @code{file-system} (@pxref{File Systems})." #. type: example #: doc/guix.texi:9556 @@ -16767,22 +16841,26 @@ msgid "" " (target \"home\")\n" " (type luks-device-mapping))\n" msgstr "" +"(mapped-device\n" +" (source \"/dev/sda3\")\n" +" (target \"home\")\n" +" (type luks-device-mapping))\n" #. type: Plain text #: doc/guix.texi:9561 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 "" +msgstr "Autrement, pour devenir indépendant du numéro de périphérique, on peut obtenir l'UUID LUKS (@dfn{l'identifiant unique}) du périphérique source avec une commande comme :" #. type: example #: doc/guix.texi:9564 #, no-wrap msgid "cryptsetup luksUUID /dev/sda3\n" -msgstr "" +msgstr "cryptsetup luksUUID /dev/sda3\n" #. type: Plain text #: doc/guix.texi:9567 msgid "and use it as follows:" -msgstr "" +msgstr "et l'utiliser ainsi :" #. type: example #: doc/guix.texi:9573 @@ -16793,22 +16871,26 @@ msgid "" " (target \"home\")\n" " (type luks-device-mapping))\n" msgstr "" +"(mapped-device\n" +" (source (uuid \"cb67fc72-0d54-4c88-9d4b-b225f30b0f44\"))\n" +" (target \"home\")\n" +" (type luks-device-mapping))\n" #. type: cindex #: doc/guix.texi:9575 #, no-wrap msgid "swap encryption" -msgstr "" +msgstr "chiffrement de l'espace d'échange" #. type: Plain text #: doc/guix.texi:9581 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 "" +msgstr "Il est aussi désirable de chiffrer l'espace d'échange, puisque l'espace d'échange peut contenir des données sensibles. Une manière de faire cela est d'utiliser un fichier d'échange dans un système de fichiers sur un périphérique mappé avec un chiffrement LUKS. De cette manière, le fichier d'échange est chiffré parce que tout le périphérique est chiffré. @xref{Preparing for Installation,,Disk Partitioning}, pour un exemple." #. type: Plain text #: doc/guix.texi:9584 msgid "A RAID device formed of the partitions @file{/dev/sda1} and @file{/dev/sdb1} may be declared as follows:" -msgstr "" +msgstr "Un périphérique RAID formé des partitions @file{/dev/sda1} et @file{/dev/sdb1} peut être déclaré ainsi :" #. type: example #: doc/guix.texi:9590 @@ -16819,34 +16901,38 @@ msgid "" " (target \"/dev/md0\")\n" " (type raid-device-mapping))\n" msgstr "" +"(mapped-device\n" +" (source (list \"/dev/sda1\" \"/dev/sdb1\"))\n" +" (target \"/dev/md0\")\n" +" (type raid-device-mapping))\n" #. type: Plain text #: doc/guix.texi:9597 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 "" +msgstr "Le périphérique @file{/dev/md0} peut ensuite être utilisé comme @code{device} d'une déclaration @code{file-system} (@pxref{File Systems}). Remarquez que le niveau de RAID n'a pas besoin d'être donné ; il est choisi pendant la création initiale du périphérique RAID et est ensuite déterminé automatiquement." #. type: cindex #: doc/guix.texi:9602 #, no-wrap msgid "users" -msgstr "" +msgstr "utilisateurs" #. type: cindex #: doc/guix.texi:9603 #, no-wrap msgid "accounts" -msgstr "" +msgstr "comptes" #. type: cindex #: doc/guix.texi:9604 #, no-wrap msgid "user accounts" -msgstr "" +msgstr "comptes utilisateurs" #. type: Plain text #: doc/guix.texi:9608 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 "" +msgstr "Les comptes utilisateurs et les groupes sont gérés entièrement par la déclaration @code{operating-system}. Ils sont spécifiés avec les formes @code{user-account} et @code{user-group} :" #. type: example #: doc/guix.texi:9619 @@ -16862,254 +16948,263 @@ msgid "" " (comment \"Bob's sister\")\n" " (home-directory \"/home/alice\"))\n" msgstr "" +"(user-account\n" +" (name \"alice\")\n" +" (group \"users\")\n" +" (supplementary-groups '(\"wheel\" ;permet d'utiliser sudo, etc.\n" +" \"audio\" ;carte son\n" +" \"video\" ;périphériques réseaux comme les webcams\n" +" \"cdrom\")) ;le bon vieux CD-ROM\n" +" (comment \"Bob's sister\")\n" +" (home-directory \"/home/alice\"))\n" #. type: Plain text #: doc/guix.texi:9628 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 "" +msgstr "Lors du démarrage ou à la fin de @command{guix system reconfigure}, le système s'assure que seuls les comptes utilisateurs et les groupes spécifiés dans la déclaration @code{operating-system} existent, et avec les propriétés spécifiées. Ainsi, les modifications ou les créations de comptes ou de groupes effectuées directement en invoquant des commandes comme @command{useradd} sont perdue à la reconfiguration ou au redémarrage. Cela permet de s'assurer que le système reste exactement tel que déclaré." #. type: deftp #: doc/guix.texi:9629 #, no-wrap msgid "{Data Type} user-account" -msgstr "" +msgstr "{Type de données} user-account" #. type: deftp #: doc/guix.texi:9632 msgid "Objects of this type represent user accounts. The following members may be specified:" -msgstr "" +msgstr "Les objets de se type représentent les comptes utilisateurs. Les membres suivants peuvent être spécifiés :" #. type: table #: doc/guix.texi:9636 msgid "The name of the user account." -msgstr "" +msgstr "Le nom du compte utilisateur." #. type: itemx #: doc/guix.texi:9637 doc/guix.texi:20408 #, no-wrap msgid "group" -msgstr "" +msgstr "group" #. type: cindex #: doc/guix.texi:9638 doc/guix.texi:9687 #, no-wrap msgid "groups" -msgstr "" +msgstr "groupes" #. type: table #: doc/guix.texi:9641 msgid "This is the name (a string) or identifier (a number) of the user group this account belongs to." -msgstr "" +msgstr "C'est le nom (une chaîne) ou un identifiant (un nombre) du groupe utilisateur auquel ce compte appartient." #. type: item #: doc/guix.texi:9642 #, no-wrap msgid "@code{supplementary-groups} (default: @code{'()})" -msgstr "" +msgstr "@code{supplementary-groups} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:9645 msgid "Optionally, this can be defined as a list of group names that this account belongs to." -msgstr "" +msgstr "Éventuellement, cela peut être définie comme une liste de noms de groupes auxquels ce compte appartient." #. type: item #: doc/guix.texi:9646 #, no-wrap msgid "@code{uid} (default: @code{#f})" -msgstr "" +msgstr "@code{uid} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:9650 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 "" +msgstr "C'est l'ID utilisateur de ce compte (un nombre) ou @code{#f}. Dans ce dernier cas, le nombre est choisi automatiquement par le système à la création du compte." #. type: item #: doc/guix.texi:9651 #, no-wrap msgid "@code{comment} (default: @code{\"\"})" -msgstr "" +msgstr "@code{comment} (par défaut : @code{\"\"})" #. type: table #: doc/guix.texi:9653 msgid "A comment about the account, such as the account owner's full name." -msgstr "" +msgstr "Un commentaire à propos du compte, comme le nom complet de l'utilisateur." #. type: code{#1} #: doc/guix.texi:9654 #, no-wrap msgid "home-directory" -msgstr "" +msgstr "home-directory" #. type: table #: doc/guix.texi:9656 msgid "This is the name of the home directory for the account." -msgstr "" +msgstr "C'est le nom du répertoire personnel du compte." #. type: item #: doc/guix.texi:9657 #, no-wrap msgid "@code{create-home-directory?} (default: @code{#t})" -msgstr "" +msgstr "@code{create-home-directory?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:9660 msgid "Indicates whether the home directory of this account should be created if it does not exist yet." -msgstr "" +msgstr "Indique si le répertoire personnel du compte devrait être créé s'il n'existe pas déjà." #. type: item #: doc/guix.texi:9661 #, no-wrap msgid "@code{shell} (default: Bash)" -msgstr "" +msgstr "@code{shell} (par défaut : Bash)" #. type: table #: doc/guix.texi:9664 msgid "This is a G-expression denoting the file name of a program to be used as the shell (@pxref{G-Expressions})." -msgstr "" +msgstr "C'est une G-expression qui dénote un nom de fichier d'un programme utilisé comme shell (@pxref{G-Expressions})." #. type: item #: doc/guix.texi:9665 doc/guix.texi:9705 #, no-wrap msgid "@code{system?} (default: @code{#f})" -msgstr "" +msgstr "@code{system?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:9669 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 "" +msgstr "C'est une valeur booléenne qui indique si le compte est un compte « système ». Les comptes systèmes sont parfois traités à part ; par exemple, les gestionnaires de connexion graphiques ne les liste pas." #. type: anchor{#1} #: doc/guix.texi:9671 msgid "user-account-password" -msgstr "" +msgstr "user-account-password" #. type: item #: doc/guix.texi:9671 doc/guix.texi:9709 #, no-wrap msgid "@code{password} (default: @code{#f})" -msgstr "" +msgstr "@code{password} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:9677 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 "" +msgstr "Vous laisseriez normalement ce champ à @code{#f} et initialiseriez les mots de passe utilisateurs en tant que @code{root} avec la commande @command{passwd}, puis laisseriez l'utilisateur le changer avec @command{passwd}. Les mots de passes définis avec @command{passwd} sont bien sûr préservés après redémarrage et reconfiguration." #. type: table #: doc/guix.texi:9683 msgid "If you @emph{do} want to have a preset password for an account, then this field must contain the encrypted password, as a string. @xref{crypt,,, 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 "" +msgstr "Si vous voulez @emph{vraiment} définir un mot de passe pour un compte, alors ce champ doit contenir le mot de passe chiffré, comme une chaîne de caractère. @xref{crypt,,, libc, The GNU C Library Reference Manual}, pour plus d'information sur le chiffrement des mots de passe et @ref{Encryption,,, guile, GNU Guile Reference Manual}, pour des informations sur la procédure @code{crypt} de Guile." #. type: Plain text #: doc/guix.texi:9689 msgid "User group declarations are even simpler:" -msgstr "" +msgstr "Les déclarations de groupes sont encore plus simple :" #. type: example #: doc/guix.texi:9692 #, no-wrap msgid "(user-group (name \"students\"))\n" -msgstr "" +msgstr "(user-group (name \"students\"))\n" #. type: deftp #: doc/guix.texi:9694 #, no-wrap msgid "{Data Type} user-group" -msgstr "" +msgstr "{Type de données} user-group" #. type: deftp #: doc/guix.texi:9696 msgid "This type is for, well, user groups. There are just a few fields:" -msgstr "" +msgstr "C'est le type pour, hé bien, les comptes utilisateurs. Il n'y a que quelques champs :" #. type: table #: doc/guix.texi:9700 msgid "The name of the group." -msgstr "" +msgstr "Le nom du groupe." #. type: item #: doc/guix.texi:9701 #, no-wrap msgid "@code{id} (default: @code{#f})" -msgstr "" +msgstr "@code{id} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:9704 msgid "The group identifier (a number). If @code{#f}, a new number is automatically allocated when the group is created." -msgstr "" +msgstr "L'identifiant du groupe (un nombre). S'il est @code{#f}, un nouveau nombre est alloué automatiquement lorsque le groupe est créé." #. type: table #: doc/guix.texi:9708 msgid "This Boolean value indicates whether the group is a ``system'' group. System groups have low numerical IDs." -msgstr "" +msgstr "Cette valeur booléenne indique si le groupe est un groupe « système ». les groupes systèmes ont un numéro d'ID bas." #. type: table #: doc/guix.texi:9712 msgid "What, user groups can have a password? Well, apparently yes. Unless @code{#f}, this field specifies the password of the group." -msgstr "" +msgstr "Quoi, les groupes utilisateurs peuvent avoir des mots de passe ? On dirait bien. À moins que la valeur ne soit @code{#f}, ce champ spécifie le mot de passe du groupe." #. type: Plain text #: doc/guix.texi:9718 msgid "For convenience, a variable lists all the basic user groups one may expect:" -msgstr "" +msgstr "Par simplicité, une variable liste les groupes utilisateurs de base auxquels on pourrait s'attendre :" #. type: defvr #: doc/guix.texi:9719 #, no-wrap msgid "{Scheme Variable} %base-groups" -msgstr "" +msgstr "{Variable Scheme} %base-groups" #. type: defvr #: doc/guix.texi:9724 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 "" +msgstr "C'est la liste des groupes utilisateur de base que les utilisateurs et les paquets s'attendent à trouver sur le système. Cela comprend des groupes comme « root », « wheel » et « users », ainsi que des groupes utilisés pour contrôler l'accès à certains périphériques, comme « audio », « disk » et « cdrom »." #. type: defvr #: doc/guix.texi:9726 #, no-wrap msgid "{Scheme Variable} %base-user-accounts" -msgstr "" +msgstr "{Variable Scheme} %base-user-accounts" #. type: defvr #: doc/guix.texi:9729 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 "" +msgstr "C'est la liste des compte du système de base que les programmes peuvent s'attendre à trouver sur un système GNU/Linux, comme le compte « nobody »." #. type: defvr #: doc/guix.texi:9732 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 "" +msgstr "Remarquez que le compte « root » n'est pas défini ici. C'est un cas particulier et il est automatiquement ajouté qu'il soit spécifié ou non." #. type: cindex #: doc/guix.texi:9737 #, no-wrap msgid "locale" -msgstr "" +msgstr "paramètres linguistiques" #. type: Plain text #: doc/guix.texi:9744 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 "" +msgstr "Un @dfn{paramètre linguistique} définie les conventions culturelles d'une langue et d'une région particulières (@pxref{Locales,,, libc, The GNU C Library Reference Manual}). Chaque paramètre linguistique a un nom de la forme @code{@var{langue}_@var{territoire}.@var{jeudecaractères}} — p.@: ex.@: @code{fr_LU.utf8} désigne le paramètre linguistique pour le français, avec les conventions culturelles du Luxembourg, en utilisant l'encodage UTF-8." #. type: cindex #: doc/guix.texi:9745 #, no-wrap msgid "locale definition" -msgstr "" +msgstr "définition des paramètres linguistiques" #. type: Plain text #: doc/guix.texi:9749 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 "" +msgstr "Normalement, vous voudrez spécifier les paramètres linguistiques par défaut pour la machine en utilisant le champ @code{locale} de la déclaration @code{operating-system} (@pxref{operating-system Reference, @code{locale}})." #. type: Plain text #: doc/guix.texi:9758 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 "" +msgstr "Les paramètres régionaux choisis sont automatiquement ajoutés aux définitions des @dfn{paramètres régionaux} connues par le système au besoin, avec le jeu de caractères inféré à partir de son nom, p.@: ex.@: @code{bo_CN.utf8} supposera qu'il faut utiliser le jeu de caractères @code{UTF-8}. Des définitions supplémentaires peuvent être spécifiées dans le champ @code{locale-definitions} de @code{operating-system} — c'est utile par exemple si le jeu de caractères n'a pas été inféré à partir du nom. L'ensemble par défaut de définitions comprend certains paramètres linguistiques parmi les plus utilisés, mais pas toutes les variantes disponibles, pour gagner de la place." #. type: Plain text #: doc/guix.texi:9761 msgid "For instance, to add the North Frisian locale for Germany, the value of that field may be:" -msgstr "" +msgstr "Par exemple, pour ajouter les paramètres pour le frison septentrional en Allemagne, la valeur de ce champ serait :" #. type: example #: doc/guix.texi:9766 @@ -17119,11 +17214,14 @@ msgid "" " (name \"fy_DE.utf8\") (source \"fy_DE\"))\n" " %default-locale-definitions)\n" msgstr "" +"(cons (locale-definition\n" +" (name \"fy_DE.utf8\") (source \"fy_DE\"))\n" +" %default-locale-definitions)\n" #. type: Plain text #: doc/guix.texi:9770 msgid "Likewise, to save space, one might want @code{locale-definitions} to list only the locales that are actually used, as in:" -msgstr "" +msgstr "De me, pour gagner de la place, on peut vouloir lister dans @code{locale-definitions} seulement les paramètres qui sont vraiment utilisés, comme dans :" #. type: example #: doc/guix.texi:9775 @@ -17133,113 +17231,116 @@ msgid "" " (name \"ja_JP.eucjp\") (source \"ja_JP\")\n" " (charset \"EUC-JP\")))\n" msgstr "" +"(list (locale-definition\n" +" (name \"ja_JP.eucjp\") (source \"ja_JP\")\n" +" (charset \"EUC-JP\")))\n" #. type: Plain text #: doc/guix.texi:9784 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 "" +msgstr "Les définitions des paramètres linguistiques compilées sont disponibles dans @file{/run/current-system/locale/X.Y}, où @code{X.Y} est la version de la libc, ce qui est l'emplacement par défaut où la GNU@tie{}libc fournie par Guix cherche les données de régionalisation. Cet emplacement peut être modifié avec la variable d'environnement @code{LOCPATH} (@pxref{locales-and-locpath, @code{LOCPATH} and locale packages})." #. type: Plain text #: doc/guix.texi:9787 msgid "The @code{locale-definition} form is provided by the @code{(gnu system locale)} module. Details are given below." -msgstr "" +msgstr "La forme @code{locale-definition} est fournie par le module @code{(gnu system locale)}. Des détails sont disponibles plus bas." #. type: deftp #: doc/guix.texi:9788 #, no-wrap msgid "{Data Type} locale-definition" -msgstr "" +msgstr "{Type de données} locale-definition" #. type: deftp #: doc/guix.texi:9790 msgid "This is the data type of a locale definition." -msgstr "" +msgstr "C'est le type de données d'une définition de paramètres linguistiques." #. type: table #: doc/guix.texi:9796 msgid "The name of the locale. @xref{Locale Names,,, libc, The GNU C Library Reference Manual}, for more information on locale names." -msgstr "" +msgstr "Le nom du paramètre linguistique. @xref{Locale Names,,, libc, The GNU C Library Reference Manual}, pour en savoir plus sur les noms de paramètres linguistiques." #. type: table #: doc/guix.texi:9800 msgid "The name of the source for that locale. This is typically the @code{@var{language}_@var{territory}} part of the locale name." -msgstr "" +msgstr "Le nom de la source pour ce paramètre linguistique. C'est typiquement la partie @code{@var{langue}_@var{territoire}} du nom du paramètre." #. type: item #: doc/guix.texi:9801 #, no-wrap msgid "@code{charset} (default: @code{\"UTF-8\"})" -msgstr "" +msgstr "@code{charset} (par défaut : @code{\"UTF-8\"})" #. type: table #: doc/guix.texi:9805 msgid "The ``character set'' or ``code set'' for that locale, @uref{http://www.iana.org/assignments/character-sets, as defined by IANA}." -msgstr "" +msgstr "Le « jeu de caractères » d'un paramètre linguistique, @uref{http://www.iana.org/assignments/character-sets, défini par l'IANA}." #. type: defvr #: doc/guix.texi:9809 #, no-wrap msgid "{Scheme Variable} %default-locale-definitions" -msgstr "" +msgstr "{Variable Scheme} %default-locale-definitions" #. type: defvr #: doc/guix.texi:9813 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 "" +msgstr "Une liste des paramètres linguistiques UTF-8 couramment utilisés, utilisée comme valeur par défaut pour le champ @code{locale-definitions} des déclarations @code{operating-system}." #. type: cindex #: doc/guix.texi:9814 #, no-wrap msgid "locale name" -msgstr "" +msgstr "nom de paramètre linguistique" #. type: cindex #: doc/guix.texi:9815 #, no-wrap msgid "normalized codeset in locale names" -msgstr "" +msgstr "jeu de caractère normalisé dans les noms de paramètres linguistiques" #. type: defvr #: doc/guix.texi:9821 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 "" +msgstr "Ces définitions de paramètres linguistiques utilisent le @dfn{jeu de caractère normalisé} pour la partie qui suit le point dans le nom (@pxref{Using gettextized software, normalized codeset,, libc, The GNU C Library Reference Manual}). Donc par exemple il y a @code{uk_UA.utf8} mais @emph{pas}, disons, @code{uk_UA.UTF-8}." #. type: subsubsection #: doc/guix.texi:9823 #, no-wrap msgid "Locale Data Compatibility Considerations" -msgstr "" +msgstr "Considérations sur la compatibilité des données linguistiques" #. type: cindex #: doc/guix.texi:9825 #, no-wrap msgid "incompatibility, of locale data" -msgstr "" +msgstr "incompatibilité, des données linguistiques" #. type: Plain text #: doc/guix.texi:9832 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 "" +msgstr "Les déclaration @code{operating-system} fournissent un champ @code{locale-libcs} pour spécifier les paquets GNU@tie{}libc à utiliser pour compiler les déclarations de paramètres linguistiques (@pxref{operating-system Reference}). « Pourquoi je devrais m'en soucier ? », vous demandez-vous sûrement. Hé bien il se trouve que le format binaire des données linguistique est parfois incompatible d'une version de la libc à une autre." #. type: Plain text #: doc/guix.texi:9844 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 "" +msgstr "Par exemple, un programme lié à la libc version 2.21 est incapable de lire les données linguistiques produites par la libc 2.22 ; pire, ce programme @emph{plante} plutôt que d'ignorer les données linguistiques incompatibles@footnote{Les version 2.23 et supérieures de la GNU@tie{}libc sauteront simplement les données linguistiques incompatibles, ce qui est déjà mieux.}. De même, un programme lié à la libc 2.22 peut lire la plupart mais pas toutes les données linguistiques de la libc 2.21 (spécifiquement les données @code{LC_COLLATE} sont incompatibles) ; donc les appels à @code{setlocale} peuvent échouer, mais les programmes ne plantent pas." #. type: Plain text #: doc/guix.texi:9849 msgid "The ``problem'' in GuixSD 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 "" +msgstr "Le « problème » avec GuixSD c'est que les utilisateurs ont beaucoup de liberté : ils peuvent choisir s'ils veulent et quand ils veulent mettre à jour les logiciels de leur profil, et peuvent utiliser une version différente de la libc de celle que l'administrateur système utilise pour construire les données linguistiques du système global." #. type: Plain text #: doc/guix.texi:9853 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 "" +msgstr "Heureusement, les utilisateurs non privilégiés peuvent aussi installer leur propres données linguistiques et définir @var{GUIX_LOCPATH} comme il le faut (@pxref{locales-and-locpath, @code{GUIX_LOCPATH} and locale packages})." #. type: Plain text #: doc/guix.texi:9860 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 "" +msgstr "Cependant, c'est encore mieux si les données linguistiques du système dans @file{/run/current-system/locale} étaient construites avec les versions de la libc utilisées sur le système, pour que tous les programmes puissent y accéder — c'est surtout crucial sur un système multi-utilisateurs. Pour cela, l'administrateur peut spécifier plusieurs paquets de la libc dans le champ @code{locale-libcs} de @code{operating-system} :" #. type: example #: doc/guix.texi:9863 @@ -17248,6 +17349,8 @@ msgid "" "(use-package-modules base)\n" "\n" msgstr "" +"(use-package-modules base)\n" +"\n" #. type: example #: doc/guix.texi:9867 @@ -17257,38 +17360,41 @@ msgid "" " ;; @dots{}\n" " (locale-libcs (list glibc-2.21 (canonical-package glibc))))\n" msgstr "" +"(operating-system\n" +" ;; @dots{}\n" +" (locale-libcs (list glibc-2.21 (canonical-package glibc))))\n" #. type: Plain text #: doc/guix.texi:9872 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 "" +msgstr "cet exemple créera un système contenant les définitions des paramètres linguistiques pour la libc 2.21 et pour la version actuelle de la libc dans @file{/run/current-system/locale}." #. type: cindex #: doc/guix.texi:9877 #, no-wrap msgid "system services" -msgstr "" +msgstr "services systèmes" #. type: Plain text #: doc/guix.texi:9883 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 "" +msgstr "Une part importante de la préparation d'une déclaration @code{operating-system} est la liste des @dfn{services systèmes} et de leur configuration (@pxref{Using the Configuration System}). Les services systèmes sont typiquement des démons lancés au démarrage ou d'autres actions requises à ce moment-là — p.@: ex.@: configurer les accès réseaux." #. type: Plain text #: doc/guix.texi:9890 msgid "GuixSD 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 "" +msgstr "GuixSD a une définition large de « service » (@pxref{Service Composition}), mais beaucoup de services sont gérés par le GNU@tie{}Shepherd (@pxref{Shepherd Services}). Sur un système lancé, la commande @command{herd} vous permet de lister les services disponibles, montrer leur statut, les démarrer et les arrêter, ou faire d'autres opérations spécifiques (@pxref{Jump Start,,, shepherd, The GNU Shepherd Manual}). Par exemple :" #. type: example #: doc/guix.texi:9893 #, no-wrap msgid "# herd status\n" -msgstr "" +msgstr "# herd status\n" #. type: Plain text #: doc/guix.texi:9898 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:" -msgstr "" +msgstr "La commande ci-dessus, lancée en @code{root}, liste les services actuellement définis. La commande @command{herd doc} montre un synopsis du service donné :" #. type: example #: doc/guix.texi:9902 @@ -17297,11 +17403,13 @@ msgid "" "# herd doc nscd\n" "Run libc's name service cache daemon (nscd).\n" msgstr "" +"# herd doc nscd\n" +"Run libc's name service cache daemon (nscd).\n" #. type: Plain text #: doc/guix.texi:9907 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 "" +msgstr "Les sous-commandes @command{start}, @command{stop} et @command{restart} ont l'effet auquel on s'attend. Par exemple, les commande suivantes stoppent le service nscd et redémarrent le serveur d'affichage Xorg :" #. type: example #: doc/guix.texi:9914 @@ -17313,89 +17421,94 @@ msgid "" "Service xorg-server has been stopped.\n" "Service xorg-server has been started.\n" msgstr "" +"# herd stop nscd\n" +"Service nscd has been stopped.\n" +"# herd restart xorg-server\n" +"Service xorg-server has been stopped.\n" +"Service xorg-server has been started.\n" #. type: Plain text #: doc/guix.texi:9919 msgid "The following sections document the available services, starting with the core services, that may be used in an @code{operating-system} declaration." -msgstr "" +msgstr "Les sections suivantes documentent les services disponibles, en commençant par les services de base qui peuvent être utilisés avec une déclaration @code{operating-system}." #. type: Plain text #: doc/guix.texi:9955 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 "" +msgstr "Le module @code{(gnu services base)} fournit des définitions de services poru les services de base qu'on peut attendre du système. Les services exportés par ce module sort listés ci-dessous." #. type: defvr #: doc/guix.texi:9956 #, no-wrap msgid "{Scheme Variable} %base-services" -msgstr "" +msgstr "{Variable Scheme} %base-services" #. type: defvr #: doc/guix.texi:9962 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 "" +msgstr "Cette variable contient une liste de services de base (@pxref{Service Types and Services}, pour plus d'informations sur les objets service) qu'on peut attendre du système : un service de connexion (mingetty) sur chaque tty, syslogd, le démon de cache de noms de la libc (nscd), le gestionnaire de périphériques udev, et plus." #. type: defvr #: doc/guix.texi:9967 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 @var{%base-services}, like this:" -msgstr "" +msgstr "C'est la valeur par défaut du champ @code{services} des déclarations @code{operating-system}. Habituellement, lors de la personnalisation d'un système, vous voudrez ajouter des services à ceux de @var{%base-services}, comme ceci :" #. type: example #: doc/guix.texi:9970 #, no-wrap msgid "(cons* (avahi-service) (lsh-service) %base-services)\n" -msgstr "" +msgstr "(cons* (avahi-service) (lsh-service) %base-services)\n" #. type: defvr #: doc/guix.texi:9973 #, no-wrap msgid "{Scheme Variable} special-files-service-type" -msgstr "" +msgstr "{Variable Scheme} special-files-service-type" #. type: defvr #: doc/guix.texi:9976 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 "" +msgstr "C'est le service qui met en place des « fichiers spéciaux » comme @file{/bin/sh} ; une instance de ce service fait partie de @code{%base-services}." #. type: defvr #: doc/guix.texi:9980 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 "" +msgstr "La valeur associée avec les services @code{special-files-service-type} doit être une liste de couples dont le premier élément est le « fichier spécial » et le deuxième sa cible. Par défaut il s'agit de :" #. type: file{#1} #: doc/guix.texi:9981 #, no-wrap msgid "/bin/sh" -msgstr "" +msgstr "/bin/sh" #. type: cindex #: doc/guix.texi:9982 #, no-wrap msgid "@file{sh}, in @file{/bin}" -msgstr "" +msgstr "@file{sh}, dans @file{/bin}" #. type: example #: doc/guix.texi:9985 #, no-wrap msgid "`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\")))\n" -msgstr "" +msgstr "`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\")))\n" #. type: file{#1} #: doc/guix.texi:9987 #, no-wrap msgid "/usr/bin/env" -msgstr "" +msgstr "/usr/bin/env" #. type: cindex #: doc/guix.texi:9988 #, no-wrap msgid "@file{env}, in @file{/usr/bin}" -msgstr "" +msgstr "@file{env}, dans @file{/usr/bin}" #. type: defvr #: doc/guix.texi:9991 msgid "If you want to add, say, @code{/usr/bin/env} to your system, you can change it to:" -msgstr "" +msgstr "Si vous voulez ajouter, disons, @code{/usr/bin/env} à votre système, vous pouvez changer cela en :" #. type: example #: doc/guix.texi:9995 @@ -17404,27 +17517,29 @@ msgid "" "`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\"))\n" " (\"/usr/bin/env\" ,(file-append @var{coreutils} \"/bin/env\")))\n" msgstr "" +"`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\"))\n" +" (\"/usr/bin/env\" ,(file-append @var{coreutils} \"/bin/env\")))\n" #. type: defvr #: doc/guix.texi:10002 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 "" +msgstr "Comme il fait parti de @code{%base-services}, vous pouvez utiliser @code{modify-services} pour personnaliser l'ensemble des fichiers spéciaux (@pxref{Service Reference, @code{modify-services}}). Mais une manière plus simple d'ajouter un fichier spécial est d'utiliser la procédure @code{extra-special-file} (voir plus bas)." #. type: deffn #: doc/guix.texi:10004 #, no-wrap msgid "{Scheme Procedure} extra-special-file @var{file} @var{target}" -msgstr "" +msgstr "{Procédure Scheme} extra-special-file @var{file} @var{target}" #. type: deffn #: doc/guix.texi:10006 msgid "Use @var{target} as the ``special file'' @var{file}." -msgstr "" +msgstr "Utilise @var{target} comme « fichier spécial » @var{file}." #. type: deffn #: doc/guix.texi:10010 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 "" +msgstr "Par exemple, ajouter l'une des lignes suivantes au champ @code{services} de votre déclaration de système d'exploitation crée un lien symbolique @file{/usr/bin/env} :" #. type: example #: doc/guix.texi:10014 @@ -17433,950 +17548,954 @@ msgid "" "(extra-special-file \"/usr/bin/env\"\n" " (file-append coreutils \"/bin/env\"))\n" msgstr "" +"(extra-special-file \"/usr/bin/env\"\n" +" (file-append coreutils \"/bin/env\"))\n" #. type: deffn #: doc/guix.texi:10017 #, no-wrap msgid "{Scheme Procedure} host-name-service @var{name}" -msgstr "" +msgstr "{Procédure Scheme} host-name-service @var{name}" #. type: deffn #: doc/guix.texi:10019 msgid "Return a service that sets the host name to @var{name}." -msgstr "" +msgstr "Renvoie un service qui paramètre le nom d'hôte à @var{name}." #. type: deffn #: doc/guix.texi:10021 #, no-wrap msgid "{Scheme Procedure} login-service @var{config}" -msgstr "" +msgstr "{Procédure Scheme} login-service @var{config}" #. type: deffn #: doc/guix.texi:10025 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 "" +msgstr "Renvoie un service pour lancer login en suivant @var{config}, un objet @code{} qui spécifie le message du jour, entre autres choses." #. type: deftp #: doc/guix.texi:10027 #, no-wrap msgid "{Data Type} login-configuration" -msgstr "" +msgstr "{Type de données} login-configuration" #. type: deftp #: doc/guix.texi:10029 msgid "This is the data type representing the configuration of login." -msgstr "" +msgstr "Le type de données qui représente la configuration de login." #. type: code{#1} #: doc/guix.texi:10032 #, no-wrap msgid "motd" -msgstr "" +msgstr "motd" #. type: cindex #: doc/guix.texi:10033 #, no-wrap msgid "message of the day" -msgstr "" +msgstr "message du jour" #. type: table #: doc/guix.texi:10035 msgid "A file-like object containing the ``message of the day''." -msgstr "" +msgstr "Un objet simili-fichier contenant le « message du jour »." #. type: item #: doc/guix.texi:10036 doc/guix.texi:11736 #, no-wrap msgid "@code{allow-empty-passwords?} (default: @code{#t})" -msgstr "" +msgstr "@code{allow-empty-passwords?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:10039 msgid "Allow empty passwords by default so that first-time users can log in when the 'root' account has just been created." -msgstr "" +msgstr "Permet les mots de passes vides par défaut pour que les utilisateurs puissent se connecter au compte « root » la première fois après sa création." #. type: deffn #: doc/guix.texi:10043 #, no-wrap msgid "{Scheme Procedure} mingetty-service @var{config}" -msgstr "" +msgstr "{Procédure Scheme} mingetty-service @var{config}" #. type: deffn #: doc/guix.texi:10047 msgid "Return a service to run mingetty according to @var{config}, a @code{} object, which specifies the tty to run, among other things." -msgstr "" +msgstr "Renvoie un service qui lance mingetty en suivant @var{config}, un objet @code{}, qui spécifie le tty à lancer entre autres choses." #. type: deftp #: doc/guix.texi:10049 #, no-wrap msgid "{Data Type} mingetty-configuration" -msgstr "" +msgstr "{Type de données} mingetty-configuration" #. type: deftp #: doc/guix.texi:10052 msgid "This is the data type representing the configuration of Mingetty, which provides the default implementation of virtual console log-in." -msgstr "" +msgstr "C'est le type de données représentant la configuration de Mingetty, qui fournit l'implémentation par défaut de l'écran de connexion des consoles virtuelles." #. type: code{#1} #: doc/guix.texi:10055 doc/guix.texi:10091 #, no-wrap msgid "tty" -msgstr "" +msgstr "tty" #. type: table #: doc/guix.texi:10057 msgid "The name of the console this Mingetty runs on---e.g., @code{\"tty1\"}." -msgstr "" +msgstr "Le nom de la console sur laquelle tourne ce Mingetty, p.@: ex.@: @code{\"tty1\"}." #. type: item #: doc/guix.texi:10058 doc/guix.texi:10120 #, no-wrap msgid "@code{auto-login} (default: @code{#f})" -msgstr "" +msgstr "@code{auto-login} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10062 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 "" +msgstr "Lorsque la valeur est vraie, ce champ doit être une chaîne de caractère dénotant le nom d'utilisateur pour lequel le système se connecte automatiquement. Lorsque la valeur est @code{#f}, il faut entrer un nom d'utilisateur et un mot de passe pour se connecter." #. type: item #: doc/guix.texi:10063 #, no-wrap msgid "@code{login-program} (default: @code{#f})" -msgstr "" +msgstr "@code{login-program} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10067 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 "" +msgstr "Ce doit être soit @code{#f}, auquel cas le programme de connexion par défaut est utilisé (@command{login} de la suite d'outils Shadow), soit une gexp dénotant le nom d'un programme de connexion." #. type: item #: doc/guix.texi:10068 #, no-wrap msgid "@code{login-pause?} (default: @code{#f})" -msgstr "" +msgstr "@code{login-pause?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10071 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 "" +msgstr "Lorsque la valeur est @code{#t} en plus de @var{auto-login}, l'utilisateur devrai appuyer sur une touche avant que le shell de connexion ne soit lancé." #. type: item #: doc/guix.texi:10072 #, no-wrap msgid "@code{mingetty} (default: @var{mingetty})" -msgstr "" +msgstr "@code{mingetty} (par défaut : @var{mingetty})" #. type: table #: doc/guix.texi:10074 msgid "The Mingetty package to use." -msgstr "" +msgstr "Le paquet Mingetty à utiliser." #. type: deffn #: doc/guix.texi:10078 #, no-wrap msgid "{Scheme Procedure} agetty-service @var{config}" -msgstr "" +msgstr "{Procédure Scheme} agetty-service @var{config}" #. type: deffn #: doc/guix.texi:10082 msgid "Return a service to run agetty according to @var{config}, an @code{} object, which specifies the tty to run, among other things." -msgstr "" +msgstr "Renvoie un service pour lancer agetty en suivant @var{config}, un objet @code{}, qui spécifie le tty à lancer, entre autres choses." #. type: deftp #: doc/guix.texi:10084 #, no-wrap msgid "{Data Type} agetty-configuration" -msgstr "" +msgstr "{Type de données} agetty-configuration" #. type: deftp #: doc/guix.texi:10088 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 "" +msgstr "Ce type de données représente la configuration de agetty, qui implémente l'écran de connexion des consoles virtuelles et series. Voir la page de manuel de @code{agetty(8)} pour plus d'informations." #. type: table #: doc/guix.texi:10095 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 "" +msgstr "Le nom de la console sur laquelle agetty est lancé p.@: ex.@: @code{\"ttyS0\"}. Cet argument est facultatif, il aura par défaut une valeur raisonnable d'un port série utilisé par le noyau Linux." #. type: table #: doc/guix.texi:10099 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 "" +msgstr "Pour cela, s'il y a une valeur pour une option @code{agetty.tty} sur la ligne de commande du noyau, agetty extraira le nom du périphérique du port série à partir de cette option." #. type: table #: doc/guix.texi:10103 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 "" +msgstr "Sinon et s'il y a une valeur pour une option @code{console} avec un tty sur la ligne de commande du noyau Linux, agetty extraira le nom du périphérique du port série et l'utilisera." #. type: table #: doc/guix.texi:10107 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 "" +msgstr "Dans les deux cas, agetty laissera les autres paramètres du périphérique série (baud, etc) sans y toucher — dans l'espoir que Linux leur a assigné les bonnes valeurs." #. type: item #: doc/guix.texi:10108 #, no-wrap msgid "@code{baud-rate} (default: @code{#f})" -msgstr "" +msgstr "@code{baud-rate} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10111 msgid "A string containing a comma-separated list of one or more baud rates, in descending order." -msgstr "" +msgstr "Une chaîne qui contient une liste d'un ou plusieurs taux de baud séparés par des virgules, en ordre décroissant." #. type: item #: doc/guix.texi:10112 #, no-wrap msgid "@code{term} (default: @code{#f})" -msgstr "" +msgstr "@code{term} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10115 msgid "A string containing the value used for the @code{TERM} environment variable." -msgstr "" +msgstr "Une chaîne contenant la valeur utilisée pour la variable d'environnement @code{TERM}." #. type: item #: doc/guix.texi:10116 #, no-wrap msgid "@code{eight-bits?} (default: @code{#f})" -msgstr "" +msgstr "@code{eight-bits?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10119 msgid "When @code{#t}, the tty is assumed to be 8-bit clean, and parity detection is disabled." -msgstr "" +msgstr "Lorsque la valeur est @code{#t}, le tty est supposé être propre pour les caractères 8-bit et la détection de parité est désactivée." #. type: table #: doc/guix.texi:10123 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 "" +msgstr "Lorsqu'un nom de connexion est passé comme une chaîne de caractères, l'utilisateur spécifié sera automatiquement connecté sans demande du nom d'utilisateur ni du mot de passe." #. type: item #: doc/guix.texi:10124 #, no-wrap msgid "@code{no-reset?} (default: @code{#f})" -msgstr "" +msgstr "@code{no-reset?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10126 msgid "When @code{#t}, don't reset terminal cflags (control modes)." -msgstr "" +msgstr "Lorsque la valeur est @code{#t}, ne vide pas les cflags du terminal (modes de contrôle)." #. type: item #: doc/guix.texi:10127 #, no-wrap msgid "@code{host} (default: @code{#f})" -msgstr "" +msgstr "@code{host} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10130 msgid "This accepts a string containing the \"login_host\", which will be written into the @file{/var/run/utmpx} file." -msgstr "" +msgstr "Cette option accepte une chaîne contenant le « login_host », qui sera écrit dans le fichier @file{/var/run/utmpx}." #. type: item #: doc/guix.texi:10131 #, no-wrap msgid "@code{remote?} (default: @code{#f})" -msgstr "" +msgstr "@code{remote?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10135 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 "" +msgstr "Lorsque la valeur est @code{#t} en plus de @var{host}, cette option ajoutera une option fakehost @code{-r} à la ligne de commande du programme de connexion spécifié dans @var{login-program}." #. type: item #: doc/guix.texi:10136 #, no-wrap msgid "@code{flow-control?} (default: @code{#f})" -msgstr "" +msgstr "@code{flow-control?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10138 msgid "When set to @code{#t}, enable hardware (RTS/CTS) flow control." -msgstr "" +msgstr "Lorsque la valeur est @code{#t}, active le contrôle de flux matériel (RTS/CTS)." #. type: item #: doc/guix.texi:10139 #, no-wrap msgid "@code{no-issue?} (default: @code{#f})" -msgstr "" +msgstr "@code{no-issue?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10142 msgid "When set to @code{#t}, the contents of the @file{/etc/issue} file will not be displayed before presenting the login prompt." -msgstr "" +msgstr "Lorsque la valeur est @code{#t}, le contenu du fichier @file{/etc/issue} ne sera pas affiché avant de présenter l'écran de connexion." #. type: item #: doc/guix.texi:10143 #, no-wrap msgid "@code{init-string} (default: @code{#f})" -msgstr "" +msgstr "@code{init-string} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10146 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 "" +msgstr "Cette option accepte une chaîne de caractères qui sera envoyée au tty ou au modem avant toute autre chose. Elle peut être utilisée pour initialiser un modem." #. type: item #: doc/guix.texi:10147 #, no-wrap msgid "@code{no-clear?} (default: @code{#f})" -msgstr "" +msgstr "@code{no-clear?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10150 msgid "When set to @code{#t}, agetty will not clear the screen before showing the login prompt." -msgstr "" +msgstr "Lorsque la valeur est @code{#t}, agetty ne nettoiera pas l'écran avant de montrer l'écran de connexion." #. type: item #: doc/guix.texi:10151 #, no-wrap msgid "@code{login-program} (default: (file-append shadow \"/bin/login\"))" -msgstr "" +msgstr "@code{login-program} (par défaut : (file-append shadow \"/bin/login\"))" #. type: table #: doc/guix.texi:10155 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 "" +msgstr "Cette option doit être soit une gexp dénotant le nom d'un programme de connexion, soit non définie, auquel cas la valeur par défaut est la commande @command{login} de la suite d'outils Shadow." #. type: item #: doc/guix.texi:10156 #, no-wrap msgid "@code{local-line} (default: @code{#f})" -msgstr "" +msgstr "@code{local-line} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10160 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 "" +msgstr "Contrôle le drapeau CLOCAL. Cette option accepte l'un des trois symboles comme argument, @code{'auto}, @code{'always} ou @code{'never}. Si la valeur est @code{#f}, la valeur par défaut choisie par agetty est @code{'auto}…" #. type: item #: doc/guix.texi:10161 #, no-wrap msgid "@code{extract-baud?} (default: @code{#f})" -msgstr "" +msgstr "@code{extract-baud?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10164 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 "" +msgstr "Lorsque la valeur est @code{#t}, dit à agetty d'essayer d'extraire la taux de baud depuis les messages de statut produits par certains modems." #. type: item #: doc/guix.texi:10165 #, no-wrap msgid "@code{skip-login?} (default: @code{#f})" -msgstr "" +msgstr "@code{skip-login?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10169 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 "" +msgstr "Lorsque la valeur est @code{#t}, ne demande par de nom d'utilisateur. Elle peut être utilisée avec le champ @var{login-program} pour utiliser des systèmes de connexion non standards." #. type: item #: doc/guix.texi:10170 #, no-wrap msgid "@code{no-newline?} (default: @code{#f})" -msgstr "" +msgstr "@code{no-newline?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10173 msgid "When set to @code{#t}, do not print a newline before printing the @file{/etc/issue} file." -msgstr "" +msgstr "Lorsque la valeur est @code{#t}, n'affiche pas de retour à la ligne avant d'afficher le fichier @file{/etc/issue}." #. type: item #: doc/guix.texi:10175 #, no-wrap msgid "@code{login-options} (default: @code{#f})" -msgstr "" +msgstr "@code{login-options} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10180 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 "" +msgstr "Cette option accepte une chaîne de caractères contenant des options passées au programme login. Lorsqu'utilisé avec @var{login-program}, soyez conscient qu'un utilisateur malicieux pourrait essayer de rentrer un nom d'utilisateur contenant des options incluses qui pourraient être analysées par le programme de connexion." #. type: item #: doc/guix.texi:10181 #, no-wrap msgid "@code{login-pause} (default: @code{#f})" -msgstr "" +msgstr "@code{login-pause} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10185 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 "" +msgstr "Lorsque la valeur est @code{#t}, attend qu'une touche soit appuyée avant de montrer l'écran de connexion. Cela peut être utilisé avec @var{auto-login} pour sauvegarder de la mémoire en lançant les shells de manière fainéante." #. type: item #: doc/guix.texi:10186 #, no-wrap msgid "@code{chroot} (default: @code{#f})" -msgstr "" +msgstr "@code{chroot} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10189 msgid "Change root to the specified directory. This option accepts a directory path as a string." -msgstr "" +msgstr "Change de racine dans le répertoire donné. Cette option accepte un chemin en tant que chaîne de caractères." #. type: item #: doc/guix.texi:10190 #, no-wrap msgid "@code{hangup?} (default: @code{#f})" -msgstr "" +msgstr "@code{hangup?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10193 msgid "Use the Linux system call @code{vhangup} to do a virtual hangup of the specified terminal." -msgstr "" +msgstr "Utilise l'appel système Linux @code{vhangup} pour raccrocher virtuellement le terminal spécifié." #. type: item #: doc/guix.texi:10194 #, no-wrap msgid "@code{keep-baud?} (default: @code{#f})" -msgstr "" +msgstr "@code{keep-baud?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10198 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 "" +msgstr "Lorsque la valeur est @code{#t}, essaye de garder le taux de baud existant. Les taux de baud de @var{baud-rate} sont utilisés lorsque agetty reçoit un caractères @key{BREAK}." #. type: item #: doc/guix.texi:10199 #, no-wrap msgid "@code{timeout} (default: @code{#f})" -msgstr "" +msgstr "@code{timeout} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10202 msgid "When set to an integer value, terminate if no user name could be read within @var{timeout} seconds." -msgstr "" +msgstr "Lorsque la valeur est un nombre entier, termine la session si aucun nom d'utilisateur n'a pu être lu après @var{timeout} secondes." #. type: item #: doc/guix.texi:10203 #, no-wrap msgid "@code{detect-case?} (default: @code{#f})" -msgstr "" +msgstr "@code{detect-case?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10209 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 "" +msgstr "Lorsque la valeur est @code{#t}, active le support pour la détection des terminaux en majuscule uniquement. Ce paramètre détectera qu'un nom d'utilisateur qui ne contient que des majuscules indique un terminal en majuscule et effectuera des conversion de majuscule en minuscule. Remarquez que cela ne fonctionne pas avec les caractères unicode." #. type: item #: doc/guix.texi:10210 #, no-wrap msgid "@code{wait-cr?} (default: @code{#f})" -msgstr "" +msgstr "@code{wait-cr?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10215 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 "" +msgstr "Lorsque la valeur est @code{#t}, attend que l'utilisateur ou le modem envoie un retour chariot ou un saut de ligne avant d'afficher @file{/etc/issue} ou l'écran de connexion. Cela est typiquement utilisé avec l'option @var{init-string}." #. type: item #: doc/guix.texi:10216 #, no-wrap msgid "@code{no-hints?} (default: @code{#f})" -msgstr "" +msgstr "@code{no-hints?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10219 msgid "When set to @code{#t}, do not print hints about Num, Caps, and Scroll locks." -msgstr "" +msgstr "Lorsque la valeur est @code{#t}, n'affiche par les astuces à propos des verrouillages numériques, majuscule et défilement." #. type: item #: doc/guix.texi:10220 #, no-wrap msgid "@code{no-hostname?} (default: @code{#f})" -msgstr "" +msgstr "@code{no-hostname?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10223 msgid "By default, the hostname is printed. When this option is set to @code{#t}, no hostname will be shown at all." -msgstr "" +msgstr "Par défaut, le nom d'hôte est affiché. Lorsque la valeur est @code{#t}, aucun nom d'hôte ne sera affiché." #. type: item #: doc/guix.texi:10224 #, no-wrap msgid "@code{long-hostname?} (default: @code{#f})" -msgstr "" +msgstr "@code{long-hostname?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10228 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 "" +msgstr "Par défaut, le nom d'hôte n'est affiché qu'après le premier point. Lorsque la valeur est @code{#t}, le nom d'hôte pleinement qualifié renvoyé par @code{gethostname} ou @code{getaddrinfo} sera affiché." #. type: item #: doc/guix.texi:10229 #, no-wrap msgid "@code{erase-characters} (default: @code{#f})" -msgstr "" +msgstr "@code{erase-characters} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10232 msgid "This option accepts a string of additional characters that should be interpreted as backspace when the user types their login name." -msgstr "" +msgstr "Cette option accepte une chaîne de caractères de caractères supplémentaires qui devraient être interprétés comme des effacements lorsque l'utilisateur les tape dans leur nom d'utilisateur." #. type: item #: doc/guix.texi:10233 #, no-wrap msgid "@code{kill-characters} (default: @code{#f})" -msgstr "" +msgstr "@code{kill-characters} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10237 msgid "This option accepts a string that should be interpreted to mean \"ignore all previous characters\" (also called a \"kill\" character) when the types their login name." -msgstr "" +msgstr "Cette option accepte une chaîne de caractères qui devrait être interprété comme signifiant « ignore tous les caractères précédent » (aussi appelé un caractère « kill ») lorsque l'utilisateur tape son nom d'utilisateur." #. type: item #: doc/guix.texi:10238 #, no-wrap msgid "@code{chdir} (default: @code{#f})" -msgstr "" +msgstr "@code{chdir} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10241 msgid "This option accepts, as a string, a directory path that will be changed to before login." -msgstr "" +msgstr "Cette option accepte, en tant que chaîne de caractères, un chemin vers un répertoire dans lequel se trouvera la commande avant la connexion." #. type: item #: doc/guix.texi:10242 #, no-wrap msgid "@code{delay} (default: @code{#f})" -msgstr "" +msgstr "@code{delay} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10245 msgid "This options accepts, as an integer, the number of seconds to sleep before opening the tty and displaying the login prompt." -msgstr "" +msgstr "Cette option accepte, en tant qu'entier, le nombre de secondes à attendre avant d'ouvrir le tty et afficher l'écran de connexion." #. type: item #: doc/guix.texi:10246 #, no-wrap msgid "@code{nice} (default: @code{#f})" -msgstr "" +msgstr "@code{nice} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10249 msgid "This option accepts, as an integer, the nice value with which to run the @command{login} program." -msgstr "" +msgstr "Cette option accepte, en tant qu'entier, la valeur « nice » avec laquelle le programme @command{login} tourne." #. type: item #: doc/guix.texi:10250 doc/guix.texi:10450 #, no-wrap msgid "@code{extra-options} (default: @code{'()})" -msgstr "" +msgstr "@code{extra-options} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:10253 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 "" +msgstr "Cette option fournie un « mécanisme de secours » pour que l'utilisateur puisse ajouter des arguments de la ligne de commande arbitraires à @command{agetty} comme une liste de chaînes de caractères." #. type: deffn #: doc/guix.texi:10257 #, no-wrap msgid "{Scheme Procedure} kmscon-service-type @var{config}" -msgstr "" +msgstr "{Procédure Scheme} kmscon-service-type @var{config}" #. type: deffn #: doc/guix.texi:10261 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 "" +msgstr "Renvoie un service qui lance @uref{https://www.freedesktop.org/wiki/Software/kmscon,kmscon} d'après @var{config}, un objet @code{}, qui spécifie le tty sur lequel tourner, entre autres choses." #. type: deftp #: doc/guix.texi:10263 #, no-wrap msgid "{Data Type} kmscon-configuration" -msgstr "" +msgstr "{Type de données} kmscon-configuration" #. type: deftp #: doc/guix.texi:10266 msgid "This is the data type representing the configuration of Kmscon, which implements virtual console log-in." -msgstr "" +msgstr "C'est le type de données représentant la configuration de Kscon, qui implémente l'écran de chargement de la console virtuelle." #. type: code{#1} #: doc/guix.texi:10269 #, no-wrap msgid "virtual-terminal" -msgstr "" +msgstr "virtual-terminal" #. type: table #: doc/guix.texi:10271 msgid "The name of the console this Kmscon runs on---e.g., @code{\"tty1\"}." -msgstr "" +msgstr "Le nom de la console sur laquelle Kmscon tourne, p.@: ex.@: @code{\"tty1\"}." #. type: item #: doc/guix.texi:10272 #, no-wrap msgid "@code{login-program} (default: @code{#~(string-append #$shadow \"/bin/login\")})" -msgstr "" +msgstr "@code{login-program} (par défaut : @code{#~(string-append #$shadow \"/bin/login\")})" #. type: table #: doc/guix.texi:10275 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 "" +msgstr "Une gexp qui dénote le nom d'un programme de connexion. le programme de connexion par défaut est @command{login} de la suite d'outils Shadow." #. type: item #: doc/guix.texi:10276 #, no-wrap msgid "@code{login-arguments} (default: @code{'(\"-p\")})" -msgstr "" +msgstr "@code{login-arguments} (par défaut : @code{'(\"-p\")})" #. type: table #: doc/guix.texi:10278 msgid "A list of arguments to pass to @command{login}." -msgstr "" +msgstr "Une liste d'arguments à passer à @command{login}." #. type: item #: doc/guix.texi:10279 #, no-wrap msgid "@code{hardware-acceleration?} (default: #f)" -msgstr "" +msgstr "@code{hardware-acceleration?} (par défaut : #f)" #. type: table #: doc/guix.texi:10281 msgid "Whether to use hardware acceleration." -msgstr "" +msgstr "S'il faut utiliser l'accélération matérielle." #. type: item #: doc/guix.texi:10282 #, no-wrap msgid "@code{kmscon} (default: @var{kmscon})" -msgstr "" +msgstr "@code{kmscon} (par défaut : @var{kmscon})" #. type: table #: doc/guix.texi:10284 msgid "The Kmscon package to use." -msgstr "" +msgstr "Le paquet Kmscon à utiliser." #. type: cindex #: doc/guix.texi:10288 #, no-wrap msgid "name service cache daemon" -msgstr "" +msgstr "name service cache daemon" #. type: cindex #: doc/guix.texi:10289 #, no-wrap msgid "nscd" -msgstr "" +msgstr "nscd" #. type: deffn #: doc/guix.texi:10290 #, no-wrap msgid "{Scheme Procedure} nscd-service [@var{config}] [#:glibc glibc] @" -msgstr "" +msgstr "{Procédure Scheme} nscd-service [@var{config}] [#:glibc glibc] @" #. type: deffn #: doc/guix.texi:10295 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 "" +"[#:name-services '()]\n" +"Renvoie un service qui lance le démon de cache de services de noms de la libc (nscd) avec la @var{config} donnée — un objet @code{}. @xref{Name Service Switch}, pour un exemple." #. type: defvr #: doc/guix.texi:10297 #, no-wrap msgid "{Scheme Variable} %nscd-default-configuration" -msgstr "" +msgstr "{Variable Scheme} %nscd-default-configuration" #. type: defvr #: doc/guix.texi:10301 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 "" +msgstr "C'est la valeur par défaut de @code{} (voir plus bas) utilisée par @code{nscd-service}. Elle utilise les caches définis par @var{%nscd-default-caches} ; voir plus bas." #. type: deftp #: doc/guix.texi:10303 #, no-wrap msgid "{Data Type} nscd-configuration" -msgstr "" +msgstr "{Type de données} nscd-configuration" #. type: deftp #: doc/guix.texi:10306 msgid "This is the data type representing the name service cache daemon (nscd) configuration." -msgstr "" +msgstr "C'est le type de données qui représente la configuration du démon de cache de services de noms (nscd)." #. type: item #: doc/guix.texi:10309 #, no-wrap msgid "@code{name-services} (default: @code{'()})" -msgstr "" +msgstr "@code{name-services} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:10312 msgid "List of packages denoting @dfn{name services} that must be visible to the nscd---e.g., @code{(list @var{nss-mdns})}." -msgstr "" +msgstr "Liste des paquets dénotant des @dfn{services de noms} qui doivent être visible pour nscd, p.@: ex.@: @code{(list @var{nss-mdns})}." #. type: item #: doc/guix.texi:10313 #, no-wrap msgid "@code{glibc} (default: @var{glibc})" -msgstr "" +msgstr "@code{glibc} (par défaut : @var{glibc})" #. type: table #: doc/guix.texi:10316 msgid "Package object denoting the GNU C Library providing the @command{nscd} command." -msgstr "" +msgstr "Objet de paquet qui dénote la Biblothèque C de GNU qui fournit la commande @command{nscd}." #. type: item #: doc/guix.texi:10317 #, no-wrap msgid "@code{log-file} (default: @code{\"/var/log/nscd.log\"})" -msgstr "" +msgstr "@code{log-file} (par défaut : @code{\"/var/log/nscd.log\"})" #. type: table #: doc/guix.texi:10320 msgid "Name of the nscd log file. This is where debugging output goes when @code{debug-level} is strictly positive." -msgstr "" +msgstr "Nom du fichier journal de nscd. C'est là que les sorties de débogage sont envoyée lorsque @code{debug-level} est strictement positif." #. type: item #: doc/guix.texi:10321 #, no-wrap msgid "@code{debug-level} (default: @code{0})" -msgstr "" +msgstr "@code{debug-level} (par défaut : @code{0})" #. type: table #: doc/guix.texi:10324 msgid "Integer denoting the debugging levels. Higher numbers mean that more debugging output is logged." -msgstr "" +msgstr "Entier qui dénote le niveau de débogage. Les entiers les plus grands signifient plus de sortie de débogage." #. type: item #: doc/guix.texi:10325 #, no-wrap msgid "@code{caches} (default: @var{%nscd-default-caches})" -msgstr "" +msgstr "@code{caches} (par défaut : @var{%nscd-default-caches})" #. type: table #: doc/guix.texi:10328 msgid "List of @code{} objects denoting things to be cached; see below." -msgstr "" +msgstr "Liste d'objets @code{} qui dénotent des choses à mettre en cache ; voir plus bas." #. type: deftp #: doc/guix.texi:10332 #, no-wrap msgid "{Data Type} nscd-cache" -msgstr "" +msgstr "{Type de données} nscd-cache" #. type: deftp #: doc/guix.texi:10334 msgid "Data type representing a cache database of nscd and its parameters." -msgstr "" +msgstr "Type de données représentant une base de données de cache de nscd et ses paramètres." #. type: cindex #: doc/guix.texi:10337 doc/guix.texi:13172 #, no-wrap msgid "database" -msgstr "" +msgstr "database" #. type: table #: doc/guix.texi:10342 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 "" +msgstr "C'est un symbole qui représente le nom de la base de donnée à mettre en cache. Les valeurs valide sont @code{passwd}, @code{group}, @code{hosts} et @code{services} qui désignent les bases de données NSS correspondantes (@pxref{NSS Basics,,, libc, The GNU C Library Reference Manual})." #. type: code{#1} #: doc/guix.texi:10343 #, no-wrap msgid "positive-time-to-live" -msgstr "" +msgstr "positive-time-to-live" #. type: itemx #: doc/guix.texi:10344 #, no-wrap msgid "@code{negative-time-to-live} (default: @code{20})" -msgstr "" +msgstr "@code{negative-time-to-live} (par défaut : @code{20})" #. type: table #: doc/guix.texi:10347 msgid "A number representing the number of seconds during which a positive or negative lookup result remains in cache." -msgstr "" +msgstr "Un entier qui représente le nombre de secondes pendant lesquelles un résultat positif ou négatif reste en cache." #. type: item #: doc/guix.texi:10348 #, no-wrap msgid "@code{check-files?} (default: @code{#t})" -msgstr "" +msgstr "@code{check-files?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:10351 msgid "Whether to check for updates of the files corresponding to @var{database}." -msgstr "" +msgstr "Indique s'il faut vérifier des mises à jours dans les fichiers correspondant à @var{database}." #. type: table #: doc/guix.texi:10355 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 "" +msgstr "Par exemple, lorsque @var{database} est @code{hosts}, ce drapeau indique à nscd de vérifier s'il y a des mises à jour de @file{/etc/hosts} et de les prendre en compte." #. type: item #: doc/guix.texi:10356 #, no-wrap msgid "@code{persistent?} (default: @code{#t})" -msgstr "" +msgstr "@code{persistent?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:10358 msgid "Whether the cache should be stored persistently on disk." -msgstr "" +msgstr "Indique si le cache devrait être stocké de manière persistante sur le disque." #. type: item #: doc/guix.texi:10359 #, no-wrap msgid "@code{shared?} (default: @code{#t})" -msgstr "" +msgstr "@code{shared?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:10361 msgid "Whether the cache should be shared among users." -msgstr "" +msgstr "Indique si le cache devrait être partagé entre les utilisateurs." #. type: item #: doc/guix.texi:10362 #, no-wrap msgid "@code{max-database-size} (default: 32@tie{}MiB)" -msgstr "" +msgstr "@code{max-database-size} (par défaut : 32@tie{}MiB)" #. type: table #: doc/guix.texi:10364 msgid "Maximum size in bytes of the database cache." -msgstr "" +msgstr "Taille maximale en octets de la base de données en cache." #. type: defvr #: doc/guix.texi:10371 #, no-wrap msgid "{Scheme Variable} %nscd-default-caches" -msgstr "" +msgstr "{Variable Scheme} %nscd-default-caches" #. type: defvr #: doc/guix.texi:10374 msgid "List of @code{} objects used by default by @code{nscd-configuration} (see above)." -msgstr "" +msgstr "Liste d'objets @code{} utilisés par défaut par @code{nscd-configuration} (voir plus haut)." #. type: defvr #: doc/guix.texi:10380 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 "" +msgstr "Elle active la mise en cache persistante et agressive des recherches de services et de noms d'hôtes. Ces derniers fournissent une recherche de noms d'hôtes plus performante, résiliente face à des serveurs de noms peu fiables et une protection de votre vie privée plus efficace — souvent le résultat des recherches de noms d'hôtes sont dans le cache local, donc les serveurs de nom externes n'ont même pas besoin d'être questionnés." #. type: anchor{#1} #: doc/guix.texi:10383 msgid "syslog-configuration-type" -msgstr "" +msgstr "syslog-configuration-type" #. type: cindex #: doc/guix.texi:10383 doc/guix.texi:10399 #, no-wrap msgid "syslog" -msgstr "" +msgstr "syslog" #. type: cindex #: doc/guix.texi:10384 doc/guix.texi:10833 #, no-wrap msgid "logging" -msgstr "" +msgstr "logging" #. type: deftp #: doc/guix.texi:10385 #, no-wrap msgid "{Data Type} syslog-configuration" -msgstr "" +msgstr "{Type de données} syslog-configuration" #. type: deftp #: doc/guix.texi:10387 msgid "This data type represents the configuration of the syslog daemon." -msgstr "" +msgstr "Ce type de données représente la configuration du démon syslog." #. type: item #: doc/guix.texi:10389 #, no-wrap msgid "@code{syslogd} (default: @code{#~(string-append #$inetutils \"/libexec/syslogd\")})" -msgstr "" +msgstr "@code{syslogd} (par défaut : @code{#~(string-append #$inetutils \"/libexec/syslogd\")})" #. type: table #: doc/guix.texi:10391 msgid "The syslog daemon to use." -msgstr "" +msgstr "Le démon syslog à utiliser." #. type: item #: doc/guix.texi:10392 #, no-wrap msgid "@code{config-file} (default: @code{%default-syslog.conf})" -msgstr "" +msgstr "@code{config-file} (par défaut : @code{%default-syslog.conf})" #. type: table #: doc/guix.texi:10394 msgid "The syslog configuration file to use." -msgstr "" +msgstr "Le fichier de configuration de syslog à utiliser." #. type: anchor{#1} #: doc/guix.texi:10399 msgid "syslog-service" -msgstr "" +msgstr "syslog-service" #. type: deffn #: doc/guix.texi:10400 #, no-wrap msgid "{Scheme Procedure} syslog-service @var{config}" -msgstr "" +msgstr "{Procédure Scheme} syslog-service @var{config}" #. type: deffn #: doc/guix.texi:10402 msgid "Return a service that runs a syslog daemon according to @var{config}." -msgstr "" +msgstr "Renvoie un service qui lance un démon syslog en suivant @var{config}." #. type: deffn #: doc/guix.texi:10405 msgid "@xref{syslogd invocation,,, inetutils, GNU Inetutils}, for more information on the configuration file syntax." -msgstr "" +msgstr "@xref{syslogd invocation,,, inetutils, GNU Inetutils}, pour plus d'informations sur la syntaxe du fichier de configuration." #. type: anchor{#1} #: doc/guix.texi:10408 msgid "guix-configuration-type" -msgstr "" +msgstr "guix-configuration-type" #. type: deftp #: doc/guix.texi:10408 #, no-wrap msgid "{Data Type} guix-configuration" -msgstr "" +msgstr "{Type de données} guix-configuration" #. type: deftp #: doc/guix.texi:10411 msgid "This data type represents the configuration of the Guix build daemon. @xref{Invoking guix-daemon}, for more information." -msgstr "" +msgstr "Ce type de données représente la configuration du démon de construction de Guix. @xref{Invoking guix-daemon} pour plus d'informations." #. type: item #: doc/guix.texi:10413 #, no-wrap msgid "@code{guix} (default: @var{guix})" -msgstr "" +msgstr "@code{guix} (par défaut : @var{guix})" #. type: table #: doc/guix.texi:10415 doc/guix.texi:10659 msgid "The Guix package to use." -msgstr "" +msgstr "Le paquet Guix à utiliser." #. type: item #: doc/guix.texi:10416 #, no-wrap msgid "@code{build-group} (default: @code{\"guixbuild\"})" -msgstr "" +msgstr "@code{build-group} (par défaut : @code{\"guixbuild\"})" #. type: table #: doc/guix.texi:10418 msgid "Name of the group for build user accounts." -msgstr "" +msgstr "Nom du groupe des comptes utilisateurs de construction." #. type: item #: doc/guix.texi:10419 #, no-wrap msgid "@code{build-accounts} (default: @code{10})" -msgstr "" +msgstr "@code{build-accounts} (par défaut : @code{10})" #. type: table #: doc/guix.texi:10421 msgid "Number of build user accounts to create." -msgstr "" +msgstr "Nombre de comptes utilisateurs de construction à créer." #. type: item #: doc/guix.texi:10422 #, no-wrap msgid "@code{authorize-key?} (default: @code{#t})" -msgstr "" +msgstr "@code{authorize-key?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:10427 @@ -18387,13 +18506,13 @@ msgstr "Autoriser ou non les clefs de substituts listées dans @code{authorize-k #: doc/guix.texi:10428 #, no-wrap msgid "%default-authorized-guix-keys" -msgstr "" +msgstr "%default-authorized-guix-keys" #. type: item #: doc/guix.texi:10429 #, no-wrap msgid "@code{authorized-keys} (default: @var{%default-authorized-guix-keys})" -msgstr "" +msgstr "@code{authorized-keys} (par défaut : @var{%default-authorized-guix-keys})" #. type: table #: doc/guix.texi:10433 @@ -18404,127 +18523,127 @@ msgstr "La liste des fichiers de clefs autorisées pour les imports d'archives, #: doc/guix.texi:10434 #, no-wrap msgid "@code{use-substitutes?} (default: @code{#t})" -msgstr "" +msgstr "@code{use-substitutes?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:10436 msgid "Whether to use substitutes." -msgstr "" +msgstr "S'il faut utiliser les substituts." #. type: item #: doc/guix.texi:10437 #, no-wrap msgid "@code{substitute-urls} (default: @var{%default-substitute-urls})" -msgstr "" +msgstr "@code{substitute-urls} (par défaut : @var{%default-substitute-urls})" #. type: table #: doc/guix.texi:10439 msgid "The list of URLs where to look for substitutes by default." -msgstr "" +msgstr "La liste des URL où trouver des substituts par défaut." #. type: item #: doc/guix.texi:10440 #, no-wrap msgid "@code{max-silent-time} (default: @code{0})" -msgstr "" +msgstr "@code{max-silent-time} (par défaut : @code{0})" #. type: itemx #: doc/guix.texi:10441 #, no-wrap msgid "@code{timeout} (default: @code{0})" -msgstr "" +msgstr "@code{timeout} (par défaut : @code{0})" #. type: table #: doc/guix.texi:10445 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 "" +msgstr "Le nombre de secondes de silence et le nombre de secondes d'inactivité, respectivement, après lesquelles un processus de construction son délai d'attente. Une valeur de zéro désactive le délai d'attente." #. type: item #: doc/guix.texi:10446 #, no-wrap msgid "@code{log-compression} (default: @code{'bzip2})" -msgstr "" +msgstr "@code{log-compression} (par défaut : @code{'bzip2})" #. type: table #: doc/guix.texi:10449 msgid "The type of compression used for build logs---one of @code{gzip}, @code{bzip2}, or @code{none}." -msgstr "" +msgstr "Le type de compression utilisé par les journaux de construction — parmi @code{gzip}, @code{bzip2} et @code{none}." #. type: table #: doc/guix.texi:10452 msgid "List of extra command-line options for @command{guix-daemon}." -msgstr "" +msgstr "Liste d'options supplémentaires de la ligne de commande pour @command{guix-daemon}." #. type: item #: doc/guix.texi:10453 #, no-wrap msgid "@code{log-file} (default: @code{\"/var/log/guix-daemon.log\"})" -msgstr "" +msgstr "@code{log-file} (par défaut : @code{\"/var/log/guix-daemon.log\"})" #. type: table #: doc/guix.texi:10456 msgid "File where @command{guix-daemon}'s standard output and standard error are written." -msgstr "" +msgstr "Le fichier où les sorties standard et d'erreur de @command{guix-daemon} sont écrites." #. type: item #: doc/guix.texi:10457 #, no-wrap msgid "@code{http-proxy} (default: @code{#f})" -msgstr "" +msgstr "@code{http-proxy} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10460 msgid "The HTTP proxy used for downloading fixed-output derivations and substitutes." -msgstr "" +msgstr "Le serveur mandataire HTTP à utiliser pour télécharger les dérivations à sortie fixe et les substituts." #. type: item #: doc/guix.texi:10461 #, no-wrap msgid "@code{tmpdir} (default: @code{#f})" -msgstr "" +msgstr "@code{tmpdir} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10463 msgid "A directory path where the @command{guix-daemon} will perform builds." -msgstr "" +msgstr "Un répertoire où @command{guix-daemon} effectuera ses constructions." #. type: deffn #: doc/guix.texi:10467 #, no-wrap msgid "{Scheme Procedure} guix-service @var{config}" -msgstr "" +msgstr "{Procédure Scheme} guix-service @var{config}" #. type: deffn #: doc/guix.texi:10470 msgid "Return a service that runs the Guix build daemon according to @var{config}." -msgstr "" +msgstr "Renvoie un service qui fait tourner le démon de construction de Guix en suivant @var{config}." #. type: deffn #: doc/guix.texi:10472 #, no-wrap msgid "{Scheme Procedure} udev-service [#:udev @var{eudev} #:rules @code{'()}]" -msgstr "" +msgstr "{Procédure Scheme} udev-service [#:udev @var{eudev} #:rules @code{'()}]" #. type: deffn #: doc/guix.texi:10477 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 @var{udev-rule} and @var{file->udev-rule} from @code{(gnu services base)} simplify the creation of such rule files." -msgstr "" +msgstr "Lance @var{udev}, qui rempli le répertoire @file{/dev} dynamiquement. Les règles udev peuvent être fournies comme une liste de fichier via la variable @var{rules}. Les procédures @var{udev-rule} et @var{file->udev-rule} de @code{(gnu services base)} simplifient la création de ces fichiers de règle." #. type: deffn #: doc/guix.texi:10478 #, no-wrap msgid "{Scheme Procedure} udev-rule [@var{file-name} @var{contents}]" -msgstr "" +msgstr "{Procédure Scheme} udev-rule [@var{file-name} @var{contents}]" #. type: deffn #: doc/guix.texi:10481 msgid "Return a udev-rule file named @var{file-name} containing the rules defined by the @var{contents} literal." -msgstr "" +msgstr "Renvoie un fichier de règle udev nommé @var{file-name} contenant les règles définie par le litéral @var{contents}." #. type: deffn #: doc/guix.texi:10485 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 "" +msgstr "Dans l'exemple suivant, on définie une règle pour un périphérique USB qui sera stockée dans le fichier @file{90-usb-thing.rules}. La règle lance un script à la détection du périphérique USB avec l'identifiant de produit donné." #. type: example #: doc/guix.texi:10493 @@ -18537,11 +18656,17 @@ msgid "" " \"ATTR@{product@}==\\\"Example\\\", \"\n" " \"RUN+=\\\"/path/to/script\\\"\")))\n" msgstr "" +"(define %example-udev-rule\n" +" (udev-rule\n" +" \"90-usb-thing.rules\"\n" +" (string-append \"ACTION==\\\"add\\\", SUBSYSTEM==\\\"usb\\\", \"\n" +" \"ATTR@{product@}==\\\"Example\\\", \"\n" +" \"RUN+=\\\"/path/to/script\\\"\")))\n" #. type: deffn #: doc/guix.texi:10497 msgid "Here we show how the default @var{udev-service} can be extended with it." -msgstr "" +msgstr "Ici on montre comment le service @var{udev-service} par défaut peut être étendu avec cette règle." #. type: example #: doc/guix.texi:10507 @@ -18556,22 +18681,30 @@ msgid "" " (rules (append (udev-configuration-rules config)\n" " (list %example-udev-rule))))))))\n" msgstr "" +"(operating-system\n" +" ;; @dots{}\n" +" (services\n" +" (modify-services %desktop-services\n" +" (udev-service-type config =>\n" +" (udev-configuration (inherit config)\n" +" (rules (append (udev-configuration-rules config)\n" +" (list %example-udev-rule))))))))\n" #. type: deffn #: doc/guix.texi:10509 #, no-wrap msgid "{Scheme Procedure} file->udev-rule [@var{file-name} @var{file}]" -msgstr "" +msgstr "{Procédure Scheme} file->udev-rule [@var{file-name} @var{file}]" #. type: deffn #: doc/guix.texi:10512 msgid "Return a udev file named @var{file-name} containing the rules defined within @var{file}, a file-like object." -msgstr "" +msgstr "Renvoie un fichier udev nommé @var{file-name} contenant les règles définies dans @var{file}, un objet simili-fichier." #. type: deffn #: doc/guix.texi:10514 msgid "The following example showcases how we can use an existing rule file." -msgstr "" +msgstr "L'exemple suivant montre comment utiliser un fichier de règles existant." #. type: example #: doc/guix.texi:10519 @@ -18582,6 +18715,10 @@ msgid "" " ;; @dots{})\n" "\n" msgstr "" +"(use-modules (guix download) ;pour url-fetch\n" +" (guix packages) ;pour origin\n" +" ;; @dots{})\n" +"\n" #. type: example #: doc/guix.texi:10530 @@ -18598,16 +18735,26 @@ msgid "" " (sha256\n" " (base32 \"0lmmagpyb6xsq6zcr2w1cyx9qmjqmajkvrdbhjx32gqf1d9is003\"))))))\n" msgstr "" +"(define %android-udev-rules\n" +" (file->udev-rule\n" +" \"51-android-udev.rules\"\n" +" (let ((version \"20170910\"))\n" +" (origin\n" +" (method url-fetch)\n" +" (uri (string-append \"https://raw.githubusercontent.com/M0Rf30/\"\n" +" \"android-udev-rules/\" version \"/51-android.rules\"))\n" +" (sha256\n" +" (base32 \"0lmmagpyb6xsq6zcr2w1cyx9qmjqmajkvrdbhjx32gqf1d9is003\"))))))\n" #. type: deffn #: doc/guix.texi:10539 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 "" +msgstr "En plus, les définitions des paquets de Guix peuvent être inclus dans @var{rules} pour étendre les règles avec les définitions trouvées dans leur sous-répertoire @file{lib/udev/rules.d}. Au lieu de l'exemple @var{file->udev-rule} précédent, on aurait pu utiliser le paquet @var{android-udev-rules} qui existe dans le module @code{(gnu packages android)}." #. type: deffn #: doc/guix.texi:10548 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 "" +msgstr "L'exemple suivant montre comment utiliser le paquet @var{android-udev-rules} pour que l'outil Android @command{adb} puisse détecter les appareils sans privilège root. Il détaille aussi comment créer le grope @code{adbusers}, requis pour le bon fonctionnement des règles définies dans le paquet @var{android-udev-rules}. Pour créer ce groupe, on doit le définir dans les @var{supplementary-groups} de la déclaration @var{user-account} ainsi que dans le champ @var{groups} de l'enregistrement @var{operating-system}." #. type: example #: doc/guix.texi:10553 @@ -18618,6 +18765,10 @@ msgid "" " ;; @dots{})\n" "\n" msgstr "" +"(use-modules (gnu packages android) ;for android-udev-rules\n" +" (gnu system shadow) ;for user-group\n" +" ;; @dots{})\n" +"\n" #. type: example #: doc/guix.texi:10562 @@ -18633,6 +18784,15 @@ msgid "" " ;; @dots{})))\n" "\n" msgstr "" +"(operating-system\n" +" ;; @dots{}\n" +" (users (cons (user-acount\n" +" ;; @dots{}\n" +" (supplementary-groups\n" +" '(\"adbusers\" ;for adb\n" +" \"wheel\" \"netdev\" \"audio\" \"video\"))\n" +" ;; @dots{})))\n" +"\n" #. type: example #: doc/guix.texi:10565 @@ -18642,6 +18802,9 @@ msgid "" " %base-groups))\n" "\n" msgstr "" +" (groups (cons (user-group (system? #t) (name \"adbusers\"))\n" +" %base-groups))\n" +"\n" #. type: example #: doc/guix.texi:10567 @@ -18650,6 +18813,8 @@ msgid "" " ;; @dots{}\n" "\n" msgstr "" +" ;; @dots{}\n" +"\n" #. type: example #: doc/guix.texi:10574 @@ -18662,85 +18827,91 @@ msgid "" " (rules (cons* android-udev-rules\n" " (udev-configuration-rules config))))))))\n" msgstr "" +" (services\n" +" (modify-services %desktop-services\n" +" (udev-service-type config =>\n" +" (udev-configuration (inherit config)\n" +" (rules (cons* android-udev-rules\n" +" (udev-configuration-rules config))))))))\n" #. type: defvr #: doc/guix.texi:10577 #, no-wrap msgid "{Scheme Variable} urandom-seed-service-type" -msgstr "" +msgstr "{Variable Scheme} urandom-seed-service-type" #. type: defvr #: doc/guix.texi:10582 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 "" +msgstr "Garde de l'entropie dans @var{%random-seed-file} pour démarrer @file{/dev/urandom} au redémarrage. Ce service essaye aussi de démarrer @file{/dev/urandom} à partir de @file{/dev/hwrng} au démarrage si @file{/dev/hwrng} existe et peut être lu." #. type: defvr #: doc/guix.texi:10584 #, no-wrap msgid "{Scheme Variable} %random-seed-file" -msgstr "" +msgstr "{Variable Scheme} %random-seed-file" #. type: defvr #: doc/guix.texi:10588 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 "" +msgstr "C'est le nom du fichier où des octets aléatoires sont sauvegardés par @var{urandom-seed-service} pour démarrer @file{/dev/urandom} au redémarrage. Sa valeur par défaut est @file{/var/lib/random-seed}." #. type: cindex #: doc/guix.texi:10590 doc/guix.texi:11930 #, no-wrap msgid "keymap" -msgstr "" +msgstr "disposition clavier" #. type: cindex #: doc/guix.texi:10591 #, no-wrap msgid "keyboard" -msgstr "" +msgstr "clavier" #. type: deffn #: doc/guix.texi:10592 #, no-wrap msgid "{Scheme Procedure} console-keymap-service @var{files} ..." -msgstr "" +msgstr "{Procédure Scheme} console-keymap-service @var{files} ..." #. type: deffn #: doc/guix.texi:10597 msgid "Return a service to load console keymaps from @var{files} using @command{loadkeys} command. Most likely, you want to load some default keymap, which can be done like this:" -msgstr "" +msgstr "Renvoie un service qui charge les dispositions claviers de @var{files} avec la commande @command{loadkeys}. Vraisemblablement, vous voudrez charger une disposition par défaut, ce qui se fait ainsi :" #. type: example #: doc/guix.texi:10600 #, no-wrap msgid "(console-keymap-service \"dvorak\")\n" -msgstr "" +msgstr "(console-keymap-service \"dvorak\")\n" #. type: deffn #: doc/guix.texi:10604 msgid "Or, for example, for a Swedish keyboard, you may need to combine the following keymaps:" -msgstr "" +msgstr "Ou par exemple pour un clavier suédois, vous pourriez avoir besoin de combiner les dispositions suivantes :" #. type: example #: doc/guix.texi:10606 #, no-wrap msgid "(console-keymap-service \"se-lat6\" \"se-fi-lat6\")\n" -msgstr "" +msgstr "(console-keymap-service \"se-lat6\" \"se-fi-lat6\")\n" #. type: deffn #: doc/guix.texi:10610 msgid "Also you can specify a full file name (or file names) of your keymap(s). See @code{man loadkeys} for details." -msgstr "" +msgstr "Vous pouvez aussi spécifier le nom de fichier (ou les noms de fichiers) complets de vos dispositions. Voir @code{man loadkeys} pour des détails." #. type: cindex #: doc/guix.texi:10613 #, no-wrap msgid "mouse" -msgstr "" +msgstr "souris" #. type: cindex #: doc/guix.texi:10614 #, no-wrap msgid "gpm" -msgstr "" +msgstr "gpm" #. type: defvr #: doc/guix.texi:10615 @@ -18751,18 +18922,18 @@ msgstr "{Variable Scheme} gpm-service-type" #. type: defvr #: doc/guix.texi:10620 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 "" +msgstr "C'est le type du service qui lance GPM, le @dfn{démon de souris à but général}, qui fournit le support de la souris sur la console Linux. GPM permet aux utilisateurs d'utiliser la souris dans la console, entre autres pour sélectionner, copier et coller du texte." #. type: defvr #: doc/guix.texi:10623 msgid "The value for services of this type must be a @code{gpm-configuration} (see below). This service is not part of @var{%base-services}." -msgstr "" +msgstr "La valeur pour les services de ce type doit être un @code{gpm-configuration} (voir plus bas). Ce service ne fait pas partie de @var{%base-services}." #. type: deftp #: doc/guix.texi:10625 #, no-wrap msgid "{Data Type} gpm-configuration" -msgstr "{Type de donnée} gpm-configuration" +msgstr "{Type de données} gpm-configuration" #. type: deftp #: doc/guix.texi:10627 @@ -18778,7 +18949,7 @@ msgstr "@code{options} (par défaut : @code{%default-gpm-options})" #. type: table #: doc/guix.texi:10634 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 "" +msgstr "Les options de la ligne de commande à passer à @command{gpm}. L'ensemble des options par défaut dit à @command{gpm} d'écouter les événements de la souris dans @file{/dev/input/mice}. @xref{Command Line,,, gpm, gpm manual}, pour plus d'informations." #. type: item #: doc/guix.texi:10635 @@ -18794,178 +18965,180 @@ msgstr "Le paquet GPM à utiliser." #. type: anchor{#1} #: doc/guix.texi:10642 msgid "guix-publish-service-type" -msgstr "" +msgstr "guix-publish-service-type" #. type: deffn #: doc/guix.texi:10642 #, no-wrap msgid "{Scheme Variable} guix-publish-service-type" -msgstr "" +msgstr "{Variable Scheme} guix-publish-service-type" #. type: deffn #: doc/guix.texi:10646 msgid "This is the service type for @command{guix publish} (@pxref{Invoking guix publish}). Its value must be a @code{guix-configuration} object, as described below." -msgstr "" +msgstr "C'est le type de service pour @command{guix publish} (@pxref{Invoking guix publish}). Sa valeur doit être un objet @code{guix-configuration} décrit plus bas." #. type: deffn #: doc/guix.texi:10650 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 "" +msgstr "Ce service suppose que @file{/etc/guix} contient déjà une paire de clefs créée par @command{guix archive --generate-key} (@pxref{Invoking guix archive}). Si ce n'est pas le cas, le service ne démarrera pas." #. type: deftp #: doc/guix.texi:10652 #, no-wrap msgid "{Data Type} guix-publish-configuration" -msgstr "" +msgstr "{Type de données} guix-publish-configuration" #. type: deftp #: doc/guix.texi:10655 msgid "Data type representing the configuration of the @code{guix publish} service." -msgstr "" +msgstr "Le type de données représentant la configuration du service @code{guix publish}." #. type: item #: doc/guix.texi:10657 #, no-wrap msgid "@code{guix} (default: @code{guix})" -msgstr "" +msgstr "@code{guix} (par défaut : @code{guix})" #. type: item #: doc/guix.texi:10660 #, no-wrap msgid "@code{port} (default: @code{80})" -msgstr "" +msgstr "@code{port} (par défaut : @code{80})" #. type: table #: doc/guix.texi:10662 msgid "The TCP port to listen for connections." -msgstr "" +msgstr "Le port TCP sur lequel écouter les connexions." #. type: item #: doc/guix.texi:10663 #, no-wrap msgid "@code{host} (default: @code{\"localhost\"})" -msgstr "" +msgstr "@code{host} (par défaut : @code{\"localhost\"})" #. type: table #: doc/guix.texi:10666 msgid "The host (and thus, network interface) to listen to. Use @code{\"0.0.0.0\"} to listen on all the network interfaces." -msgstr "" +msgstr "L'hôte (et donc, l'interface réseau) sur lequel écouter. Utilisez @code{\"0.0.0.0\"} pour écouter sur toutes les interfaces réseaux." #. type: table #: doc/guix.texi:10671 msgid "The gzip compression level at which substitutes are compressed. Use @code{0} to disable compression altogether, and @code{9} to get the best compression ratio at the expense of increased CPU usage." -msgstr "" +msgstr "Le niveau de compression gzip auquel les substituts sont compressés. Utilisez @code{0} pour désactiver complètement la compression, et @code{9} pour avoir le meilleur taux de compression contre une plus grande utilisation du CPU." #. type: item #: doc/guix.texi:10672 #, no-wrap msgid "@code{nar-path} (default: @code{\"nar\"})" -msgstr "" +msgstr "@code{nar-path} (par défaut : @code{\"nar\"})" #. type: table #: doc/guix.texi:10675 msgid "The URL path at which ``nars'' can be fetched. @xref{Invoking guix publish, @code{--nar-path}}, for details." -msgstr "" +msgstr "Le chemin d'URL où les « nars » se trouvent. @xref{Invoking guix publish, @code{--nar-path}}, pour des détails." #. type: item #: doc/guix.texi:10676 #, no-wrap msgid "@code{cache} (default: @code{#f})" -msgstr "" +msgstr "@code{cache} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10682 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 "" +msgstr "Lorsque la valeur est @code{#f}, désactive le cache et génère les archives à la demande. Sinon, cela devrait être le nom d'un répertoire — p.@: ex.@: @code{\"/var/cache/guix/publish\"} — où @command{guix publish} gère le cache des archives et des métadonnées prêtes à être envoyées. @xref{Invoking guix publish, @option{--cache}}, pour plus d'informations sur les compromis impliqués." #. type: item #: doc/guix.texi:10683 #, no-wrap msgid "@code{workers} (default: @code{#f})" -msgstr "" +msgstr "@code{workers} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10687 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 "" +msgstr "Lorsque la valeur est un entier, c'est le nombre de threads de travail utilisés pour le cache ; lorsque la valeur est @code{#f}, le nombre de processeurs est utilisé. @xref{Invoking guix publish, @option{--workers}}, pour plus d'informations." #. type: item #: doc/guix.texi:10688 #, no-wrap msgid "@code{ttl} (default: @code{#f})" -msgstr "" +msgstr "@code{ttl} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10692 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 "" +msgstr "Lorsque la valeur est un entier, il dénote la @dfn{durée de vie} en secondes des archives publiées. @xref{Invoking guix publish, @option{--ttl}}, pour plus d'informations." #. type: anchor{#1} #: doc/guix.texi:10696 msgid "rngd-service" -msgstr "" +msgstr "rngd-service" #. type: deffn #: doc/guix.texi:10696 #, no-wrap msgid "{Scheme Procedure} rngd-service [#:rng-tools @var{rng-tools}] @" -msgstr "" +msgstr "{Procédure Scheme} rngd-service [#:rng-tools @var{rng-tools}] @" #. type: deffn #: doc/guix.texi:10701 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 "" +"[#:device \"/dev/hwrng\"]\n" +"Renvoie un service qui lance le programme @command{rngd} de @var{rng-tools} pour ajouter @var{device} à la réserve d'entropie du noyau. Le service échouera si @var{device} n'existe pas." #. type: anchor{#1} #: doc/guix.texi:10704 msgid "pam-limits-service" -msgstr "" +msgstr "pam-limits-service" #. type: cindex #: doc/guix.texi:10704 #, no-wrap msgid "session limits" -msgstr "" +msgstr "limites de session" #. type: cindex #: doc/guix.texi:10705 #, no-wrap msgid "ulimit" -msgstr "" +msgstr "ulimit" #. type: cindex #: doc/guix.texi:10706 #, no-wrap msgid "priority" -msgstr "" +msgstr "priorités" #. type: cindex #: doc/guix.texi:10707 #, no-wrap msgid "realtime" -msgstr "" +msgstr "temps réel" #. type: cindex #: doc/guix.texi:10708 #, no-wrap msgid "jackd" -msgstr "" +msgstr "jackd" #. type: deffn #: doc/guix.texi:10709 #, no-wrap msgid "{Scheme Procedure} pam-limits-service [#:limits @code{'()}]" -msgstr "" +msgstr "{Procédure Scheme} pam-limits-service [#:limits @code{'()}]" #. type: deffn #: doc/guix.texi:10716 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 "" +msgstr "Renvoie un service qui installe un fichier de configuration pour le @uref{http://linux-pam.org/Linux-PAM-html/sag-pam_limits.html, module @code{pam_limits}}. La procédure prend éventuellement une liste de valeurs @code{pam-limits-entry} qui peuvent être utilisées pour spécifier les limites @code{ulimit} et les priorités des sessions utilisateurs." #. type: deffn #: doc/guix.texi:10719 msgid "The following limits definition sets two hard and soft limits for all login sessions of users in the @code{realtime} group:" -msgstr "" +msgstr "La définition de limites suivante défini deux limites matérielles et logicielles pour toutes les sessions connectées des utilisateurs du groupe @code{realtime} :" #. type: example #: doc/guix.texi:10725 @@ -18976,39 +19149,43 @@ msgid "" " (pam-limits-entry \"@@realtime\" 'both 'rtprio 99)\n" " (pam-limits-entry \"@@realtime\" 'both 'memlock 'unlimited)))\n" msgstr "" +"(pam-limits-service\n" +" (list\n" +" (pam-limits-entry \"@@realtime\" 'both 'rtprio 99)\n" +" (pam-limits-entry \"@@realtime\" 'both 'memlock 'unlimited)))\n" #. type: deffn #: doc/guix.texi:10731 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 "" +msgstr "La première entrée augment la priorité en temps réel maximale des processus non privilégiés ; la deuxième entrée abandonne les restrictions sur l'espace d'adressage maximal qui peut être verrouillé en mémoire. Ces paramètres sont souvent utilisés sur les systèmes audio temps-réel." #. type: cindex #: doc/guix.texi:10736 #, no-wrap msgid "cron" -msgstr "" +msgstr "cron" #. type: cindex #: doc/guix.texi:10737 #, no-wrap msgid "mcron" -msgstr "" +msgstr "mcron" #. type: cindex #: doc/guix.texi:10738 #, no-wrap msgid "scheduling jobs" -msgstr "" +msgstr "tâches planifiées" #. type: Plain text #: doc/guix.texi:10745 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 "" +msgstr "Le module @code{(gnu services mcron)} fournit une interface pour GNU@tie{}mcron, un démon qui lance des tâches planifiées (@pxref{Top,,, mcron, GNU@tie{}mcron}). GNU@tie{}mcron est similaire au démon Unix traditionel @command{cron} ; la principale différence est qu'il est implémenté en Guile Scheme, qui fournit beaucoup de flexibilité lors de la spécification de la planification des tâches et de leurs actions." #. type: Plain text #: doc/guix.texi:10753 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 "" +msgstr "L'exemple en dessous définit un système d'exploitation qu lance les commandes @command{updatebd} (@pxref{Invoking updatedb,,, find, Finding Files}) et @command{guix gc} (@pxref{Invoking guix gc}) tous les jours, ainsi que la commande @command{mkid} en tant qu'utilisateur non privilégié (@pxref{mkid invocation,,, idutils, ID Database Utilities}). Il utilise des gexps pour introduire des définitions de tâches qui sont passées à mcron (@pxref{G-Expressions})." #. type: lisp #: doc/guix.texi:10757 @@ -19018,6 +19195,9 @@ msgid "" "(use-package-modules base idutils)\n" "\n" msgstr "" +"(use-modules (guix) (gnu) (gnu services mcron))\n" +"(use-package-modules base idutils)\n" +"\n" #. type: lisp #: doc/guix.texi:10766 @@ -19033,6 +19213,15 @@ msgid "" " \"--prunepaths=/tmp /var/tmp /gnu/store\"))))\n" "\n" msgstr "" +"(define updatedb-job\n" +" ;; Lance « updatedb » à 3h du matin chaque jour. Ici nous spécifions\n" +" ;; l'action de la tâche comme une procédure Scheme.\n" +" #~(job '(next-hour '(3))\n" +" (lambda ()\n" +" (execl (string-append #$findutils \"/bin/updatedb\")\n" +" \"updatedb\"\n" +" \"--prunepaths=/tmp /var/tmp /gnu/store\"))))\n" +"\n" #. type: lisp #: doc/guix.texi:10772 @@ -19045,6 +19234,12 @@ msgid "" " \"guix gc -F 1G\"))\n" "\n" msgstr "" +"(define garbage-collector-job\n" +" ;; Lance le ramasse-miettes tous les jours à minuit cinq.\n" +" ;; L'action de la tâche est une commande shell.\n" +" #~(job \"5 0 * * *\" ;Vixie cron syntax\n" +" \"guix gc -F 1G\"))\n" +"\n" #. type: lisp #: doc/guix.texi:10779 @@ -19058,6 +19253,13 @@ msgid "" " #:user \"charlie\"))\n" "\n" msgstr "" +"(define idutils-job\n" +" ;; Met à jour la base de données d'index en tant que « charlie » à 12h15\n" +" ;; et 19h15. La commande est lancée depuis le répertoire personnel de l'utilisateur.\n" +" #~(job '(next-minute-from (next-hour '(12 19)) '(15))\n" +" (string-append #$idutils \"/bin/mkid src\")\n" +" #:user \"charlie\"))\n" +"\n" #. type: lisp #: doc/guix.texi:10786 @@ -19070,27 +19272,33 @@ msgid "" " idutils-job))\n" " %base-services)))\n" msgstr "" +"(operating-system\n" +" ;; @dots{}\n" +" (services (cons (mcron-service (list garbage-collector-job\n" +" updatedb-job\n" +" idutils-job))\n" +" %base-services)))\n" #. type: Plain text #: doc/guix.texi:10791 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 "" +msgstr "@xref{Guile Syntax, mcron job specifications,, mcron, GNU@tie{}mcron}, pour plus d'informations sur les spécifications des tâche de mcron. Ci-dessous est la référence du service mcron." #. type: deffn #: doc/guix.texi:10792 #, no-wrap msgid "{Scheme Procedure} mcron-service @var{jobs} [#:mcron @var{mcron}]" -msgstr "" +msgstr "{Procédure Scheme} mcron-service @var{jobs} [#:mcron @var{mcron}]" #. type: deffn #: doc/guix.texi:10795 msgid "Return an mcron service running @var{mcron} that schedules @var{jobs}, a list of gexps denoting mcron job specifications." -msgstr "" +msgstr "Renvoie un service mcron qui lance @var{mcron} qui planifie les tâches @var{jobs}, une liste de gexps qui dénotent des spécifications de tâches de mcron." #. type: deffn #: doc/guix.texi:10797 msgid "This is a shorthand for:" -msgstr "" +msgstr "C'est un raccourci pour :" #. type: example #: doc/guix.texi:10800 @@ -19099,77 +19307,79 @@ msgid "" "(service mcron-service-type\n" " (mcron-configuration (mcron mcron) (jobs jobs)))\n" msgstr "" +"(service mcron-service-type\n" +" (mcron-configuration (mcron mcron) (jobs jobs)))\n" #. type: defvr #: doc/guix.texi:10803 #, no-wrap msgid "{Scheme Variable} mcron-service-type" -msgstr "" +msgstr "{Variable Scheme} mcron-service-type" #. type: defvr #: doc/guix.texi:10806 msgid "This is the type of the @code{mcron} service, whose value is an @code{mcron-configuration} object." -msgstr "" +msgstr "C'est le type du service @code{mcron}, dont la valeur est un objet @code{mcron-configuration}" #. type: defvr #: doc/guix.texi:10811 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 "" +msgstr "Ce type de service peut être la cible d'une extension de service qui lui fournit des spécifications de tâches supplémentaires (@pxref{Service Composition}). En d'autres termes, il est possible de définir des services qui fournissent des tâches mcron à lancer." #. type: deftp #: doc/guix.texi:10813 #, no-wrap msgid "{Data Type} mcron-configuration" -msgstr "" +msgstr "{Type de données} mcron-configuration" #. type: deftp #: doc/guix.texi:10815 msgid "Data type representing the configuration of mcron." -msgstr "" +msgstr "Type données qui représente la configuration de mcron." #. type: item #: doc/guix.texi:10817 #, no-wrap msgid "@code{mcron} (default: @var{mcron})" -msgstr "" +msgstr "@code{mcron} (par défaut : @var{mcron})" #. type: table #: doc/guix.texi:10819 msgid "The mcron package to use." -msgstr "" +msgstr "Le paquet mcron à utiliser." #. type: code{#1} #: doc/guix.texi:10820 doc/guix.texi:10879 #, no-wrap msgid "jobs" -msgstr "" +msgstr "jobs" #. type: table #: doc/guix.texi:10824 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 "" +msgstr "C'est la liste des gexps (@pxref{G-Expressions}), où chaque gexp correspond à une spécification de tâche de mcron (@pxref{Syntax, mcron job specifications,, mcron, GNU@tie{}mcron})." #. type: cindex #: doc/guix.texi:10831 #, no-wrap msgid "rottlog" -msgstr "" +msgstr "rottlog" #. type: cindex #: doc/guix.texi:10832 #, no-wrap msgid "log rotation" -msgstr "" +msgstr "journaux, rotation" #. type: Plain text #: doc/guix.texi:10839 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 "" +msgstr "Les fichiers journaux comme ceux qui se trouvent dans @file{/var/log} ont tendance à grandir sans fin, donc c'est une bonne idée de le @dfn{faire tourner} de temps à autres — c.-à-d.@: archiver leur contenu dans des fichiers séparés, potentiellement compressés. Le module @code{(gnu services admin)} fournit une interface pour GNU@tie{}Rot[t]log, un outil de rotation de journaux (@pxref{Top,,, rottlog, GNU Rot[t]log Manual})." #. type: Plain text #: doc/guix.texi:10842 msgid "The example below defines an operating system that provides log rotation with the default settings, for commonly encountered log files." -msgstr "" +msgstr "L'exemple ci-dessous définit un système d'exploitation qui fournit la rotation des journaux avec les paramètres par défaut, pour les journaux les plus courants." #. type: lisp #: doc/guix.texi:10847 @@ -19180,6 +19390,10 @@ msgid "" "(use-package-modules base idutils)\n" "\n" msgstr "" +"(use-modules (guix) (gnu))\n" +"(use-service-modules admin mcron)\n" +"(use-package-modules base idutils)\n" +"\n" #. type: lisp #: doc/guix.texi:10852 @@ -19190,92 +19404,96 @@ msgid "" " (services (cons (service rottlog-service-type)\n" " %base-services)))\n" msgstr "" +"(operating-system\n" +" ;; @dots{}\n" +" (services (cons (service rottlog-service-type)\n" +" %base-services)))\n" #. type: defvr #: doc/guix.texi:10854 #, no-wrap msgid "{Scheme Variable} rottlog-service-type" -msgstr "" +msgstr "{Variable Scheme} rottlog-service-type" #. type: defvr #: doc/guix.texi:10857 msgid "This is the type of the Rottlog service, whose value is a @code{rottlog-configuration} object." -msgstr "" +msgstr "C'est le type du service Rotlog, dont la valeur est un objet @code{rottlog-configuration}." #. type: defvr #: doc/guix.texi:10860 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 "" +msgstr "D'autres services peuvent étendre celui-ci avec de nouveaux objets @code{log-rotation} (voir plus bas), en augmentant ainsi l'ensemble des fichiers à faire tourner." #. type: defvr #: doc/guix.texi:10863 msgid "This service type can define mcron jobs (@pxref{Scheduled Job Execution}) to run the rottlog service." -msgstr "" +msgstr "Ce type de service peut définir des taches (@pxref{Scheduled Job Execution}) pour lancer le service rottlog." #. type: deftp #: doc/guix.texi:10865 #, no-wrap msgid "{Data Type} rottlog-configuration" -msgstr "" +msgstr "{Type de données} rottlog-configuration" #. type: deftp #: doc/guix.texi:10867 msgid "Data type representing the configuration of rottlog." -msgstr "" +msgstr "Type de données représentant la configuration de rottlog." #. type: item #: doc/guix.texi:10869 #, no-wrap msgid "@code{rottlog} (default: @code{rottlog})" -msgstr "" +msgstr "@code{rottlog} (par défaut : @code{rottlog})" #. type: table #: doc/guix.texi:10871 msgid "The Rottlog package to use." -msgstr "" +msgstr "Le paquet Rottlog à utiliser." #. type: item #: doc/guix.texi:10872 #, no-wrap msgid "@code{rc-file} (default: @code{(file-append rottlog \"/etc/rc\")})" -msgstr "" +msgstr "@code{rc-file} (par défaut : @code{(file-append rottlog \"/etc/rc\")})" #. type: table #: doc/guix.texi:10875 msgid "The Rottlog configuration file to use (@pxref{Mandatory RC Variables,,, rottlog, GNU Rot[t]log Manual})." -msgstr "" +msgstr "Le fichier de configuration Rottlog à utiliser (@pxref{Mandatory RC Variables,,, rottlog, GNU Rot[t]log Manual})." #. type: item #: doc/guix.texi:10876 #, no-wrap msgid "@code{rotations} (default: @code{%default-rotations})" -msgstr "" +msgstr "@code{rotations} (par défaut : @code{%default-rotations})" #. type: table #: doc/guix.texi:10878 msgid "A list of @code{log-rotation} objects as defined below." -msgstr "" +msgstr "Une liste d'objets @code{log-rotation} définis plus bas." #. type: table #: doc/guix.texi:10882 msgid "This is a list of gexps where each gexp corresponds to an mcron job specification (@pxref{Scheduled Job Execution})." -msgstr "" +msgstr "C'est une liste de gexps où chaque gexp correspond à une spécification de tache de mcron (@pxref{Scheduled Job Execution})." #. type: deftp #: doc/guix.texi:10885 #, no-wrap msgid "{Data Type} log-rotation" -msgstr "" +msgstr "{Type de données} log-rotation" #. type: deftp #: doc/guix.texi:10887 msgid "Data type representing the rotation of a group of log files." -msgstr "" +msgstr "Type de données représentant la rotation d'un groupe de fichiers journaux." #. type: deftp #: doc/guix.texi:10891 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 "" +msgstr "En reprenant un exemple du manuel de Rottlog (@pxref{Period Related File Examples,,, rottlog, GNU Rot[t]log Manual}), on peut définir la rotation d'un journal de cette manière :" #. type: example #: doc/guix.texi:10900 @@ -19289,110 +19507,117 @@ msgid "" " \"notifempty\"\n" " \"nocompress\")))\n" msgstr "" +"(log-rotation\n" +" (frequency 'daily)\n" +" (files '(\"/var/log/apache/*\"))\n" +" (options '(\"storedir apache-archives\"\n" +" \"rotate 6\"\n" +" \"notifempty\"\n" +" \"nocompress\")))\n" #. type: deftp #: doc/guix.texi:10903 msgid "The list of fields is as follows:" -msgstr "" +msgstr "La liste des champs est la suivante :" #. type: item #: doc/guix.texi:10905 #, no-wrap msgid "@code{frequency} (default: @code{'weekly})" -msgstr "" +msgstr "@code{frequency} (par défaut : @code{'weekly})" #. type: table #: doc/guix.texi:10907 msgid "The log rotation frequency, a symbol." -msgstr "" +msgstr "La fréquence de rotation, un symbole." #. type: code{#1} #: doc/guix.texi:10908 #, no-wrap msgid "files" -msgstr "" +msgstr "files" #. type: table #: doc/guix.texi:10910 msgid "The list of files or file glob patterns to rotate." -msgstr "" +msgstr "La liste des fichiers ou des motifs de noms de fichiers à faire tourner." #. type: item #: doc/guix.texi:10911 #, no-wrap msgid "@code{options} (default: @code{'()})" -msgstr "" +msgstr "@code{options} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:10914 msgid "The list of rottlog options for this rotation (@pxref{Configuration parameters,,, rottlog, GNU Rot[t]lg Manual})." -msgstr "" +msgstr "La liste des options de rottlog pour cette rotation (@pxref{Configuration parameters,,, rottlog, GNU Rot[t]lg Manual})." #. type: item #: doc/guix.texi:10915 #, no-wrap msgid "@code{post-rotate} (default: @code{#f})" -msgstr "" +msgstr "@code{post-rotate} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10917 msgid "Either @code{#f} or a gexp to execute once the rotation has completed." -msgstr "" +msgstr "Soit @code{#f}, soit une gexp à exécuter une fois la rotation terminée." #. type: defvr #: doc/guix.texi:10920 #, no-wrap msgid "{Scheme Variable} %default-rotations" -msgstr "" +msgstr "{Variable Scheme} %default-rotations" #. type: defvr #: doc/guix.texi:10923 msgid "Specifies weekly rotation of @var{%rotated-files} and a couple of other files." -msgstr "" +msgstr "Spécifie la rotation hebdomadaire de @var{%rotated-files} et de quelques autres fichiers." #. type: defvr #: doc/guix.texi:10925 #, no-wrap msgid "{Scheme Variable} %rotated-files" -msgstr "" +msgstr "{Variable Scheme} %rotated-files" #. type: defvr #: doc/guix.texi:10928 msgid "The list of syslog-controlled files to be rotated. By default it is: @code{'(\"/var/log/messages\" \"/var/log/secure\")}." -msgstr "" +msgstr "La liste des fichiers contrôlés par syslog à faire tourner. Par défaut il s'agit de : @code{'(\"/var/log/messages\" \"/var/log/secure\")}" #. type: Plain text #: doc/guix.texi:10935 msgid "The @code{(gnu services networking)} module provides services to configure the network interface." -msgstr "" +msgstr "Le module @code{(gnu services networking)} fournit des services pour configurer les interfaces réseaux." #. type: cindex #: doc/guix.texi:10936 #, no-wrap msgid "DHCP, networking service" -msgstr "" +msgstr "DHCP, service réseau" #. type: deffn #: doc/guix.texi:10937 #, no-wrap msgid "{Scheme Procedure} dhcp-client-service [#:dhcp @var{isc-dhcp}]" -msgstr "" +msgstr "{Procédure Scheme} dhcp-client-service [#:dhcp @var{isc-dhcp}]" #. type: deffn #: doc/guix.texi:10940 msgid "Return a service that runs @var{dhcp}, a Dynamic Host Configuration Protocol (DHCP) client, on all the non-loopback network interfaces." -msgstr "" +msgstr "Renvoie un service qui lance @var{dhcp}, un client DHCP (Dynamic Host Configuration Protocol) sur toutes les interfaces réseaux en dehors de la boucle locale." #. type: deffn #: doc/guix.texi:10942 #, no-wrap msgid "{Scheme Procedure} dhcpd-service-type" -msgstr "" +msgstr "{Procédure Scheme} dhcpd-service-type" #. type: deffn #: doc/guix.texi:10946 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 "" +msgstr "Ce type définie un service qui lance un démon DHCP. Pour créer un service de ce type, vous devez appliquer un objet @code{}. Par exemple :" #. type: example #: doc/guix.texi:10952 @@ -19403,139 +19628,145 @@ msgid "" " (config-file (local-file \"my-dhcpd.conf\"))\n" " (interfaces '(\"enp0s25\"))))\n" msgstr "" +"(service dhcpd-service-type\n" +" (dhcpd-configuration\n" +" (config-file (local-file \"my-dhcpd.conf\"))\n" +" (interfaces '(\"enp0s25\"))))\n" #. type: deftp #: doc/guix.texi:10955 #, no-wrap msgid "{Data Type} dhcpd-configuration" -msgstr "" +msgstr "{Type de données} dhcpd-configuration" #. type: item #: doc/guix.texi:10957 #, no-wrap msgid "@code{package} (default: @code{isc-dhcp})" -msgstr "" +msgstr "@code{package} (par défaut : @code{isc-dhcp})" #. type: table #: doc/guix.texi:10962 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{http://www.isc.org/products/DHCP, ISC's DHCP server}." -msgstr "" +msgstr "Le paquet qui fournit le démon DHCP. ce paquet doit fournir le démon @file{sbin/dhcpd} relativement à son répertoire de sortie. Le paquet par défaut est le @uref{http://www.isc.org/products/DHCP, serveur DHCP d'ISC}" #. type: item #: doc/guix.texi:10962 doc/guix.texi:14707 #, no-wrap msgid "@code{config-file} (default: @code{#f})" -msgstr "" +msgstr "@code{config-file} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:10967 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 "" +msgstr "Le fichier de configuration à utiliser. Il est requis. Il sera passé à @code{dhcpd} via son option @code{-cf}. La valeur peut être n'importe quel objet « simili-fichier » (@pxref{G-Expressions, file-like objects}). Voir @code{man dhcpd.conf} pour des détails sur la syntaxe du fichier de configuration." #. type: item #: doc/guix.texi:10967 #, no-wrap msgid "@code{version} (default: @code{\"4\"})" -msgstr "" +msgstr "@code{version} (par défaut : @code{\"4\"})" #. type: table #: doc/guix.texi:10972 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 "" +msgstr "La version de DHCP à utiliser. Le serveur DHCP d'ISC supporte les valeur « 4 », « 6 » et « 4o6 ». Elles correspondent aux options @code{-4}, @code{-6} et @code{-4o6} du programme @code{dhcpd}. Voir @code{man dhcpd} pour plus de détails." #. type: item #: doc/guix.texi:10972 #, no-wrap msgid "@code{run-directory} (default: @code{\"/run/dhcpd\"})" -msgstr "" +msgstr "@code{run-directory} (par défaut : @code{\"/run/dhcpd\"})" #. type: table #: doc/guix.texi:10975 msgid "The run directory to use. At service activation time, this directory will be created if it does not exist." -msgstr "" +msgstr "Le répertoire d'exécution à utiliser. Au moment de l'activation du service, ce répertoire sera créé s'il n'existe pas." #. type: item #: doc/guix.texi:10975 #, no-wrap msgid "@code{pid-file} (default: @code{\"/run/dhcpd/dhcpd.pid\"})" -msgstr "" +msgstr "@code{pid-file} (par défaut : @code{\"/run/dhcpd/dhcpd.pid\"})" #. type: table #: doc/guix.texi:10978 msgid "The PID file to use. This corresponds to the @code{-pf} option of @code{dhcpd}. See @code{man dhcpd} for details." -msgstr "" +msgstr "Le fichier de PID à utiliser. Cela correspond à l'option @code{-pf} de @code{dhcpd}. Voir @code{man dhcpd} pour plus de détails." #. type: item #: doc/guix.texi:10978 #, no-wrap msgid "@code{interfaces} (default: @code{'()})" -msgstr "" +msgstr "@code{interfaces} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:10984 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 "" +msgstr "Les noms des interfaces réseaux sur lesquelles dhcpd écoute. Si cette liste n'est pas vide, alors ses éléments (qui doivent être des chaînes de caractères) seront ajoutés à l'invocation de @code{dhcpd} lors du démarrage du démon. Il n'est pas forcément nécessaire de spécifier des interfaces ici ; voir @code{man dhcpd} pour plus de détails." #. type: defvr #: doc/guix.texi:10987 #, no-wrap msgid "{Scheme Variable} static-networking-service-type" -msgstr "" +msgstr "{Variable Scheme} static-networking-service-type" #. type: defvr #: doc/guix.texi:10990 msgid "This is the type for statically-configured network interfaces." -msgstr "" +msgstr "C'est le type des interfaces réseaux configurés statiquement." #. type: deffn #: doc/guix.texi:10992 #, no-wrap msgid "{Scheme Procedure} static-networking-service @var{interface} @var{ip} @" -msgstr "" +msgstr "{Procédure Scheme} static-networking-service @var{interface} @var{ip} @" #. type: deffn #: doc/guix.texi:11000 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 "" +"[#:netmask #f] [#:gateway #f] [#:name-servers @code{'()}] [#:requirement @code{'(udev)}]\n" +"Renvoie un service qui démarre @var{interface} avec l'adresse @var{ip}. Si @var{netmask} est vrai, il sera utilisé comme masque de sous-réseau. Si @var{gateway} est vrai, ce doit être une chaîne de caractères qui spécifie la passerelle par défaut du réseau. @var{requirement} peut être utilisé pour déclarer une dépendance sur un autre service avant de configurer l'interface." #. type: deffn #: doc/guix.texi:11005 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 "" +msgstr "On peut appeler cette procédure plusieurs fois, une fois par interface réseau qui nous intéresse. Dans les coulisses, elle étend @code{static-networking-service-type} avec les interfaces réseaux supplémentaires à gérer." #. type: cindex #: doc/guix.texi:11007 #, no-wrap msgid "wicd" -msgstr "" +msgstr "wicd" #. type: cindex #: doc/guix.texi:11010 #, no-wrap msgid "network management" -msgstr "" +msgstr "gestion du réseau" #. type: deffn #: doc/guix.texi:11011 #, no-wrap msgid "{Scheme Procedure} wicd-service [#:wicd @var{wicd}]" -msgstr "" +msgstr "{Procédure Scheme} wicd-service [#:wicd @var{wicd}]" #. type: deffn #: doc/guix.texi:11014 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 "" +msgstr "Renvoie un service qui lance @url{https://launchpad.net/wicd,Wicd}, un démon de gestion réseau qui cherche à simplifier la configuration des résaux filaires et sans fil." #. type: deffn #: doc/guix.texi:11019 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 "" +msgstr "Ce service ajoute le paquet @var{wicd} au profil global, pour fournir des commandes pour interagir avec le démon et configurer le réseau : @command{wicd-client}, une interface graphique et les interfaces utilisateurs @command{wicd-cli} et @command{wicd-curses}." #. type: cindex #: doc/guix.texi:11021 #, no-wrap msgid "ModemManager" -msgstr "" +msgstr "ModemManager" #. type: defvr #: doc/guix.texi:11023 @@ -19546,18 +19777,18 @@ msgstr "{Variable Scheme} modem-manager-service-type" #. type: defvr #: doc/guix.texi:11028 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 "" +msgstr "C'est le type de service pour le service @uref{https://wiki.gnome.org/Projects/ModemManager, ModemManager}. La valeur de ce type de service est un enregistrement @code{modem-manager-configuration}." #. type: defvr #: doc/guix.texi:11031 doc/guix.texi:11053 msgid "This service is part of @code{%desktop-services} (@pxref{Desktop Services})." -msgstr "" +msgstr "Ce service fait partie de @code{%desktop-services} (@pxref{Desktop Services})." #. type: deftp #: doc/guix.texi:11033 #, no-wrap msgid "{Data Type} modem-manager-configuration" -msgstr "{Type de donnée} modem-manager-configuration" +msgstr "{Type de données} modem-manager-configuration" #. type: deftp #: doc/guix.texi:11035 @@ -19579,117 +19810,117 @@ msgstr "Le paquet ModemManager à utiliser." #: doc/guix.texi:11043 #, no-wrap msgid "NetworkManager" -msgstr "" +msgstr "NetworkManager" #. type: defvr #: doc/guix.texi:11045 #, no-wrap msgid "{Scheme Variable} network-manager-service-type" -msgstr "" +msgstr "{Variable Scheme} network-manager-service-type" #. type: defvr #: doc/guix.texi:11050 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 "" +msgstr "C'est le type de service pour le service @uref{https://wiki.gnome.org/Projects/NetworkManager, NetworkManager}. La valeur pour ce type de service est un enregistrement @code{network-manager-configuration}." #. type: deftp #: doc/guix.texi:11055 #, no-wrap msgid "{Data Type} network-manager-configuration" -msgstr "" +msgstr "{Type de données} network-manager-configuration" #. type: deftp #: doc/guix.texi:11057 msgid "Data type representing the configuration of NetworkManager." -msgstr "" +msgstr "Type de données représentant la configuration de NetworkManager." #. type: item #: doc/guix.texi:11059 #, no-wrap msgid "@code{network-manager} (default: @code{network-manager})" -msgstr "" +msgstr "@code{network-manager} (par défaut : @code{network-manager})" #. type: table #: doc/guix.texi:11061 msgid "The NetworkManager package to use." -msgstr "" +msgstr "Le paquet NetworkManager à utiliser." #. type: item #: doc/guix.texi:11062 #, no-wrap msgid "@code{dns} (default: @code{\"default\"})" -msgstr "" +msgstr "@code{dns} (par défaut : @code{\"default\"})" #. type: table #: doc/guix.texi:11065 msgid "Processing mode for DNS, which affects how NetworkManager uses the @code{resolv.conf} configuration file." -msgstr "" +msgstr "Mode de gestion pour le DNS, qui affecte la manière dont NetworkManager utilise le fichier de configuration @code{resolv.conf}" #. type: item #: doc/guix.texi:11067 #, no-wrap msgid "default" -msgstr "" +msgstr "default" #. type: table #: doc/guix.texi:11070 msgid "NetworkManager will update @code{resolv.conf} to reflect the nameservers provided by currently active connections." -msgstr "" +msgstr "NetworkManager mettra à jour @code{resolv.conf} pour refléter les serveurs de noms fournis par les connexions actives." #. type: item #: doc/guix.texi:11071 #, no-wrap msgid "dnsmasq" -msgstr "" +msgstr "dnsmasq" #. type: table #: doc/guix.texi:11075 msgid "NetworkManager will run @code{dnsmasq} as a local caching nameserver, using a \"split DNS\" configuration if you are connected to a VPN, and then update @code{resolv.conf} to point to the local nameserver." -msgstr "" +msgstr "NetworkManager lancera @code{dnsmasq} en tant que serveur de cache local, en utilisant une configuration « DNS disjointe » si vous êtes connecté par un VPN puis mettra à jour @code{resolv.conf} pour pointer vers le serveur de nom local." #. type: item #: doc/guix.texi:11076 doc/guix.texi:12100 #, no-wrap msgid "none" -msgstr "" +msgstr "none" #. type: table #: doc/guix.texi:11078 msgid "NetworkManager will not modify @code{resolv.conf}." -msgstr "" +msgstr "NetworkManager ne modifiera pas @code{resolv.conf}." #. type: item #: doc/guix.texi:11080 #, no-wrap msgid "@code{vpn-plugins} (default: @code{'()})" -msgstr "" +msgstr "@code{vpn-plugins} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:11084 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 "" +msgstr "C'est la liste des greffons disponibles pour les VPN (réseaux privés virtuels). Un exemple est le paquet @code{network-manager-openvpn}, qui permet à NetworkManager de gérer des VPN via OpenVPN." #. type: cindex #: doc/guix.texi:11088 #, no-wrap msgid "Connman" -msgstr "" +msgstr "Connman" #. type: deffn #: doc/guix.texi:11089 #, no-wrap msgid "{Scheme Variable} connman-service-type" -msgstr "" +msgstr "{Variable Scheme} connman-service-type" #. type: deffn #: doc/guix.texi:11092 msgid "This is the service type to run @url{https://01.org/connman,Connman}, a network connection manager." -msgstr "" +msgstr "C'est le type de service pour lancer @url{https://01.org/connman,Connman}, un gestionnaire de connexions réseaux." #. type: deffn #: doc/guix.texi:11095 msgid "Its value must be an @code{connman-configuration} record as in this example:" -msgstr "" +msgstr "Sa valeur doit être un enregistrement @code{connman-configuration} comme dans cet exemple :" #. type: example #: doc/guix.texi:11100 @@ -19699,66 +19930,69 @@ msgid "" " (connman-configuration\n" " (disable-vpn? #t)))\n" msgstr "" +"(service connman-service-type\n" +" (connman-configuration\n" +" (disable-vpn? #t)))\n" #. type: deffn #: doc/guix.texi:11103 msgid "See below for details about @code{connman-configuration}." -msgstr "" +msgstr "Voir plus bas pour des détails sur @code{connman-configuration}." #. type: deftp #: doc/guix.texi:11105 #, no-wrap msgid "{Data Type} connman-configuration" -msgstr "" +msgstr "{Type de données} connman-configuration" #. type: deftp #: doc/guix.texi:11107 msgid "Data Type representing the configuration of connman." -msgstr "" +msgstr "Type de données représentant la configuration de connman." #. type: item #: doc/guix.texi:11109 #, no-wrap msgid "@code{connman} (default: @var{connman})" -msgstr "" +msgstr "@code{connman} (par défaut : @var{connman})" #. type: table #: doc/guix.texi:11111 msgid "The connman package to use." -msgstr "" +msgstr "Le paquet connman à utiliser." #. type: item #: doc/guix.texi:11112 #, no-wrap msgid "@code{disable-vpn?} (default: @code{#f})" -msgstr "" +msgstr "@code{disable-vpn?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:11114 msgid "When true, enable connman's vpn plugin." -msgstr "" +msgstr "Lorsque la valeur est vraie, active le greffon vpn de connman." #. type: cindex #: doc/guix.texi:11117 #, no-wrap msgid "WPA Supplicant" -msgstr "" +msgstr "WPA Supplicant" #. type: defvr #: doc/guix.texi:11118 #, no-wrap msgid "{Scheme Variable} wpa-supplicant-service-type" -msgstr "" +msgstr "{Variable Scheme} wpa-supplicant-service-type" #. type: defvr #: doc/guix.texi:11123 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. It is configured to listen for requests on D-Bus." -msgstr "" +msgstr "C'est le type du service qui lance @url{https://w1.fi/wpa_supplicant/,WPA supplicant}, un démon d'authentification requis pour s'authentifier sur des WiFi chiffrés ou des réseaux ethernet. l est configuré pour écouter des requêtes sur D-Bus." #. type: defvr #: doc/guix.texi:11126 msgid "The value of this service is the @code{wpa-supplicant} package to use. Thus, it can be instantiated like this:" -msgstr "" +msgstr "La valeur de ce service est le paquet @code{wpa-supplicant} à utiliser. Ainsi, il peut être instancié de cette manière :" #. type: lisp #: doc/guix.texi:11129 @@ -19767,63 +20001,68 @@ msgid "" "(use-modules (gnu services networking))\n" "\n" msgstr "" +"(use-modules (gnu services networking))\n" +"\n" #. type: lisp #: doc/guix.texi:11131 #, no-wrap msgid "(service wpa-supplicant-service-type)\n" -msgstr "" +msgstr "(service wpa-supplicant-service-type)\n" #. type: cindex #: doc/guix.texi:11134 #, no-wrap msgid "NTP" -msgstr "" +msgstr "NTP" #. type: cindex #: doc/guix.texi:11135 #, no-wrap msgid "real time clock" -msgstr "" +msgstr "horloge" #. type: deffn #: doc/guix.texi:11136 #, no-wrap msgid "{Scheme Procedure} ntp-service [#:ntp @var{ntp}] @" -msgstr "" +msgstr "{Procédure Scheme} ntp-service [#:ntp @var{ntp}] @" #. type: deffn #: doc/guix.texi:11144 msgid "[#:servers @var{%ntp-servers}] @ [#:allow-large-adjustment? #f] Return a service that runs the daemon from @var{ntp}, the @uref{http://www.ntp.org, Network Time Protocol package}. The daemon will keep the system clock synchronized with that of @var{servers}. @var{allow-large-adjustment?} determines whether @command{ntpd} is allowed to make an initial adjustment of more than 1,000 seconds." msgstr "" +"[#:servers @var{%ntp-servers}] @\n" +"[#:allow-large-adjustment? #f]\n" +"Renvoie un service qui lance le démon de @var{ntp}, le @uref{http://www.ntp.org, paquet Network Time Protocol}. Le démon gardera l'horloge système synchronisée avec celle des serveurs @var{servers}. @var{allow-large-adjustment?} détermine si @command{ntpd} a le droit de faire des ajustements initiaux de plus de 1 000 secondes." #. type: defvr #: doc/guix.texi:11146 #, no-wrap msgid "{Scheme Variable} %ntp-servers" -msgstr "" +msgstr "{Variable Scheme} %ntp-servers" #. type: defvr #: doc/guix.texi:11148 msgid "List of host names used as the default NTP servers." -msgstr "" +msgstr "Liste des noms d'hôtes utilisés comme serveurs NTP par défaut." #. type: cindex #: doc/guix.texi:11150 #, no-wrap msgid "OpenNTPD" -msgstr "" +msgstr "OpenNTPD" #. type: deffn #: doc/guix.texi:11151 #, no-wrap msgid "{Scheme Procedure} openntpd-service-type" -msgstr "" +msgstr "{Procédure Scheme} openntpd-service-type" #. type: deffn #: doc/guix.texi:11155 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 "" +msgstr "Lance le démon NTP @command{ntpd}, implémenté par @uref{http://www.openntpd.org, OpenNTPD}. Le démon gardera l'horloge système synchronisée avec celle des serveurs donnés." #. type: example #: doc/guix.texi:11165 @@ -19839,133 +20078,142 @@ msgid "" " (allow-large-adjustment? #t)))\n" "\n" msgstr "" +"(service\n" +" openntpd-service-type\n" +" (openntpd-configuration\n" +" (listen-on '(\"127.0.0.1\" \"::1\"))\n" +" (sensor '(\"udcf0 correction 70000\"))\n" +" (constraint-from '(\"www.gnu.org\"))\n" +" (constraints-from '(\"https://www.google.com/\"))\n" +" (allow-large-adjustment? #t)))\n" +"\n" #. type: deftp #: doc/guix.texi:11169 #, no-wrap msgid "{Data Type} openntpd-configuration" -msgstr "" +msgstr "{Type de données} openntpd-configuration" #. type: item #: doc/guix.texi:11171 #, no-wrap msgid "@code{openntpd} (default: @code{(file-append openntpd \"/sbin/ntpd\")})" -msgstr "" +msgstr "@code{openntpd} (par défaut : @code{(file-append openntpd \"/sbin/ntpd\")})" #. type: table #: doc/guix.texi:11173 msgid "The openntpd executable to use." -msgstr "" +msgstr "L'exécutable openntpd à utiliser." #. type: item #: doc/guix.texi:11173 #, no-wrap msgid "@code{listen-on} (default: @code{'(\"127.0.0.1\" \"::1\")})" -msgstr "" +msgstr "@code{listen-on} (par défaut : @code{'(\"127.0.0.1\" \"::1\")})" #. type: table #: doc/guix.texi:11175 msgid "A list of local IP addresses or hostnames the ntpd daemon should listen on." -msgstr "" +msgstr "Une liste d'adresses IP locales ou de noms d'hôtes que devrait écouter le démon ntpd." #. type: item #: doc/guix.texi:11175 #, no-wrap msgid "@code{query-from} (default: @code{'()})" -msgstr "" +msgstr "@code{query-from} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:11177 msgid "A list of local IP address the ntpd daemon should use for outgoing queries." -msgstr "" +msgstr "Une liste d'adresses IP que le démon devrait utiliser pour les requêtes sortantes." #. type: item #: doc/guix.texi:11177 #, no-wrap msgid "@code{sensor} (default: @code{'()})" -msgstr "" +msgstr "@code{sensor} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:11182 msgid "Specify a list of timedelta sensor devices ntpd should use. @code{ntpd} will listen to each sensor that acutally exists and ignore non-existant ones. See @uref{https://man.openbsd.org/ntpd.conf, upstream documentation} for more information." -msgstr "" +msgstr "Spécifie une liste de senseurs de différences de temps que ntpd devrait utiliser. @code{ntpd} écoutera chaque senseur qui existe et ignorera ceux qui n'existent pas. Voir @uref{https://man.openbsd.org/ntpd.conf, la documentation en amont} pour plus d'informations." #. type: item #: doc/guix.texi:11182 #, no-wrap msgid "@code{server} (default: @var{%ntp-servers})" -msgstr "" +msgstr "@code{server} (par défaut : @var{%ntp-servers})" #. type: table #: doc/guix.texi:11184 msgid "Specify a list of IP addresses or hostnames of NTP servers to synchronize to." -msgstr "" +msgstr "Spécifie une liste d'adresses IP ou de noms d'hôtes de serveurs NTP avec lesquels se synchroniser." #. type: item #: doc/guix.texi:11184 doc/guix.texi:16965 #, no-wrap msgid "@code{servers} (default: @code{'()})" -msgstr "" +msgstr "@code{servers} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:11186 msgid "Specify a list of IP addresses or hostnames of NTP pools to synchronize to." -msgstr "" +msgstr "Spécifie une liste d'adresses IP ou de noms d'hôtes de banques de serveurs NTP avec lesquelles se synchroniser." #. type: item #: doc/guix.texi:11186 #, no-wrap msgid "@code{constraint-from} (default: @code{'()})" -msgstr "" +msgstr "@code{constraint-from} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:11193 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 "" +msgstr "@code{ntpd} peut être configuré pour demander la « Date » à des serveurs HTTPS de confiance via TLS. Cette information de temps n'est pas utilisée pour sa précision mais agit comme une contrainte authentifiée, ce qui réduit l'impact d'une attaque par l'homme du milieu sur le protocole NTP non authentifié. Spécifie une liste d'URL, d'adresses IP ou de noms d'hôtes de serveurs HTTPS qui fournissent cette contrainte." #. type: item #: doc/guix.texi:11193 #, no-wrap msgid "@code{constraints-from} (default: @code{'()})" -msgstr "" +msgstr "@code{constraints-from} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:11197 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 "" +msgstr "Comme pour @code{constraint-from}, spécifie une liste d'URL, d'adresses IP ou de noms d'hôtes de serveurs HTTPS qui fournissent une contrainte. Si les noms d'hôtes sont résolus en plusieurs adresses IP, @code{ntpd} calculera la contrainte médiane." #. type: item #: doc/guix.texi:11197 #, no-wrap msgid "@code{allow-large-adjustment?} (default: @code{#f})" -msgstr "" +msgstr "@code{allow-large-adjustment?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:11200 msgid "Determines if @code{ntpd} is allowed to make an initial adjustment of more than 180 seconds." -msgstr "" +msgstr "Détermine si @code{ntpd} peut faire un ajustement initial de plus de 180 secondes." #. type: cindex #: doc/guix.texi:11203 #, no-wrap msgid "inetd" -msgstr "" +msgstr "inetd" #. type: deffn #: doc/guix.texi:11204 #, no-wrap msgid "{Scheme variable} inetd-service-type" -msgstr "" +msgstr "{Variable Scheme} inetd-service-type" #. type: deffn #: doc/guix.texi:11209 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 "" +msgstr "Ce service lance le démon @command{inetd} (@pxref{inetd invocation,,, inetutils, GNU Inetutils}). @command{inetd} écoute des connexionssur des sockets internet et démarre le programme spécifié uniquement lorsqu'une connexion arrive sur l'un de ces sockets." #. type: deffn #: doc/guix.texi:11215 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 "" +msgstr "La valeur de ce service est un objet @code{inetd-configuration}. L'exemple suivant configure le démon @command{inetd} pour qu'il fournisse le service @command{echo}, ainsi qu'in service smtp qui transfère le trafic smtp par ssh à un serveur @code{smtp-server} derrière une passerelle @code{hostname} :" #. type: example #: doc/guix.texi:11238 @@ -19993,169 +20241,190 @@ msgid "" " '(\"ssh\" \"-qT\" \"-i\" \"/path/to/ssh_key\"\n" " \"-W\" \"smtp-server:25\" \"user@@hostname\")))))\n" msgstr "" +"(service\n" +" inetd-service-type\n" +" (inetd-configuration\n" +" (entries (list\n" +" (inetd-entry\n" +" (name \"echo\")\n" +" (socket-type 'stream)\n" +" (protocol \"tcp\")\n" +" (wait? #f)\n" +" (user \"root\"))\n" +" (inetd-entry\n" +" (node \"127.0.0.1\")\n" +" (name \"smtp\")\n" +" (socket-type 'stream)\n" +" (protocol \"tcp\")\n" +" (wait? #f)\n" +" (user \"root\")\n" +" (program (file-append openssh \"/bin/ssh\"))\n" +" (arguments\n" +" '(\"ssh\" \"-qT\" \"-i\" \"/path/to/ssh_key\"\n" +" \"-W\" \"smtp-server:25\" \"user@@hostname\")))))\n" #. type: deffn #: doc/guix.texi:11241 msgid "See below for more details about @code{inetd-configuration}." -msgstr "" +msgstr "Voir plus bas pour plus de détails sur @code{inetd-configuration}." #. type: deftp #: doc/guix.texi:11243 #, no-wrap msgid "{Data Type} inetd-configuration" -msgstr "" +msgstr "{Type de données} inetd-configuration" #. type: deftp #: doc/guix.texi:11245 msgid "Data type representing the configuration of @command{inetd}." -msgstr "" +msgstr "Type de données représentant la configuration de @command{inetd}." #. type: item #: doc/guix.texi:11247 #, no-wrap msgid "@code{program} (default: @code{(file-append inetutils \"/libexec/inetd\")})" -msgstr "" +msgstr "@code{program} (par défaut : @code{(file-append inetutils \"/libexec/inetd\")})" #. type: table #: doc/guix.texi:11249 msgid "The @command{inetd} executable to use." -msgstr "" +msgstr "L'exécutable @command{inetd} à utiliser." #. type: item #: doc/guix.texi:11250 doc/guix.texi:16671 #, no-wrap msgid "@code{entries} (default: @code{'()})" -msgstr "" +msgstr "@code{entries} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:11253 msgid "A list of @command{inetd} service entries. Each entry should be created by the @code{inetd-entry} constructor." -msgstr "" +msgstr "Une liste d'entrées de services @command{inetd}. Chaque entrée devrait être crée avec le constructeur @code{inetd-entry}." #. type: deftp #: doc/guix.texi:11256 #, no-wrap msgid "{Data Type} inetd-entry" -msgstr "" +msgstr "{Type de données} inetd-entry" #. type: deftp #: doc/guix.texi:11260 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 "" +msgstr "Type de données représentant une entrée dans la configuration d'@command{inetd}. Chaque entrée correspond à un socket sur lequel @command{inetd} écoutera les requêtes." #. type: item #: doc/guix.texi:11262 #, no-wrap msgid "@code{node} (default: @code{#f})" -msgstr "" +msgstr "@code{node} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:11267 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 "" +msgstr "Chaîne de caractères facultative, un liste d'adresses locales séparées par des virgules que @command{inetd} devrait utiliser pour écouter ce service. @xref{Configuration file,,, inetutils, GNU Inetutils} pour une description complète de toutes les options." #. type: table #: doc/guix.texi:11269 msgid "A string, the name must correspond to an entry in @code{/etc/services}." -msgstr "" +msgstr "Une chaîne de caractères dont le nom doit correspondre à une entrée de @code{/etc/services}." #. type: code{#1} #: doc/guix.texi:11269 #, no-wrap msgid "socket-type" -msgstr "" +msgstr "socket-type" #. type: table #: doc/guix.texi:11272 msgid "One of @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} or @code{'seqpacket}." -msgstr "" +msgstr "Un symbole parmi @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} ou @code{'seqpacket}." #. type: code{#1} #: doc/guix.texi:11272 #, no-wrap msgid "protocol" -msgstr "" +msgstr "protocol" #. type: table #: doc/guix.texi:11274 msgid "A string, must correspond to an entry in @code{/etc/protocols}." -msgstr "" +msgstr "Une chaîne de caractères qui doit correspondre à une entrée dans @code{/etc/protocols}." #. type: item #: doc/guix.texi:11274 #, no-wrap msgid "@code{wait?} (default: @code{#t})" -msgstr "" +msgstr "@code{wait?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:11277 msgid "Whether @command{inetd} should wait for the server to exit before listening to new service requests." -msgstr "" +msgstr "Indique si @command{inetd} devrait attendre que le serveur ait quitté avant d'écouter de nouvelles demandes de service." #. type: table #: doc/guix.texi:11282 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 "" +msgstr "Une chaîne de caractères contenant le nom d'utilisateur (et éventuellement de groupe) de l'utilisateur en tant que lequel le serveur devrait tourner. Le nom du groupe peut être spécifié comme un suffixe, séparé par un deux-points ou un point, c.-à-d.@: @code{\"utilisateur\"}, @code{\"utilisateur:groupe\"} ou @code{\"utilisateur.groupe\"}." #. type: item #: doc/guix.texi:11282 #, no-wrap msgid "@code{program} (default: @code{\"internal\"})" -msgstr "" +msgstr "@code{program} (par défaut : @code{\"internal\"})" #. type: table #: doc/guix.texi:11285 msgid "The server program which will serve the requests, or @code{\"internal\"} if @command{inetd} should use a built-in service." -msgstr "" +msgstr "Le programme du serveur qui servira les requêtes, ou @code{\"internal\"} si @command{inetd} devrait utiliser un service inclus." #. type: table #: doc/guix.texi:11290 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 "" +msgstr "Une liste de chaînes de caractères ou d'objets simili-fichiers qui sont les arguments du programme du serveur, en commençant par le zéroième argument, c.-à-d.@: le nom du programme lui-même. Pour les services internes à @command{inetd}, cette entrée doit être @code{'()} ou @code{'(\"internal\")}." #. type: deftp #: doc/guix.texi:11294 msgid "@xref{Configuration file,,, inetutils, GNU Inetutils} for a more detailed discussion of each configuration field." -msgstr "" +msgstr "@xref{Configuration file,,, inetutils, GNU Inetutils} pour trouver une discussion plus détaillée de chaque champ de configuration." #. type: cindex #: doc/guix.texi:11296 #, no-wrap msgid "Tor" -msgstr "" +msgstr "Tor" #. type: deffn #: doc/guix.texi:11297 #, no-wrap msgid "{Scheme Procedure} tor-service [@var{config-file}] [#:tor @var{tor}]" -msgstr "" +msgstr "{Procédure Scheme} tor-service [@var{config-file}] [#:tor @var{tor}]" #. type: deffn #: doc/guix.texi:11300 msgid "Return a service to run the @uref{https://torproject.org, Tor} anonymous networking daemon." -msgstr "" +msgstr "Renvoie un service qui lance le démon de réseau anonyme @uref{https://torproject.org, Tor}." #. type: deffn #: doc/guix.texi:11305 msgid "The daemon runs as the @code{tor} unprivileged user. It is passed @var{config-file}, a file-like object, with an additional @code{User tor} line and lines for hidden services added via @code{tor-hidden-service}. Run @command{man tor} for information about the configuration file." -msgstr "" +msgstr "Le démon est lancé avec l'identité de l'utilisateur non privilégié @code{tor}. Il lit @var{config-file}, un objet simili-fichier, avec une ligne @code{User tor} supplémentaire et des lignes pour les services cachés ajoutées par des @code{tor-hidden-service}. Lncez @command{man tor} pour obtenir des informations sur le fichier de configuration." #. type: cindex #: doc/guix.texi:11307 #, no-wrap msgid "hidden service" -msgstr "" +msgstr "service caché" #. type: deffn #: doc/guix.texi:11308 #, no-wrap msgid "{Scheme Procedure} tor-hidden-service @var{name} @var{mapping}" -msgstr "" +msgstr "{Procédure Scheme} tor-hidden-service @var{name} @var{mapping}" #. type: deffn #: doc/guix.texi:11311 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 "" +msgstr "Définie un @dfn{service caché} pour Tor nommé @var{name} qui implémente @var{mapping}. @var{mapping} est une liste de paires de port et d'hôte, comme dans :" #. type: example #: doc/guix.texi:11315 @@ -20164,287 +20433,295 @@ msgid "" " '((22 \"127.0.0.1:22\")\n" " (80 \"127.0.0.1:8080\"))\n" msgstr "" +" '((22 \"127.0.0.1:22\")\n" +" (80 \"127.0.0.1:8080\"))\n" #. type: deffn #: doc/guix.texi:11319 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 "" +msgstr "Dans cet exemple, le port 22 du service caché est relié au port local 22 et le port 80 est relié au port local 8080." #. type: deffn #: doc/guix.texi:11323 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 "" +msgstr "Cela crée un répertoire @file{/var/lib/tor/hidden-services/@var{name}} où le fichier @file{hostname} contient le nom d'hôte @code{.onion} pour le service caché." #. type: deffn #: doc/guix.texi:11326 msgid "See @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, the Tor project's documentation} for more information." -msgstr "" +msgstr "Voir @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, the Tor project's documentation} pour trouver plus d'information." #. type: Plain text #: doc/guix.texi:11329 msgid "The @code{(gnu services rsync)} module provides the following services:" -msgstr "" +msgstr "Le module @code{(gnu services rsync)} fournit les services suivant :" #. type: Plain text #: doc/guix.texi:11333 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 "" +msgstr "Vous pourriez vouloir un démon rsync si vous voulez que des fichiers soient disponibles pour que n'importe qui (ou juste vous) puisse télécharger des fichiers existants ou en téléverser des nouveaux." #. type: deffn #: doc/guix.texi:11334 #, no-wrap msgid "{Scheme Variable} rsync-service-type" -msgstr "" +msgstr "{Variable Scheme} rsync-service-type" #. type: deffn #: doc/guix.texi:11337 msgid "This is the type for the @uref{https://rsync.samba.org, rsync} rsync daemon, @command{rsync-configuration} record as in this example:" -msgstr "" +msgstr "C'est le type pour le démon @uref{https://rsync.samba.org, rsync}, qui prend un enregistrement @command{rsync-configuration} comme dans cet exemple :" #. type: example #: doc/guix.texi:11340 #, no-wrap msgid "(service rsync-service-type)\n" -msgstr "" +msgstr "(service rsync-service-type)\n" #. type: deffn #: doc/guix.texi:11343 msgid "See below for details about @code{rsync-configuration}." -msgstr "" +msgstr "Voir plus pas pour trouver des détails à propos de @code{rsync-configuration}." #. type: deftp #: doc/guix.texi:11345 #, no-wrap msgid "{Data Type} rsync-configuration" -msgstr "" +msgstr "{Type de données} rsync-configuration" #. type: deftp #: doc/guix.texi:11347 msgid "Data type representing the configuration for @code{rsync-service}." -msgstr "" +msgstr "Type de données représentant la configuration de @code{rsync-service}." #. type: item #: doc/guix.texi:11349 #, no-wrap msgid "@code{package} (default: @var{rsync})" -msgstr "" +msgstr "@code{package} (par défaut : @var{rsync})" #. type: table #: doc/guix.texi:11351 msgid "@code{rsync} package to use." -msgstr "" +msgstr "Le paquet @code{rsync} à utiliser." #. type: item #: doc/guix.texi:11352 #, no-wrap msgid "@code{port-number} (default: @code{873})" -msgstr "" +msgstr "@code{port-number} (par défaut : @code{873})" #. type: table #: doc/guix.texi:11356 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 "" +msgstr "Le port TCP sur lequel @command{rsync} écoute les connexions entrantes. Si le port est inférieur à @code{1024}, @command{rsync} doit être démarré en tant qu'utilisateur et groupe @code{root}." #. type: item #: doc/guix.texi:11357 #, no-wrap msgid "@code{pid-file} (default: @code{\"/var/run/rsyncd/rsyncd.pid\"})" -msgstr "" +msgstr "@code{pid-file} (par défaut : @code{\"/var/run/rsyncd/rsyncd.pid\"})" #. type: table #: doc/guix.texi:11359 msgid "Name of the file where @command{rsync} writes its PID." -msgstr "" +msgstr "Nom du fichier où @command{rsync} écrit son PID." #. type: item #: doc/guix.texi:11360 #, no-wrap msgid "@code{lock-file} (default: @code{\"/var/run/rsyncd/rsyncd.lock\"})" -msgstr "" +msgstr "@code{lock-file} (par défaut : @code{\"/var/run/rsyncd/rsyncd.lock\"})" #. type: table #: doc/guix.texi:11362 msgid "Name of the file where @command{rsync} writes its lock file." -msgstr "" +msgstr "Nom du fichier où @command{rsync} écrit son fichier de verrouillage." #. type: item #: doc/guix.texi:11363 #, no-wrap msgid "@code{log-file} (default: @code{\"/var/log/rsyncd.log\"})" -msgstr "" +msgstr "@code{log-file} (par défaut : @code{\"/var/log/rsyncd.log\"})" #. type: table #: doc/guix.texi:11365 msgid "Name of the file where @command{rsync} writes its log file." -msgstr "" +msgstr "Nom du fichier où @command{rsync} écrit son fichier de journal." #. type: item #: doc/guix.texi:11366 #, no-wrap msgid "@code{use-chroot?} (default: @var{#t})" -msgstr "" +msgstr "@code{use-chroot?} (par défaut : @var{#t})" #. type: table #: doc/guix.texi:11368 msgid "Whether to use chroot for @command{rsync} shared directory." -msgstr "" +msgstr "S'il faut utiliser un chroot pour le répertoire partagé de @command{rsync}." #. type: item #: doc/guix.texi:11369 #, no-wrap msgid "@code{share-path} (default: @file{/srv/rsync})" -msgstr "" +msgstr "@code{share-path} (par défaut : @file{/srv/rsync})" #. type: table #: doc/guix.texi:11371 msgid "Location of the @command{rsync} shared directory." -msgstr "" +msgstr "Emplacement du répertoire partagé de @command{rsync}." #. type: item #: doc/guix.texi:11372 #, no-wrap msgid "@code{share-comment} (default: @code{\"Rsync share\"})" -msgstr "" +msgstr "@code{share-comment} (par défaut : @code{\"Rsync share\"})" #. type: table #: doc/guix.texi:11374 msgid "Comment of the @command{rsync} shared directory." -msgstr "" +msgstr "Commentaire du répertoire partagé de @command{rsync}." #. type: item #: doc/guix.texi:11375 #, no-wrap msgid "@code{read-only?} (default: @var{#f})" -msgstr "" +msgstr "@code{read-only?} (par défaut : @var{#f})" #. type: table #: doc/guix.texi:11377 msgid "Read-write permissions to shared directory." -msgstr "" +msgstr "Permission en écriture sur le répertoire partagé." #. type: item #: doc/guix.texi:11378 #, no-wrap msgid "@code{timeout} (default: @code{300})" -msgstr "" +msgstr "@code{timeout} (par défaut : @code{300})" #. type: table #: doc/guix.texi:11380 msgid "I/O timeout in seconds." -msgstr "" +msgstr "Délai d'attente d'entrée-sortie en secondes." #. type: item #: doc/guix.texi:11381 #, no-wrap msgid "@code{user} (default: @var{\"root\"})" -msgstr "" +msgstr "@code{user} (par défaut : @var{\"root\"})" #. type: table #: doc/guix.texi:11383 msgid "Owner of the @code{rsync} process." -msgstr "" +msgstr "Propriétaire du processus @code{rsync}." #. type: item #: doc/guix.texi:11384 #, no-wrap msgid "@code{group} (default: @var{\"root\"})" -msgstr "" +msgstr "@code{group} (par défaut : @var{\"root\"})" #. type: table #: doc/guix.texi:11386 msgid "Group of the @code{rsync} process." -msgstr "" +msgstr "Groupe du processus @code{rsync}." #. type: item #: doc/guix.texi:11387 #, no-wrap msgid "@code{uid} (default: @var{\"rsyncd\"})" -msgstr "" +msgstr "@code{uid} (par défaut : @var{\"rsyncd\"})" #. type: table #: doc/guix.texi:11390 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 "" +msgstr "Nom d'utilisateur ou ID utilisateur en tant que lequel les transferts de fichiers ont lieu si le démon a été lancé en @code{root}." #. type: item #: doc/guix.texi:11391 #, no-wrap msgid "@code{gid} (default: @var{\"rsyncd\"})" -msgstr "" +msgstr "@code{gid} (par défaut : @var{\"rsyncd\"})" #. type: table #: doc/guix.texi:11393 msgid "Group name or group ID that will be used when accessing the module." -msgstr "" +msgstr "Nom du groupe ou ID du groupe qui sera utilisé lors de l'accès au module." #. type: Plain text #: doc/guix.texi:11398 msgid "Furthermore, @code{(gnu services ssh)} provides the following services." -msgstr "" +msgstr "En plus, @code{(gnu services ssh)} fournit les services suivant." #. type: cindex #: doc/guix.texi:11398 doc/guix.texi:11437 doc/guix.texi:21275 #, no-wrap msgid "SSH" -msgstr "" +msgstr "SSH" #. type: cindex #: doc/guix.texi:11399 doc/guix.texi:11438 doc/guix.texi:21276 #, no-wrap msgid "SSH server" -msgstr "" +msgstr "serveur SSH" #. type: deffn #: doc/guix.texi:11401 #, no-wrap msgid "{Scheme Procedure} lsh-service [#:host-key \"/etc/lsh/host-key\"] @" -msgstr "" +msgstr "{Procédure Scheme} lsh-service [#:host-key \"/etc/lsh/host-key\"] @" #. type: deffn #: doc/guix.texi:11410 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 "" +"[#:daemonic? #t] [#:interfaces '()] [#:port-number 22] @\n" +"[#:allow-empty-passwords? #f] [#:root-login? #f] @\n" +"[#:syslog-output? #t] [#:x11-forwarding? #t] @\n" +"[#:tcp/ip-forwarding? #t] [#:password-authentication? #t] @\n" +"[#:public-key-authentication? #t] [#:initialize? #t]\n" +"Lance le programme @command{lshd} de @var{lsh} pour écouter sur le port @var{port-number}. @var{host-key} doit désigner un fichier contenant la clef d'hôte et ne doit être lisible que par root." #. type: deffn #: doc/guix.texi:11416 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 "" +msgstr "Lorsque @var{daemonic?} est vrai, @command{lshd} se détachera du terminal qui le contrôle et enregistrera ses journaux avec syslogd, à moins que @var{syslog-output?} ne soit faux. Évidemment, cela rend aussi lsh-service dépendant de l'existence d'un service syslogd. Lorsque @var{pid-file?} est vrai, @command{lshd} écrit son PID dans le fichier @var{pid-file}." #. type: deffn #: doc/guix.texi:11420 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 "" +msgstr "Lorsque @var{initialize?} est vrai, la graine et la clef d'hôte seront créés lors de l'activation du service s'ils n'existent pas encore. Cela peut prendre du temps et demande une interaction." #. type: deffn #: doc/guix.texi:11425 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 "" +msgstr "Lorsque @var{initialize?} est faux, c'est à l'utilisateur d'initialiser le générateur d'aléatoire (@pxref{lsh-make-seed,,, lsh, LSH Manual}) et de crée une paire de clefs dont la clef privée sera stockée dans le fichier @var{host-key} (@pxref{lshd basics,,, lsh, LSH Manual})." #. type: deffn #: doc/guix.texi:11429 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 "" +msgstr "Lorsque @var{interfaces} est vide, lshd écoute les connexions sur toutes les interfaces réseau ; autrement, @var{interfaces} doit être une liste de noms d'hôtes et d'adresses." #. type: deffn #: doc/guix.texi:11433 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 "" +msgstr "@var{allow-empty-passwords?} spécifie si les connexions avec des mots de passes vides sont acceptés et @var{root-login?} spécifie si la connexion en root est acceptée." #. type: deffn #: doc/guix.texi:11435 msgid "The other options should be self-descriptive." -msgstr "" +msgstr "Les autres options devraient être évidentes." #. type: deffn #: doc/guix.texi:11439 #, no-wrap msgid "{Scheme Variable} openssh-service-type" -msgstr "" +msgstr "{Variable Scheme} openssh-service-type" #. type: deffn #: doc/guix.texi:11443 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 "" +msgstr "C'est le type pour le démon ssh @uref{http://www.openssh.org, OpenSSH}, @command{sshd}. Sa valeur doit être un enregistrement @code{openssh-configuration} comme dans cet exemple :" #. type: example #: doc/guix.texi:11452 @@ -20458,16 +20735,23 @@ msgid "" " `((\"alice\" ,(local-file \"alice.pub\"))\n" " (\"bob\" ,(local-file \"bob.pub\"))))))\n" msgstr "" +"(service openssh-service-type\n" +" (openssh-configuration\n" +" (x11-forwarding? #t)\n" +" (permit-root-login 'without-password)\n" +" (authorized-keys\n" +" `((\"alice\" ,(local-file \"alice.pub\"))\n" +" (\"bob\" ,(local-file \"bob.pub\"))))))\n" #. type: deffn #: doc/guix.texi:11455 msgid "See below for details about @code{openssh-configuration}." -msgstr "" +msgstr "Voir plus bas pour trouver des détails sur @code{openssh-configuration}." #. type: deffn #: doc/guix.texi:11458 msgid "This service can be extended with extra authorized keys, as in this example:" -msgstr "" +msgstr "Ce service peut être étendu avec des clefs autorisées supplémentaires, comme dans cet exemple :" #. type: example #: doc/guix.texi:11463 @@ -20477,158 +20761,161 @@ msgid "" " (const `((\"charlie\"\n" " ,(local-file \"charlie.pub\")))))\n" msgstr "" +"(service-extension openssh-service-type\n" +" (const `((\"charlie\"\n" +" ,(local-file \"charlie.pub\")))))\n" #. type: deftp #: doc/guix.texi:11466 #, no-wrap msgid "{Data Type} openssh-configuration" -msgstr "" +msgstr "{Type de données} openssh-configuration" #. type: deftp #: doc/guix.texi:11468 msgid "This is the configuration record for OpenSSH's @command{sshd}." -msgstr "" +msgstr "C'est l'enregistrement de la configuration de la commande @command{sshd} d'OpenSSH." #. type: item #: doc/guix.texi:11470 #, no-wrap msgid "@code{pid-file} (default: @code{\"/var/run/sshd.pid\"})" -msgstr "" +msgstr "@code{pid-file} (par défaut : @code{\"/var/run/sshd.pid\"})" #. type: table #: doc/guix.texi:11472 msgid "Name of the file where @command{sshd} writes its PID." -msgstr "" +msgstr "Nom du fichier où @command{sshd} écrit son PID." #. type: item #: doc/guix.texi:11473 #, no-wrap msgid "@code{port-number} (default: @code{22})" -msgstr "" +msgstr "@code{port-number} (par défaut : @code{22})" #. type: table #: doc/guix.texi:11475 msgid "TCP port on which @command{sshd} listens for incoming connections." -msgstr "" +msgstr "Port TCP sur lequel @command{sshd} écoute les connexions entrantes." #. type: item #: doc/guix.texi:11476 #, no-wrap msgid "@code{permit-root-login} (default: @code{#f})" -msgstr "" +msgstr "@code{permit-root-login} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:11481 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 "" +msgstr "Ce champ détermine si et quand autoriser les connexions en root. Si la valeur est @code{#f}, les connexions en root sont désactivées ; si la valeur est @code{#t}, elles sont autorisées. S'il s'agit du symbole @code{'without-password}, alors les connexions root sont autorisées mais pas par une authentification par mot de passe." #. type: item #: doc/guix.texi:11482 doc/guix.texi:11615 #, no-wrap msgid "@code{allow-empty-passwords?} (default: @code{#f})" -msgstr "" +msgstr "@code{allow-empty-passwords?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:11485 msgid "When true, users with empty passwords may log in. When false, they may not." -msgstr "" +msgstr "Lorsque la valeur est vraie, les utilisateurs avec un mot de passe vide peuvent se connecter. Sinon, ils ne peuvent pas." #. type: item #: doc/guix.texi:11486 doc/guix.texi:11618 #, no-wrap msgid "@code{password-authentication?} (default: @code{#t})" -msgstr "" +msgstr "@code{password-authentication?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:11489 msgid "When true, users may log in with their password. When false, they have other authentication methods." -msgstr "" +msgstr "Lorsque la valeur est vraie, les utilisateurs peuvent se connecter avec leur mot de passe. Sinon, ils doivent utiliser une autre méthode d'authentification." #. type: item #: doc/guix.texi:11490 #, no-wrap msgid "@code{public-key-authentication?} (default: @code{#t})" -msgstr "" +msgstr "@code{public-key-authentication?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:11493 msgid "When true, users may log in using public key authentication. When false, users have to use other authentication method." -msgstr "" +msgstr "Lorsque la valeur est vraie, les utilisateurs peuvent se connecter avec leur clef publique. Sinon, les utilisateurs doivent utiliser une autre méthode d'authentification." #. type: table #: doc/guix.texi:11496 msgid "Authorized public keys are stored in @file{~/.ssh/authorized_keys}. This is used only by protocol version 2." -msgstr "" +msgstr "Les clefs publiques autorisées sont stockées dans @file{~/.ssh/authorized_keys}. Ce n'est utilisé que par le protocole version 2." #. type: item #: doc/guix.texi:11497 #, no-wrap msgid "@code{x11-forwarding?} (default: @code{#f})" -msgstr "" +msgstr "@code{x11-forwarding?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:11501 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 "" +msgstr "Lorsque la valeur est vraie, le transfert de connexion du client graphique X11 est activé — en d'autre termes, les options @option{-X} et @option{-Y} de @command{ssh} fonctionneront." #. type: item #: doc/guix.texi:11502 #, no-wrap msgid "@code{challenge-response-authentication?} (default: @code{#f})" -msgstr "" +msgstr "@code{challenge-response-authentication?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:11505 msgid "Specifies whether challenge response authentication is allowed (e.g. via PAM)." -msgstr "" +msgstr "Spécifie si l'authentification par défi est autorisée (p.@: ex.@: via PAM)." #. type: item #: doc/guix.texi:11506 #, no-wrap msgid "@code{use-pam?} (default: @code{#t})" -msgstr "" +msgstr "@code{use-pam?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:11512 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 "" +msgstr "Active l'interface avec le module d'authentification greffable, PAM. Si la valeur est @code{#t}, cela activera l'authentification PAM avec @code{challenge-response-authentication?} et @code{password-authentication?}, en plus des modules de compte et de session de PAM pour tous les types d'authentification." #. type: table #: doc/guix.texi:11517 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 "" +msgstr "Comme l'authentification par défi de PAM sert généralement un rôle équivalent à l'authentification par mot de passe, vous devriez désactiver soit @code{challenge-response-authentication?}, soit @code{password-authentication?}." #. type: item #: doc/guix.texi:11518 #, no-wrap msgid "@code{print-last-log?} (default: @code{#t})" -msgstr "" +msgstr "@code{print-last-log?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:11521 msgid "Specifies whether @command{sshd} should print the date and time of the last user login when a user logs in interactively." -msgstr "" +msgstr "Spécifie si @command{sshd} devrait afficher la date et l'heure de dernière connexion des utilisateurs lorsqu'un utilisateur se connecte de manière interactive." #. type: item #: doc/guix.texi:11522 #, no-wrap msgid "@code{subsystems} (default: @code{'((\"sftp\" \"internal-sftp\"))})" -msgstr "" +msgstr "@code{subsystems} (par défaut : @code{'((\"sftp\" \"internal-sftp\"))})" #. type: table #: doc/guix.texi:11524 msgid "Configures external subsystems (e.g. file transfer daemon)." -msgstr "" +msgstr "Configure les sous-systèmes externes (p.@: ex.@: le démon de transfert de fichiers)." #. type: table #: doc/guix.texi:11528 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 "" +msgstr "C'est une liste de paires, composées chacune du nom du sous-système et d'une commande (avec éventuellement des arguments) à exécuter à la demande du sous-système." #. type: table #: doc/guix.texi:11531 msgid "The command @command{internal-sftp} implements an in-process SFTP server. Alternately, one can specify the @command{sftp-server} command:" -msgstr "" +msgstr "La commande @command{internal-sftp} implémente un serveur SFTP dans le processus. Autrement, on peut spécifier la commande @command{sftp-server} :" #. type: example #: doc/guix.texi:11536 @@ -20639,27 +20926,31 @@ msgid "" " (subsystems\n" " `((\"sftp\" ,(file-append openssh \"/libexec/sftp-server\"))))))\n" msgstr "" +"(service openssh-service-type\n" +" (openssh-configuration\n" +" (subsystems\n" +" `((\"sftp\" ,(file-append openssh \"/libexec/sftp-server\"))))))\n" #. type: item #: doc/guix.texi:11538 #, no-wrap msgid "@code{accepted-environment} (default: @code{'()})" -msgstr "" +msgstr "@code{accepted-environment} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:11540 msgid "List of strings describing which environment variables may be exported." -msgstr "" +msgstr "Liste de chaînes de caractères qui décrivent les variables d'environnement qui peuvent être exportées." #. type: table #: doc/guix.texi:11543 msgid "Each string gets on its own line. See the @code{AcceptEnv} option in @code{man sshd_config}." -msgstr "" +msgstr "Chaque chaîne a sa propre ligne. Voir l'option @code{AcceptEnv} dans @code{man sshd_config}." #. type: table #: doc/guix.texi:11548 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." -msgstr "" +msgstr "Cet exemple permet aux clients ssh d'exporter la variable @code{COLORTERM}. Elle est initialisée par les émulateurs de terminaux qui supportent les couleurs. Vous pouvez l'utiliser dans votre fichier de ressource de votre shell pour activer les couleurs sur la ligne de commande si cette variable est initialisée." #. type: example #: doc/guix.texi:11553 @@ -20669,29 +20960,32 @@ msgid "" " (openssh-configuration\n" " (accepted-environment '(\"COLORTERM\"))))\n" msgstr "" +"(service openssh-service-type\n" +" (openssh-configuration\n" +" (accepted-environment '(\"COLORTERM\"))))\n" #. type: item #: doc/guix.texi:11555 #, no-wrap msgid "@code{authorized-keys} (default: @code{'()})" -msgstr "" +msgstr "@code{authorized-keys} (par défaut : @code{'()})" #. type: cindex #: doc/guix.texi:11556 #, no-wrap msgid "authorized keys, SSH" -msgstr "" +msgstr "clefs autorisées, SSH" #. type: cindex #: doc/guix.texi:11557 #, no-wrap msgid "SSH authorized keys" -msgstr "" +msgstr "SSH, clefs autorisées" #. type: table #: doc/guix.texi:11561 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 "" +msgstr "C'est la liste des clefs autorisées. Chaque élément de la liste est un nom d'utilisateur suivit d'un ou plusieurs objets simili-fichiers qui représentent les clefs publiques SSH. Par exemple :" #. type: example #: doc/guix.texi:11568 @@ -20703,37 +20997,42 @@ msgid "" " (\"chris\" ,(local-file \"chris.pub\"))\n" " (\"root\" ,(local-file \"rekado.pub\") ,(local-file \"chris.pub\")))))\n" msgstr "" +"(openssh-configuration\n" +" (authorized-keys\n" +" `((\"rekado\" ,(local-file \"rekado.pub\"))\n" +" (\"chris\" ,(local-file \"chris.pub\"))\n" +" (\"root\" ,(local-file \"rekado.pub\") ,(local-file \"chris.pub\")))))\n" #. type: table #: doc/guix.texi:11573 msgid "registers the specified public keys for user accounts @code{rekado}, @code{chris}, and @code{root}." -msgstr "" +msgstr "enregistre les clefs publiques spécifiées pour les comptes @code{rekado}, @code{chris} et @code{root}." #. type: table #: doc/guix.texi:11576 msgid "Additional authorized keys can be specified @i{via} @code{service-extension}." -msgstr "" +msgstr "Des clefs autorisées supplémentaires peuvent être spécifiées via @code{service-extension}." #. type: table #: doc/guix.texi:11579 msgid "Note that this does @emph{not} interfere with the use of @file{~/.ssh/authorized_keys}." -msgstr "" +msgstr "Remarquez que cela n'interfère @emph{pas} avec l'utilisation de @file{~/.ssh/authorized_keys}." #. type: deffn #: doc/guix.texi:11582 #, no-wrap msgid "{Scheme Procedure} dropbear-service [@var{config}]" -msgstr "" +msgstr "{Procédure Scheme} dropbear-service [@var{config}]" #. type: deffn #: doc/guix.texi:11586 msgid "Run the @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,Dropbear SSH daemon} with the given @var{config}, a @code{} object." -msgstr "" +msgstr "Lance le @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,démon SSH Dropbear} avec la configuration @var{config} donnée, un objet @code{}." #. type: deffn #: doc/guix.texi:11589 msgid "For example, to specify a Dropbear service listening on port 1234, add this call to the operating system's @code{services} field:" -msgstr "" +msgstr "Par exemple, pour spécifier un service Dropbear qui écoute sur le port 1234, ajoutez cet appel au champ @code{services} d evotre système d'exploitation :" #. type: example #: doc/guix.texi:11593 @@ -20742,98 +21041,100 @@ msgid "" "(dropbear-service (dropbear-configuration\n" " (port-number 1234)))\n" msgstr "" +"(dropbear-service (dropbear-configuration\n" +" (port-number 1234)))\n" #. type: deftp #: doc/guix.texi:11596 #, no-wrap msgid "{Data Type} dropbear-configuration" -msgstr "" +msgstr "{Type de données} dropbear-configuration" #. type: deftp #: doc/guix.texi:11598 msgid "This data type represents the configuration of a Dropbear SSH daemon." -msgstr "" +msgstr "Ce type de données représente la configuration d'un démon SSH Dropbear." #. type: item #: doc/guix.texi:11600 #, no-wrap msgid "@code{dropbear} (default: @var{dropbear})" -msgstr "" +msgstr "@code{dropbear} (par défaut : @var{dropbear})" #. type: table #: doc/guix.texi:11602 msgid "The Dropbear package to use." -msgstr "" +msgstr "Le paquet Dropbear à utiliser." #. type: item #: doc/guix.texi:11603 #, no-wrap msgid "@code{port-number} (default: 22)" -msgstr "" +msgstr "@code{port-number} (par défaut : 22)" #. type: table #: doc/guix.texi:11605 msgid "The TCP port where the daemon waits for incoming connections." -msgstr "" +msgstr "Le port TCP sur lequel le démon attend des connexions entrantes." #. type: item #: doc/guix.texi:11606 #, no-wrap msgid "@code{syslog-output?} (default: @code{#t})" -msgstr "" +msgstr "@code{syslog-output?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:11608 msgid "Whether to enable syslog output." -msgstr "" +msgstr "Indique s'il faut activer la sortie vers syslog." #. type: item #: doc/guix.texi:11609 #, no-wrap msgid "@code{pid-file} (default: @code{\"/var/run/dropbear.pid\"})" -msgstr "" +msgstr "@code{pid-file} (par défaut : @code{\"/var/run/dropbear.pid\"})" #. type: table #: doc/guix.texi:11611 msgid "File name of the daemon's PID file." -msgstr "" +msgstr "Nom du fichier de PID du démon." #. type: item #: doc/guix.texi:11612 #, no-wrap msgid "@code{root-login?} (default: @code{#f})" -msgstr "" +msgstr "@code{root-login?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:11614 msgid "Whether to allow @code{root} logins." -msgstr "" +msgstr "Indique s'il faut autoriser les connexions en @code{root}." #. type: table #: doc/guix.texi:11617 msgid "Whether to allow empty passwords." -msgstr "" +msgstr "Indique s'il faut autoriser les mots de passes vides." #. type: table #: doc/guix.texi:11620 msgid "Whether to enable password-based authentication." -msgstr "" +msgstr "Indique s'il faut autoriser l'authentification par mot de passe." #. type: defvr #: doc/guix.texi:11623 #, no-wrap msgid "{Scheme Variable} %facebook-host-aliases" -msgstr "" +msgstr "{Variable Scheme} %facebook-host-aliases" #. type: defvr #: doc/guix.texi:11629 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 "" +msgstr "Cette variable contient une chaîne de caractères à utiliser dans @file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library Reference Manual}). Chaque ligne contient une entrée qui fait correspondre les noms des serveurs connus du service en ligne Facebook — p.@: ex.@: @code{www.facebook.com} — à l'hôte local — @code{127.0.0.1} ou son équivalent en IPv6, @code{::1}." #. type: defvr #: doc/guix.texi:11633 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 "" +msgstr "Cette variable est typiquement utilisée dans le champ @code{hosts-file} d'une déclaration @code{operating-system} (@pxref{operating-system Reference, @file{/etc/hosts}}) :" #. type: example #: doc/guix.texi:11636 @@ -20842,6 +21143,8 @@ msgid "" "(use-modules (gnu) (guix))\n" "\n" msgstr "" +"(use-modules (gnu) (guix))\n" +"\n" #. type: example #: doc/guix.texi:11646 @@ -20857,537 +21160,550 @@ msgid "" " (string-append (local-host-aliases host-name)\n" " %facebook-host-aliases))))\n" msgstr "" +"(operating-system\n" +" (host-name \"mamachine\")\n" +" ;; ...\n" +" (hosts-file\n" +" ;; Crée un fichier /etc/hosts avec des alias pour « localhost »\n" +" ;; et « mamachine », ainsi que pour les serveurs de Facebook.\n" +" (plain-file \"hosts\"\n" +" (string-append (local-host-aliases host-name)\n" +" %facebook-host-aliases))))\n" #. type: defvr #: doc/guix.texi:11650 msgid "This mechanism can prevent programs running locally, such as Web browsers, from accessing Facebook." -msgstr "" +msgstr "Ce mécanisme peut éviter que des programmes qui tournent localement, comme des navigateurs Web, ne se connectent à Facebook." #. type: Plain text #: doc/guix.texi:11653 msgid "The @code{(gnu services avahi)} provides the following definition." -msgstr "" +msgstr "Le module @code{(gnu services avahi)} fourni la définition suivante." #. type: deffn #: doc/guix.texi:11654 #, no-wrap msgid "{Scheme Procedure} avahi-service [#:avahi @var{avahi}] @" -msgstr "" +msgstr "{Procédure Scheme} avahi-service [#:avahi @var{avahi}] @" #. type: deffn #: doc/guix.texi:11666 msgid "[#:host-name #f] [#:publish? #t] [#:ipv4? #t] @ [#:ipv6? #t] [#:wide-area? #f] @ [#:domains-to-browse '()] [#:debug? #f] Return a 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{http://avahi.org/}), and 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}. Additionally, add the @var{avahi} package to the system profile so that commands such as @command{avahi-browse} are directly usable." msgstr "" +"[#:host-name #f] [#:publish? #t] [#:ipv4? #t] @\n" +"[#:ipv6? #t] [#:wide-area? #f] @\n" +"[#:domains-to-browse '()] [#:debug? #f]\n" +"Renvoie un service qui lance @command{avahi-daemon}, un serveur qui répond aux requêtes mDNS/DNS-SD qui permet de découvrir des services et de chercher des noms d'hôtes « sans configuration » (voir @uref{http://avahi.org/}) et qui étend le démon de cache de services de noms (nscd) pour qu'il puisse résoudre des noms en @code{.local} avec @uref{http://0pointer.de/lennart/projects/nss-mdns/, nss-mdns}. En plus, ajoute le paquet @var{avahi} au profil du système pour que les commandes comme @command{avahi-browse} soient directement utilisables." #. type: deffn #: doc/guix.texi:11669 msgid "If @var{host-name} is different from @code{#f}, use that as the host name to publish for this machine; otherwise, use the machine's actual host name." -msgstr "" +msgstr "Si @var{host-name} n'est pas @code{#f}, utilise cette valeur comme nom d'hôte à publier pour la machine ; sinon, utilise le vrai nom d'hôte de la machine." #. type: deffn #: doc/guix.texi:11673 msgid "When @var{publish?} is true, publishing of host names and services is allowed; in particular, avahi-daemon will publish the machine's host name and IP address via mDNS on the local network." -msgstr "" +msgstr "Lorsque la valeur de @var{publish?} est vraie, la publication des noms d'hôtes et des domaines sont autorisés ; en particulier, avahi-daemon publiera le nom d'hôte et l'adresse IP de la machine via mDNS sur le réseau local." #. type: deffn #: doc/guix.texi:11675 msgid "When @var{wide-area?} is true, DNS-SD over unicast DNS is enabled." -msgstr "" +msgstr "Lorsque la valeur de @var{wide-area?} est vraie, DNS-SD sur DNS unicast est activé." #. type: deffn #: doc/guix.texi:11678 msgid "Boolean values @var{ipv4?} and @var{ipv6?} determine whether to use IPv4/IPv6 sockets." -msgstr "" +msgstr "Les valeurs booléennes @var{ipv4?} et @var{ipv6?} déterminent s'il faut utiliser un socket IPv4 ou IPv6 respectivement." #. type: deffn #: doc/guix.texi:11680 #, no-wrap msgid "{Scheme Variable} openvswitch-service-type" -msgstr "" +msgstr "{Variable Scheme} openvswitch-service-type" #. type: deffn #: doc/guix.texi:11684 msgid "This is the type of the @uref{http://www.openvswitch.org, Open vSwitch} service, whose value should be an @code{openvswitch-configuration} object." -msgstr "" +msgstr "C'est le type du service @uref{http://www.openvswitch.org, Open vSwitch}, dont la valeur devrait être un objet @code{openvswitch-configuration}." #. type: deftp #: doc/guix.texi:11686 #, no-wrap msgid "{Data Type} openvswitch-configuration" -msgstr "" +msgstr "{Type de données} openvswitch-configuration" #. type: deftp #: doc/guix.texi:11690 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 "" +msgstr "Type de données représentant la configuration de Open vSwitch, un commutateur virtuel multiniveaux conçu pour rendre possible l'automatisation massive des réseaux avec des extensions programmables." #. type: item #: doc/guix.texi:11692 #, no-wrap msgid "@code{package} (default: @var{openvswitch})" -msgstr "" +msgstr "@code{package} (par défaut : @var{openvswitch})" #. type: table #: doc/guix.texi:11694 msgid "Package object of the Open vSwitch." -msgstr "" +msgstr "Objet de paquet de Open vSwitch." #. type: cindex #: doc/guix.texi:11701 #, no-wrap msgid "X11" -msgstr "" +msgstr "X11" #. type: cindex #: doc/guix.texi:11702 #, no-wrap msgid "X Window System" -msgstr "" +msgstr "Système de fenêtrage X" #. type: cindex #: doc/guix.texi:11703 doc/guix.texi:11880 #, no-wrap msgid "login manager" -msgstr "" +msgstr "gestionnaire de connexion" #. type: Plain text #: doc/guix.texi:11708 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 SLiM." -msgstr "" +msgstr "Le support pour le système d'affichage graphique X Window — en particulier Xorg — est fournit par le module @code{(gnu services xorg)}. Remarquez qu'il n'y a pas de procédure @code{xorg-service}. À la place, le serveur X est démarré par le @dfn{gestionnaire de connexion}, par défaut SLiM." #. type: cindex #: doc/guix.texi:11709 #, no-wrap msgid "window manager" -msgstr "" +msgstr "gestionnaire de fenêtre" #. type: Plain text #: doc/guix.texi:11714 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 "" +msgstr "Pour utiliser X11, vous devez installer au moins un @dfn{gestionnaire de fenêtre} — par exemple les paquets @code{windowmaker} ou @code{openbox} — de préférence en l'ajoutant au champ @code{packages} de votre définition de système d'exploitation (@pxref{operating-system Reference, system-wide packages})." #. type: defvr #: doc/guix.texi:11715 #, no-wrap msgid "{Scheme Variable} slim-service-type" -msgstr "" +msgstr "{Variable Scheme} slim-service-type" #. type: defvr #: doc/guix.texi:11717 msgid "This is the type for the SLiM graphical login manager for X11." -msgstr "" +msgstr "C'est de type pour le gestionnaire de connexion graphique SLiM pour X11." #. type: cindex #: doc/guix.texi:11718 #, no-wrap msgid "session types (X11)" -msgstr "" +msgstr "types de sessions (X11)" #. type: cindex #: doc/guix.texi:11719 #, no-wrap msgid "X11 session types" -msgstr "" +msgstr "X11, types de sessions" #. type: defvr #: doc/guix.texi:11726 msgid "SLiM 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 using @kbd{F1}. Packages such as @code{xfce}, @code{sawfish}, and @code{ratpoison} provide @file{.desktop} files; adding them to the system-wide set of packages automatically makes them available at the log-in screen." -msgstr "" +msgstr "SLiM cherche des @dfn{types de sessions} définies par les fichiers @file{.desktop} dans @file{/run/current-system/profile/share/xsessions} et permet aux utilisateurs de choisir une session depuis l'écran de connexion avec @kbd{F1}. Les paquets comme @code{xfce}, @code{sawfish} et @code{ratpoison} fournissent des fichiers @file{.desktop} ; les ajouter à l'ensemble des paquets du système les rendra automatiquement disponibles sur l'écran de connexion." #. type: defvr #: doc/guix.texi:11730 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 "" +msgstr "En plus, les fichiers @file{~/.xsession} sont honorées. Lorsqu'il est disponible, @file{~/.xsession} doit être un fichier exécutable qui démarre un gestionnaire de fenêtre au un autre client X." #. type: deftp #: doc/guix.texi:11732 #, no-wrap msgid "{Data Type} slim-configuration" -msgstr "" +msgstr "{Type de données} slim-configuration" #. type: deftp #: doc/guix.texi:11734 msgid "Data type representing the configuration of @code{slim-service-type}." -msgstr "" +msgstr "Type de données représentant la configuration de @code{slim-service-type}." #. type: table #: doc/guix.texi:11738 msgid "Whether to allow logins with empty passwords." -msgstr "" +msgstr "S'il faut autoriser les connexions avec un mot de passe vide." #. type: item #: doc/guix.texi:11739 #, no-wrap msgid "@code{auto-login?} (default: @code{#f})" -msgstr "" +msgstr "@code{auto-login?} (par défaut : @code{#f})" #. type: itemx #: doc/guix.texi:11740 #, no-wrap msgid "@code{default-user} (default: @code{\"\"})" -msgstr "" +msgstr "@code{default-user} (par défaut : @code{\"\"})" #. type: table #: doc/guix.texi:11742 msgid "When @code{auto-login?} is false, SLiM presents a log-in screen." -msgstr "" +msgstr "Lorsque @code{auto-login?} est faux, SLiM présent un écran de connexion." #. type: table #: doc/guix.texi:11745 msgid "When @code{auto-login?} is true, SLiM logs in directly as @code{default-user}." -msgstr "" +msgstr "Lorsque @code{auto-login?} est vrai, SLiM se connecte directement en tant que @code{default-user}." #. type: item #: doc/guix.texi:11746 #, no-wrap msgid "@code{theme} (default: @code{%default-slim-theme})" -msgstr "" +msgstr "@code{theme} (par défaut : @code{%default-slim-theme})" #. type: itemx #: doc/guix.texi:11747 #, no-wrap msgid "@code{theme-name} (default: @code{%default-slim-theme-name})" -msgstr "" +msgstr "@code{theme-name} (par défaut : @code{%default-slim-theme-name})" #. type: table #: doc/guix.texi:11749 msgid "The graphical theme to use and its name." -msgstr "" +msgstr "Le thème graphique à utiliser et son nom." #. type: item #: doc/guix.texi:11750 #, no-wrap msgid "@code{auto-login-session} (default: @code{#f})" -msgstr "" +msgstr "@code{auto-login-session} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:11753 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 "" +msgstr "Si la valeur est vraie, elle doit être le nom d'un exécutable à démarrer comme session par défaut — p.@: ex.@: @code{(file-append windowmaker \"/bin/windowmaker\")}." #. type: table #: doc/guix.texi:11757 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 "" +msgstr "Si la valeur est fausse, une session décrite par l'un des fichiers @file{.desktop} disponibles dans @code{/run/current-system/profile} et @code{~/.guix-profile} sera utilisée." #. type: quotation #: doc/guix.texi:11762 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 "" +msgstr "Vous devez installer au moins un gestionnaire de fenêtres dans le profil du système ou dans votre profil utilisateur. Sinon, si @code{auto-login-session} est faux, vous ne serez jamais capable de vous connecter." #. type: item #: doc/guix.texi:11764 #, no-wrap msgid "@code{startx} (default: @code{(xorg-start-command)})" -msgstr "" +msgstr "@code{startx} (par défaut : @code{(xorg-start-command)})" #. type: table #: doc/guix.texi:11766 msgid "The command used to start the X11 graphical server." -msgstr "" +msgstr "La commande utilisée pour démarrer le serveur graphique X11." #. type: item #: doc/guix.texi:11767 #, no-wrap msgid "@code{xauth} (default: @code{xauth})" -msgstr "" +msgstr "@code{xauth} (par défaut : @code{xauth})" #. type: table #: doc/guix.texi:11769 msgid "The XAuth package to use." -msgstr "" +msgstr "Le paquet XAuth à utiliser." #. type: item #: doc/guix.texi:11770 #, no-wrap msgid "@code{shepherd} (default: @code{shepherd})" -msgstr "" +msgstr "@code{shepherd} (par défaut : @code{shepherd})" #. type: table #: doc/guix.texi:11773 msgid "The Shepherd package used when invoking @command{halt} and @command{reboot}." -msgstr "" +msgstr "Le paquet Shepherd à utiliser pour invoquer @command{halt} et @command{reboot}." #. type: item #: doc/guix.texi:11774 #, no-wrap msgid "@code{sessreg} (default: @code{sessreg})" -msgstr "" +msgstr "@code{sessreg} (par défaut : @code{sessreg})" #. type: table #: doc/guix.texi:11776 msgid "The sessreg package used in order to register the session." -msgstr "" +msgstr "Le paquet sessreg à utiliser pour enregistrer la session." #. type: item #: doc/guix.texi:11777 #, no-wrap msgid "@code{slim} (default: @code{slim})" -msgstr "" +msgstr "@code{slim} (par défaut : @code{slim})" #. type: table #: doc/guix.texi:11779 msgid "The SLiM package to use." -msgstr "" +msgstr "Le paquet SLiM à utiliser." #. type: defvr #: doc/guix.texi:11782 doc/guix.texi:20772 #, no-wrap msgid "{Scheme Variable} %default-theme" -msgstr "" +msgstr "{Variable Scheme} %default-theme" #. type: defvrx #: doc/guix.texi:11783 #, no-wrap msgid "{Scheme Variable} %default-theme-name" -msgstr "" +msgstr "{Variable Scheme} %default-theme-name" #. type: defvr #: doc/guix.texi:11785 msgid "The default SLiM theme and its name." -msgstr "" +msgstr "Le thème SLiM par défaut et son nom." #. type: deftp #: doc/guix.texi:11788 #, no-wrap msgid "{Data Type} sddm-configuration" -msgstr "" +msgstr "{Type de données} sddm-configuration" #. type: deftp #: doc/guix.texi:11790 msgid "This is the data type representing the sddm service configuration." -msgstr "" +msgstr "C'est le type de données représentant la configuration du service sddm." #. type: item #: doc/guix.texi:11792 #, no-wrap msgid "@code{display-server} (default: \"x11\")" -msgstr "" +msgstr "@code{display-server} (par défaut : \"x11\")" #. type: table #: doc/guix.texi:11795 msgid "Select display server to use for the greeter. Valid values are \"x11\" or \"wayland\"." -msgstr "" +msgstr "Choisit le serveur d'affichage à utiliser pour l'écran d'accueil. Les valeurs valides sont « x11 » et « wayland »." #. type: item #: doc/guix.texi:11796 #, no-wrap msgid "@code{numlock} (default: \"on\")" -msgstr "" +msgstr "@code{numlock} (par défaut : \"on\")" #. type: table #: doc/guix.texi:11798 msgid "Valid values are \"on\", \"off\" or \"none\"." -msgstr "" +msgstr "Les valeurs valides sont « on », « off » ou « none »." #. type: item #: doc/guix.texi:11799 #, no-wrap msgid "@code{halt-command} (default @code{#~(string-apppend #$shepherd \"/sbin/halt\")})" -msgstr "" +msgstr "@code{halt-command} (par défaut : @code{#~(string-apppend #$shepherd \"/sbin/halt\")})" #. type: table #: doc/guix.texi:11801 msgid "Command to run when halting." -msgstr "" +msgstr "La commande à lancer à l'arrêt du système." #. type: item #: doc/guix.texi:11802 #, no-wrap msgid "@code{reboot-command} (default @code{#~(string-append #$shepherd \"/sbin/reboot\")})" -msgstr "" +msgstr "@code{reboot-command} (par défaut : @code{#~(string-append #$shepherd \"/sbin/reboot\")})" #. type: table #: doc/guix.texi:11804 msgid "Command to run when rebooting." -msgstr "" +msgstr "La commande à lancer lors du redémarrage du système." #. type: item #: doc/guix.texi:11805 #, no-wrap msgid "@code{theme} (default \"maldives\")" -msgstr "" +msgstr "@code{theme} (par défaut : \"maldives\")" #. type: table #: doc/guix.texi:11807 msgid "Theme to use. Default themes provided by SDDM are \"elarun\" or \"maldives\"." -msgstr "" +msgstr "Le thème à utiliser. Les thèmes par défaut fournis par SDDM sont « elarun » et « maldives »." #. type: item #: doc/guix.texi:11808 #, no-wrap msgid "@code{themes-directory} (default \"/run/current-system/profile/share/sddm/themes\")" -msgstr "" +msgstr "@code{themes-directory} (par défaut : \"/run/current-system/profile/share/sddm/themes\")" #. type: table #: doc/guix.texi:11810 msgid "Directory to look for themes." -msgstr "" +msgstr "Le répertoire où se trouvent les thèmes." #. type: item #: doc/guix.texi:11811 #, no-wrap msgid "@code{faces-directory} (default \"/run/current-system/profile/share/sddm/faces\")" -msgstr "" +msgstr "@code{faces-directory} (par défaut : \"/run/current-system/profile/share/sddm/faces\")" #. type: table #: doc/guix.texi:11813 msgid "Directory to look for faces." -msgstr "" +msgstr "Répertoire où se trouvent les avatars." #. type: item #: doc/guix.texi:11814 #, no-wrap msgid "@code{default-path} (default \"/run/current-system/profile/bin\")" -msgstr "" +msgstr "@code{default-path} (par défaut : \"/run/current-system/profile/bin\")" #. type: table #: doc/guix.texi:11816 msgid "Default PATH to use." -msgstr "" +msgstr "Le PATH par défaut à utiliser." #. type: item #: doc/guix.texi:11817 #, no-wrap msgid "@code{minimum-uid} (default 1000)" -msgstr "" +msgstr "@code{minimum-uid} (par défaut : 1000)" #. type: table #: doc/guix.texi:11819 msgid "Minimum UID to display in SDDM." -msgstr "" +msgstr "UID minimum pour être affiché dans SDDM." #. type: item #: doc/guix.texi:11820 #, no-wrap msgid "@code{maximum-uid} (default 2000)" -msgstr "" +msgstr "@code{maximum-uid} (par défaut : 2000)" #. type: table #: doc/guix.texi:11822 msgid "Maximum UID to display in SDDM" -msgstr "" +msgstr "UID maximum pour être affiché dans SDDM." #. type: item #: doc/guix.texi:11823 #, no-wrap msgid "@code{remember-last-user?} (default #t)" -msgstr "" +msgstr "@code{remember-last-user?} (par défaut : #t)" #. type: table #: doc/guix.texi:11825 msgid "Remember last user." -msgstr "" +msgstr "S'il faut se rappeler le dernier utilisateur connecté." #. type: item #: doc/guix.texi:11826 #, no-wrap msgid "@code{remember-last-session?} (default #t)" -msgstr "" +msgstr "@code{remember-last-session?} (par défaut : #t)" #. type: table #: doc/guix.texi:11828 msgid "Remember last session." -msgstr "" +msgstr "S'il faut se rappeler la dernière session." #. type: item #: doc/guix.texi:11829 #, no-wrap msgid "@code{hide-users} (default \"\")" -msgstr "" +msgstr "@code{hide-users} (par défaut : \"\")" #. type: table #: doc/guix.texi:11831 msgid "Usernames to hide from SDDM greeter." -msgstr "" +msgstr "Les noms d'utilisateurs à cacher sur l'écran d'accueil de SDDM." #. type: item #: doc/guix.texi:11832 #, no-wrap msgid "@code{hide-shells} (default @code{#~(string-append #$shadow \"/sbin/nologin\")})" -msgstr "" +msgstr "@code{hide-shells} (par défaut : @code{#~(string-append #$shadow \"/sbin/nologin\")})" #. type: table #: doc/guix.texi:11834 msgid "Users with shells listed will be hidden from the SDDM greeter." -msgstr "" +msgstr "Les utilisateurs avec les shells listés seront cachés sur l'écran d'accueil de SDDM." #. type: item #: doc/guix.texi:11835 #, no-wrap msgid "@code{session-command} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/wayland-session\")})" -msgstr "" +msgstr "@code{session-command} (par défaut : @code{#~(string-append #$sddm \"/share/sddm/scripts/wayland-session\")})" #. type: table #: doc/guix.texi:11837 msgid "Script to run before starting a wayland session." -msgstr "" +msgstr "Le script à lancer avant de démarrer une session wayland." #. type: item #: doc/guix.texi:11838 #, no-wrap msgid "@code{sessions-directory} (default \"/run/current-system/profile/share/wayland-sessions\")" -msgstr "" +msgstr "@code{sessions-directory} (par défaut : \"/run/current-system/profile/share/wayland-sessions\")" #. type: table #: doc/guix.texi:11840 msgid "Directory to look for desktop files starting wayland sessions." -msgstr "" +msgstr "Le répertoire où trouver les fichiers .desktop qui démarrent des sessions wayland." #. type: item #: doc/guix.texi:11841 #, no-wrap msgid "@code{xorg-server-path} (default @code{xorg-start-command})" -msgstr "" +msgstr "@code{xorg-server-path} (par défaut : @code{xorg-start-command})" #. type: table #: doc/guix.texi:11843 msgid "Path to xorg-server." -msgstr "" +msgstr "Chemin vers xorg-server." #. type: item #: doc/guix.texi:11844 #, no-wrap msgid "@code{xauth-path} (default @code{#~(string-append #$xauth \"/bin/xauth\")})" -msgstr "" +msgstr "@code{xauth-path} (par défaut : @code{#~(string-append #$xauth \"/bin/xauth\")})" #. type: table #: doc/guix.texi:11846 msgid "Path to xauth." -msgstr "" +msgstr "Chemin vers xauth." #. type: item #: doc/guix.texi:11847 #, no-wrap msgid "@code{xephyr-path} (default @code{#~(string-append #$xorg-server \"/bin/Xephyr\")})" -msgstr "" +msgstr "@code{xephyr-path} (par défaut : @code{#~(string-append #$xorg-server \"/bin/Xephyr\")})" #. type: table #: doc/guix.texi:11849 msgid "Path to Xephyr." -msgstr "" +msgstr "Chemin vers Xephyr." #. type: item #: doc/guix.texi:11850 #, no-wrap msgid "@code{xdisplay-start} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xsetup\")})" -msgstr "" +msgstr "@code{xdisplay-start} (par défaut : @code{#~(string-append #$sddm \"/share/sddm/scripts/Xsetup\")})" #. type: table #: doc/guix.texi:11852 msgid "Script to run after starting xorg-server." -msgstr "" +msgstr "Le script à lancer après avoir démarré xorg-server." #. type: item #: doc/guix.texi:11853 #, no-wrap msgid "@code{xdisplay-stop} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xstop\")})" -msgstr "" +msgstr "@code{xdisplay-stop} (par défaut : @code{#~(string-append #$sddm \"/share/sddm/scripts/Xstop\")})" #. type: table #: doc/guix.texi:11855 msgid "Script to run before stopping xorg-server." -msgstr "" +msgstr "Le script à lancer avant d'arrêter xorg-server." #. type: item #: doc/guix.texi:11856 @@ -21398,90 +21714,90 @@ msgstr "@code{xsession-command} (par défaut : @code{xinitrc})" #. type: table #: doc/guix.texi:11858 msgid "Script to run before starting a X session." -msgstr "" +msgstr "Le script à lancer avant de démarrer une session X." #. type: item #: doc/guix.texi:11859 #, no-wrap msgid "@code{xsessions-directory} (default: \"/run/current-system/profile/share/xsessions\")" -msgstr "" +msgstr "@code{xsessions-directory} (par défaut : \"/run/current-system/profile/share/xsessions\")" #. type: table #: doc/guix.texi:11861 msgid "Directory to look for desktop files starting X sessions." -msgstr "" +msgstr "Répertoire où trouver les fichiers .desktop pour les sessions X." #. type: item #: doc/guix.texi:11862 #, no-wrap msgid "@code{minimum-vt} (default: 7)" -msgstr "" +msgstr "@code{minimum-vt} (par défaut : 7)" #. type: table #: doc/guix.texi:11864 msgid "Minimum VT to use." -msgstr "" +msgstr "VT minimal à utiliser." #. type: item #: doc/guix.texi:11865 #, no-wrap msgid "@code{xserver-arguments} (default \"-nolisten tcp\")" -msgstr "" +msgstr "@code{xserver-arguments} (par défaut : \"-nolisten tcp\")" #. type: table #: doc/guix.texi:11867 msgid "Arguments to pass to xorg-server." -msgstr "" +msgstr "Arguments à passer à xorg-server." #. type: item #: doc/guix.texi:11868 #, no-wrap msgid "@code{auto-login-user} (default \"\")" -msgstr "" +msgstr "@code{auto-login-user} (par défaut : \"\")" #. type: table #: doc/guix.texi:11870 msgid "User to use for auto-login." -msgstr "" +msgstr "Utilisateur à utiliser pour la connexion automatique." #. type: item #: doc/guix.texi:11871 #, no-wrap msgid "@code{auto-login-session} (default \"\")" -msgstr "" +msgstr "@code{auto-login-session} (par défaut : \"\")" #. type: table #: doc/guix.texi:11873 msgid "Desktop file to use for auto-login." -msgstr "" +msgstr "Le fichier desktop à utiliser pour la connexion automatique." #. type: item #: doc/guix.texi:11874 #, no-wrap msgid "@code{relogin?} (default #f)" -msgstr "" +msgstr "@code{relogin?} (par défaut : #f)" #. type: table #: doc/guix.texi:11876 msgid "Relogin after logout." -msgstr "" +msgstr "S'il faut se reconnecter après la déconnexion." #. type: cindex #: doc/guix.texi:11881 #, no-wrap msgid "X11 login" -msgstr "" +msgstr "connexion X11" #. type: deffn #: doc/guix.texi:11882 #, no-wrap msgid "{Scheme Procedure} sddm-service config" -msgstr "" +msgstr "{Procédure Scheme} sddm-service config" #. type: deffn #: doc/guix.texi:11885 msgid "Return a service that spawns the SDDM graphical login manager for config of type @code{}." -msgstr "" +msgstr "Renvoie un service qui démarre le gestionnaire de connexion graphique SDDM avec une configuration de type @code{}." #. type: example #: doc/guix.texi:11890 @@ -21491,58 +21807,70 @@ msgid "" " (auto-login-user \"Alice\")\n" " (auto-login-session \"xfce.desktop\")))\n" msgstr "" +" (sddm-service (sddm-configuration\n" +" (auto-login-user \"Alice\")\n" +" (auto-login-session \"xfce.desktop\")))\n" #. type: deffn #: doc/guix.texi:11893 #, no-wrap msgid "{Scheme Procedure} xorg-start-command [#:guile] @" -msgstr "" +msgstr "{Procédure Scheme} xorg-start-command [#:guile] @" #. type: deffn #: doc/guix.texi:11902 msgid "[#:modules %default-xorg-modules] @ [#:fonts %default-xorg-fonts] @ [#:configuration-file (xorg-configuration-file @dots{})] @ [#:xorg-server @var{xorg-server}] Return a @code{startx} script in which @var{modules}, a list of X module packages, and @var{fonts}, a list of X font directories, are available. See @code{xorg-wrapper} for more details on the arguments. The result should be used in place of @code{startx}." msgstr "" +"[#:modules %default-xorg-modules] @\n" +"[#:fonts %default-xorg-fonts] @\n" +"[#:configuration-file (xorg-configuration-file @dots{})] @\n" +"[#:xorg-server @var{xorg-server}]\n" +"Renvoie un script @code{startx} dans lequel @var{modules}, une liste de paquets de modules X et @var{fonts}, une liste de répertoires de polices X, sont disponibles. Voir @code{xorg-wrapper} pour plus de détails sur les arguments. Le résultat devrait être utilisé à la place de @code{startx}." #. type: deffn #: doc/guix.texi:11904 msgid "Usually the X server is started by a login manager." -msgstr "" +msgstr "Habituellement le serveur X est démarré par un gestionnaire de connexion." #. type: deffn #: doc/guix.texi:11906 #, no-wrap msgid "{Scheme Procedure} xorg-configuration-file @" -msgstr "" +msgstr "{Procédure Scheme} xorg-configuration-file @" #. type: deffn #: doc/guix.texi:11912 msgid "[#:modules %default-xorg-modules] @ [#:fonts %default-xorg-fonts] @ [#:drivers '()] [#:resolutions '()] [#:extra-config '()] Return a configuration file for the Xorg server containing search paths for all the common drivers." msgstr "" +"[#:modules %default-xorg-modules] @\n" +"[#:fonts %default-xorg-fonts] @\n" +"[#:drivers '()] [#:resolutions '()] [#:extra-config '()]\n" +"Renvoie un fichier de configuration pour le serveur Xorg qui contient des chemins de recherche pour tous les pilotes communs." #. type: deffn #: doc/guix.texi:11917 msgid "@var{modules} must be a list of @dfn{module packages} loaded by the Xorg server---e.g., @code{xf86-video-vesa}, @code{xf86-input-keyboard}, and so on. @var{fonts} must be a list of font directories to add to the server's @dfn{font path}." -msgstr "" +msgstr "@var{modules} doit être une liste de @dfn{paquets de modules} chargés par le serveur Xorg — p.@: ex.@: @code{xf86-video-vesa}, @code{xf86-input-keyboard} etc. @var{fonts} doit être une liste de répertoires de polices à ajouter au @dfn{chemin de polices} du serveur." #. type: deffn #: doc/guix.texi:11921 msgid "@var{drivers} 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 "" +msgstr "@var{drivers} doit être soit la liste vide, auquel cas Xorg choisis un pilote graphique automatiquement, soit une liste de noms de pilotes qui seront essayés dans cet ordre — p.@: ex.@: @code{(\"modesetting\" \"vesa\")}." #. type: deffn #: doc/guix.texi:11925 msgid "Likewise, when @var{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 "" +msgstr "De même, lorsque @var{resolutions} est la liste vide, Xorg choisis une résolution d'écran appropriée ; autrement, ce doit être une liste de résolutions — p.@: ex.@: @code{((1024 768) (640 480))}." #. type: deffn #: doc/guix.texi:11929 msgid "Last, @var{extra-config} 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 "" +msgstr "Enfin, @var{extra-config} est une liste de chaînes de caractères ou d'objets ajoutés au fichier de configuration. Elle est utilisée pour passer du texte supplémentaire à être ajouté directement au fichier de configuration." #. type: deffn #: doc/guix.texi:11935 msgid "This procedure is especially useful to configure a different keyboard layout than the default US keymap. For instance, to use the ``bépo'' keymap by default on the display manager:" -msgstr "" +msgstr "Cette procédure est particulièrement utile pour configurer une disposition de clavier différente de la disposition US par défaut. Par exemple, pour utiliser la disposition « bépo » par défaut sur le gestionnaire d'affichage :" #. type: example #: doc/guix.texi:11945 @@ -21558,6 +21886,15 @@ msgid "" "EndSection\")\n" "\n" msgstr "" +"(define bepo-evdev\n" +" \"Section \\\"InputClass\\\"\n" +" Identifier \\\"evdev keyboard catchall\\\"\n" +" Driver \\\"evdev\\\"\n" +" MatchIsKeyboard \\\"on\\\"\n" +" Option \\\"xkb_layout\\\" \\\"fr\\\"\n" +" Option \\\"xkb_variant\\\" \\\"bepo\\\"\n" +"EndSection\")\n" +"\n" #. type: example #: doc/guix.texi:11958 @@ -21576,71 +21913,83 @@ msgid "" " #:extra-config\n" " (list bepo-evdev)))))))))\n" msgstr "" +"(operating-system\n" +" ...\n" +" (services\n" +" (modify-services %desktop-services\n" +" (slim-service-type config =>\n" +" (slim-configuration\n" +" (inherit config)\n" +" (startx (xorg-start-command\n" +" #:configuration-file\n" +" (xorg-configuration-file\n" +" #:extra-config\n" +" (list bepo-evdev)))))))))\n" #. type: deffn #: doc/guix.texi:11967 msgid "The @code{MatchIsKeyboard} line specifies that we only apply the configuration to keyboards. Without this line, other devices such as touchpad may not work correctly because they will be attached to the wrong driver. In this example, the user typically used @code{setxkbmap fr bepo} to set their favorite keymap once logged in. The first argument corresponds to the layout, while the second argument corresponds to the variant. The @code{xkb_variant} line can be omitted to select the default variant." -msgstr "" +msgstr "La ligne @code{MatchIsKeyboard} spécifie que nous n'appliquons la configuration qu'aux claviers. Sans cette ligne, d'autres périphériques comme les pavés tactiles ne fonctionneront pas correctement parce qu'ils seront associés au mauvais pilote. Dans cet exemple, l'utilisateur utiliserait typiquement @code{setxkbmap fr bepo} pour utiliser sa disposition de clavier préférée une fois connecté. Le premier argument correspond à la disposition, tandis que le second argument correspond à la variante. La ligne @code{xkb_variant} peut être omise pour choisir la variante par défaut." #. type: deffn #: doc/guix.texi:11969 #, no-wrap msgid "{Scheme Procedure} screen-locker-service @var{package} [@var{program}]" -msgstr "" +msgstr "{Procédure Scheme} screen-locker-service @var{package} [@var{program}]" #. type: deffn #: doc/guix.texi:11973 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 "" +msgstr "Ajoute @var{package}, un paquet pour un verrouiller l'écran ou un économiseur d'écran dont la commande est @var{program}, à l'ensemble des programmes setuid et lui ajoute une entrée PAM. Par exemple :" #. type: lisp #: doc/guix.texi:11976 #, no-wrap msgid "(screen-locker-service xlockmore \"xlock\")\n" -msgstr "" +msgstr "(screen-locker-service xlockmore \"xlock\")\n" #. type: deffn #: doc/guix.texi:11979 msgid "makes the good ol' XlockMore usable." -msgstr "" +msgstr "rend utilisable le bon vieux XlockMore." #. type: cindex #: doc/guix.texi:11985 #, no-wrap msgid "printer support with CUPS" -msgstr "" +msgstr "support des imprimantes avec CUPS" #. type: Plain text #: doc/guix.texi:11989 msgid "The @code{(gnu services cups)} module provides a Guix service definition for the CUPS printing service. To add printer support to a GuixSD system, add a @code{cups-service} to the operating system definition:" -msgstr "" +msgstr "Le module @code{(gnu services cups)} fournit une définition de service Guix pour le service d'impression CUPS. Pour ajouter le support d'une imprimante à un système GuixSD, ajoutez un @code{cups-service} à la définition du système d'exploitation :" #. type: deffn #: doc/guix.texi:11990 #, no-wrap msgid "{Scheme Variable} cups-service-type" -msgstr "" +msgstr "{Variable Scheme} cups-service-type" #. type: deffn #: doc/guix.texi:11994 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 "" +msgstr "Le type de service pour un serveur d'impression CUPS. Sa valeur devrait être une configuration CUPS valide (voir plus bas). Pour utiliser les paramètres par défaut, écrivez simplement :" #. type: example #: doc/guix.texi:11996 #, no-wrap msgid "(service cups-service-type)\n" -msgstr "" +msgstr "(service cups-service-type)\n" #. type: Plain text #: doc/guix.texi:12006 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 "" +msgstr "La configuration de CUPS contrôle les paramètres de base de votre installation CUPS : sur quelles interfaces il doit écouter, que faire si un travail échoue, combien de journalisation il faut faire, etc. Pour ajouter une imprimante, vous devrez visiter l'URL @url{http://localhost:631} ou utiliser un outil comme les services de configuration d'imprimante de GNOME. Par défaut, la configuration du service CUPS générera un certificat auto-signé si besoin, pour les connexions sécurisée avec le serveur d'impression." #. type: Plain text #: doc/guix.texi:12011 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} package. You can do that directly, like this (you need to use the @code{(gnu packages cups)} module):" -msgstr "" +msgstr "Supposons que vous souhaitez activer l'interface Web de CUPS et ajouter le support pour les imprimantes Epson via le paquet @code{escpr} et our les imprimantes HP via le paquet @code{hplip}. Vous pouvez le faire directement, comme ceci (vous devez utiliser le module @code{(gnu packages cups)}) :" #. type: example #: doc/guix.texi:12018 @@ -21652,215 +22001,220 @@ msgid "" " (extensions\n" " (list cups-filters escpr hplip))))\n" msgstr "" +"(service cups-service-type\n" +" (cups-configuration\n" +" (web-interface? #t)\n" +" (extensions\n" +" (list cups-filters escpr hplip))))\n" #. type: Plain text #: doc/guix.texi:12026 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 "" +msgstr "Les paramètres de configuration disponibles sont les suivants. Chaque définition des paramètres est précédé par son type ; par exemple, @samp{string-list foo} indique que le paramètre @code{foo} devrait être spécifié comme une liste de chaînes de caractères. Il y a aussi une manière de spécifier la configuration comme une chaîne de caractères, si vous avez un vieux fichier @code{cupsd.conf} que vous voulez porter depuis un autre système ; voir la fin pour plus de détails." #. type: Plain text #: doc/guix.texi:12037 msgid "Available @code{cups-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{cups-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:12038 #, no-wrap msgid "{@code{cups-configuration} parameter} package cups" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} package cups" #. type: deftypevr #: doc/guix.texi:12040 doc/guix.texi:12797 msgid "The CUPS package." -msgstr "" +msgstr "Le paquet CUPS." #. type: deftypevr #: doc/guix.texi:12042 #, no-wrap msgid "{@code{cups-configuration} parameter} package-list extensions" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} package-list extensions" #. type: deftypevr #: doc/guix.texi:12044 msgid "Drivers and other extensions to the CUPS package." -msgstr "" +msgstr "Pilotes et autres extensions du paquet CUPS." #. type: deftypevr #: doc/guix.texi:12046 #, no-wrap msgid "{@code{cups-configuration} parameter} files-configuration files-configuration" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} files-configuration files-configuration" #. type: deftypevr #: doc/guix.texi:12049 msgid "Configuration of where to write logs, what directories to use for print spools, and related privileged configuration parameters." -msgstr "" +msgstr "Configuration de l'emplacement où écrire les journaux, quels répertoires utiliser pour les travaux d'impression et les paramètres de configuration privilégiés liés." #. type: deftypevr #: doc/guix.texi:12051 msgid "Available @code{files-configuration} fields are:" -msgstr "" +msgstr "Les champs @code{files-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:12052 #, no-wrap msgid "{@code{files-configuration} parameter} log-location access-log" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} log-location access-log" #. type: deftypevr #: doc/guix.texi:12060 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 "" +msgstr "Définit le fichier de journal d'accès. Spécifier un nom de fichier vide désactive la génération de journaux d'accès. La valeur @code{stderr} fait que les entrées du journal seront envoyés sur l'erreur standard lorsque l'ordonnanceur est lancé au premier plan ou vers le démon de journal système lorsqu'il tourne en tache de fond. La valeur @code{syslog} fait que les entrées du journal sont envoyées au démon de journalisation du système. Le nom du serveur peut être inclus dans les noms de fichiers avec la chaîne @code{%s}, comme dans @code{/var/log/cups/%s-access_log}." #. type: deftypevr #: doc/guix.texi:12062 msgid "Defaults to @samp{\"/var/log/cups/access_log\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/var/log/cups/access_log\"}." #. type: deftypevr #: doc/guix.texi:12064 #, no-wrap msgid "{@code{files-configuration} parameter} file-name cache-dir" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} file-name cache-dir" #. type: deftypevr #: doc/guix.texi:12066 msgid "Where CUPS should cache data." -msgstr "" +msgstr "L'emplacement où CUPS devrait mettre les données en cache." #. type: deftypevr #: doc/guix.texi:12068 msgid "Defaults to @samp{\"/var/cache/cups\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/var/cache/cups\"}." #. type: deftypevr #: doc/guix.texi:12070 #, no-wrap msgid "{@code{files-configuration} parameter} string config-file-perm" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} string config-file-perm" #. type: deftypevr #: doc/guix.texi:12073 msgid "Specifies the permissions for all configuration files that the scheduler writes." -msgstr "" +msgstr "Spécifie les permissions pour tous les fichiers de configuration que l'ordonnanceur écrit." #. type: deftypevr #: doc/guix.texi:12079 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 "" +msgstr "Remarquez que les permissions pour le fichier printers.conf sont actuellement masqués pour ne permettre que l'accès par l'utilisateur de l'ordonnanceur (typiquement root). La raison est que les URI des imprimantes contiennent des informations d'authentification sensibles qui ne devraient pas être connues sur le système. Il n'est pas possible de désactiver cette fonctionnalité de sécurité." #. type: deftypevr #: doc/guix.texi:12081 msgid "Defaults to @samp{\"0640\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"0640\"}." #. type: deftypevr #: doc/guix.texi:12083 #, no-wrap msgid "{@code{files-configuration} parameter} log-location error-log" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} log-location error-log" #. type: deftypevr #: doc/guix.texi:12091 msgid "Defines the error 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-error_log}." -msgstr "" +msgstr "Définit le fichier de journal d'erreur. Spécifier un nom de fichier vide désactive la génération de journaux d'erreur. La valeur @code{stderr} fait que les entrées du journal seront envoyés sur l'erreur standard lorsque l'ordonnanceur est lancé au premier plan ou vers le démon de journal système lorsqu'il tourne en tache de fond. La valeur @code{syslog} fait que les entrées du journal sont envoyées au démon de journalisation du système. Le nom du serveur peut être inclus dans les noms de fichiers avec la chaîne @code{%s}, comme dans @code{/var/log/cups/%s-error_log}." #. type: deftypevr #: doc/guix.texi:12093 msgid "Defaults to @samp{\"/var/log/cups/error_log\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/var/log/cups/error_log\"}." #. type: deftypevr #: doc/guix.texi:12095 #, no-wrap msgid "{@code{files-configuration} parameter} string fatal-errors" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} string fatal-errors" #. type: deftypevr #: doc/guix.texi:12098 msgid "Specifies which errors are fatal, causing the scheduler to exit. The kind strings are:" -msgstr "" +msgstr "Spécifie quelles erreurs sont fatales, qui font terminer l'ordonnanceur. Les types de chaînes sont :" #. type: table #: doc/guix.texi:12102 msgid "No errors are fatal." -msgstr "" +msgstr "Aucune erreur n'est fatale." #. type: table #: doc/guix.texi:12105 msgid "All of the errors below are fatal." -msgstr "" +msgstr "Toutes les erreurs ci-dessous sont fatales." #. type: item #: doc/guix.texi:12106 #, no-wrap msgid "browse" -msgstr "" +msgstr "browse" #. type: table #: doc/guix.texi:12109 msgid "Browsing initialization errors are fatal, for example failed connections to the DNS-SD daemon." -msgstr "" +msgstr "Les erreurs d'initialisation de la navigation sont fatales, par exemple les connexion échouées au démon DNS-SD." #. type: item #: doc/guix.texi:12110 #, no-wrap msgid "config" -msgstr "" +msgstr "config" #. type: table #: doc/guix.texi:12112 msgid "Configuration file syntax errors are fatal." -msgstr "" +msgstr "Les erreurs de syntaxe du fichier de configuration sont fatale." #. type: item #: doc/guix.texi:12113 #, no-wrap msgid "listen" -msgstr "" +msgstr "listen" #. type: table #: doc/guix.texi:12116 msgid "Listen or Port errors are fatal, except for IPv6 failures on the loopback or @code{any} addresses." -msgstr "" +msgstr "Les erreurs d'écoute ou de port sont fatales, sauf pour les erreurs d'IPv6 sur la boucle locale ou les adresses @code{any}." #. type: item #: doc/guix.texi:12117 #, no-wrap msgid "log" -msgstr "" +msgstr "log" #. type: table #: doc/guix.texi:12119 msgid "Log file creation or write errors are fatal." -msgstr "" +msgstr "Les erreurs de création ou d'écriture des fichiers de journal sont fatales." #. type: item #: doc/guix.texi:12120 #, no-wrap msgid "permissions" -msgstr "" +msgstr "permissions" #. type: table #: doc/guix.texi:12123 msgid "Bad startup file permissions are fatal, for example shared TLS certificate and key files with world-read permissions." -msgstr "" +msgstr "Les mauvaises permissions des fichiers de démarrage sont fatales, par exemple un certificat TLS et des fichiers de clefs avec des permissions permettant la lecture à tout le monde." #. type: deftypevr #: doc/guix.texi:12126 msgid "Defaults to @samp{\"all -browse\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"all -browse\"}." #. type: deftypevr #: doc/guix.texi:12128 #, no-wrap msgid "{@code{files-configuration} parameter} boolean file-device?" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} boolean file-device?" #. type: deftypevr #: doc/guix.texi:12131 msgid "Specifies whether the file pseudo-device can be used for new printer queues. The URI @uref{file:///dev/null} is always allowed." -msgstr "" +msgstr "Spécifie si le fichier de pseudo-périphérique peut être utilisé pour de nouvelles queues d'impression. L'URI @uref{file:///dev/null} est toujours permise." #. type: deftypevr #: doc/guix.texi:12133 doc/guix.texi:12203 doc/guix.texi:12239 @@ -21882,260 +22236,260 @@ msgstr "" #: doc/guix.texi:19842 doc/guix.texi:19850 doc/guix.texi:19858 #: doc/guix.texi:19866 doc/guix.texi:19874 doc/guix.texi:19881 msgid "Defaults to @samp{#f}." -msgstr "" +msgstr "La valeur par défaut est @samp{#f}." #. type: deftypevr #: doc/guix.texi:12135 #, no-wrap msgid "{@code{files-configuration} parameter} string group" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} string group" #. type: deftypevr #: doc/guix.texi:12138 msgid "Specifies the group name or ID that will be used when executing external programs." -msgstr "" +msgstr "Spécifie le nom ou l'ID du groupe qui sera utilisé lors de l'exécution de programmes externes." #. type: deftypevr #: doc/guix.texi:12140 doc/guix.texi:12220 msgid "Defaults to @samp{\"lp\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"lp\"}." #. type: deftypevr #: doc/guix.texi:12142 #, no-wrap msgid "{@code{files-configuration} parameter} string log-file-perm" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} string log-file-perm" #. type: deftypevr #: doc/guix.texi:12144 msgid "Specifies the permissions for all log files that the scheduler writes." -msgstr "" +msgstr "Spécifie les permissions pour tous les fichiers de journal que l'ordonnanceur écrit." #. type: deftypevr #: doc/guix.texi:12146 msgid "Defaults to @samp{\"0644\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"0644\"}." #. type: deftypevr #: doc/guix.texi:12148 #, no-wrap msgid "{@code{files-configuration} parameter} log-location page-log" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} log-location page-log" #. type: deftypevr #: doc/guix.texi:12156 msgid "Defines the page 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-page_log}." -msgstr "" +msgstr "Définit le fichier de journal de page. Spécifier un nom de fichier vide désactive la génération de journaux de pages. La valeur @code{stderr} fait que les entrées du journal seront envoyés sur l'erreur standard lorsque l'ordonnanceur est lancé au premier plan ou vers le démon de journal système lorsqu'il tourne en tache de fond. La valeur @code{syslog} fait que les entrées du journal sont envoyées au démon de journalisation du système. Le nom du serveur peut être inclus dans les noms de fichiers avec la chaîne @code{%s}, comme dans @code{/var/log/cups/%s-page_log}." #. type: deftypevr #: doc/guix.texi:12158 msgid "Defaults to @samp{\"/var/log/cups/page_log\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/var/log/cups/page_log\"}." #. type: deftypevr #: doc/guix.texi:12160 #, no-wrap msgid "{@code{files-configuration} parameter} string remote-root" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} string remote-root" #. type: deftypevr #: doc/guix.texi:12163 msgid "Specifies the username that is associated with unauthenticated accesses by clients claiming to be the root user. The default is @code{remroot}." -msgstr "" +msgstr "Spécifie le nom d'utilisateur associé aux accès non authentifiés par des clients qui se disent être l'utilisateur root. La valeur par défaut est @code{remroot}." #. type: deftypevr #: doc/guix.texi:12165 msgid "Defaults to @samp{\"remroot\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"remroot\"}." #. type: deftypevr #: doc/guix.texi:12167 #, no-wrap msgid "{@code{files-configuration} parameter} file-name request-root" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} file-name request-root" #. type: deftypevr #: doc/guix.texi:12170 msgid "Specifies the directory that contains print jobs and other HTTP request data." -msgstr "" +msgstr "Spécifie le répertoire qui contient les travaux d'impression et d'autres données des requêtes HTTP." #. type: deftypevr #: doc/guix.texi:12172 msgid "Defaults to @samp{\"/var/spool/cups\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/var/spool/cups\"}." #. type: deftypevr #: doc/guix.texi:12174 #, no-wrap msgid "{@code{files-configuration} parameter} sandboxing sandboxing" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} sandboxing sandboxing" #. type: deftypevr #: doc/guix.texi:12179 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 "" +msgstr "Spécifie le niveau d'isolation de sécurité appliqué aux filtres d'impression, aux moteurs et aux autres processus fils de l'ordonnanceur ; soit @code{relaxed} soit @code{strict}. Cette directive n'est actuellement utilisée et supportée que sur macOS." #. type: deftypevr #: doc/guix.texi:12181 msgid "Defaults to @samp{strict}." -msgstr "" +msgstr "La valeur par défaut est @samp{strict}." #. type: deftypevr #: doc/guix.texi:12183 #, no-wrap msgid "{@code{files-configuration} parameter} file-name server-keychain" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} file-name server-keychain" #. type: deftypevr #: doc/guix.texi:12188 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 "" +msgstr "Spécifie l'emplacement des certifications TLS et des clefs privées. CUPS cherchera les clefs publiques et privées dans ce répertoire : un fichier @code{.crt} pour un certificat encodé en PEM et le fichier @code{.key} correspondant pour la clef privée encodée en PEM." #. type: deftypevr #: doc/guix.texi:12190 msgid "Defaults to @samp{\"/etc/cups/ssl\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/etc/cups/ssl\"}." #. type: deftypevr #: doc/guix.texi:12192 #, no-wrap msgid "{@code{files-configuration} parameter} file-name server-root" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} file-name server-root" #. type: deftypevr #: doc/guix.texi:12194 msgid "Specifies the directory containing the server configuration files." -msgstr "" +msgstr "Spécifie le répertoire contenant les fichiers de configuration du serveur." #. type: deftypevr #: doc/guix.texi:12196 msgid "Defaults to @samp{\"/etc/cups\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/etc/cups\"}." #. type: deftypevr #: doc/guix.texi:12198 #, no-wrap msgid "{@code{files-configuration} parameter} boolean sync-on-close?" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} boolean sync-on-close?" #. type: deftypevr #: doc/guix.texi:12201 msgid "Specifies whether the scheduler calls fsync(2) after writing configuration or state files." -msgstr "" +msgstr "Spécifie si l'ordonnanceur appelle fsync(2) après avoir écrit la configuration ou les fichiers d'état." #. type: deftypevr #: doc/guix.texi:12205 #, no-wrap msgid "{@code{files-configuration} parameter} space-separated-string-list system-group" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} space-separated-string-list system-group" #. type: deftypevr #: doc/guix.texi:12207 msgid "Specifies the group(s) to use for @code{@@SYSTEM} group authentication." -msgstr "" +msgstr "Spécifie le groupe ou les groupes à utiliser pour l'authentification du groupe @code{@@SYSTEM}." #. type: deftypevr #: doc/guix.texi:12209 #, no-wrap msgid "{@code{files-configuration} parameter} file-name temp-dir" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} file-name temp-dir" #. type: deftypevr #: doc/guix.texi:12211 msgid "Specifies the directory where temporary files are stored." -msgstr "" +msgstr "Spécifie le répertoire où les fichiers temporaires sont stockés." #. type: deftypevr #: doc/guix.texi:12213 msgid "Defaults to @samp{\"/var/spool/cups/tmp\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/var/spool/cups/tmp\"}." #. type: deftypevr #: doc/guix.texi:12215 #, no-wrap msgid "{@code{files-configuration} parameter} string user" -msgstr "" +msgstr "{paramètre de @code{files-configuration}} string user" #. type: deftypevr #: doc/guix.texi:12218 msgid "Specifies the user name or ID that is used when running external programs." -msgstr "" +msgstr "Spécifie le nom d'utilisateur ou l'ID utilisé pour lancer des programmes externes." #. type: deftypevr #: doc/guix.texi:12223 #, no-wrap msgid "{@code{cups-configuration} parameter} access-log-level access-log-level" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} access-log-level access-log-level" #. type: deftypevr #: doc/guix.texi:12230 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 "" +msgstr "Spécifie le niveau de journalisation pour le fichier AccessLog. Le niveau @code{config} enregistre les ajouts, suppressions et modifications d'imprimantes et de classes et lorsque les fichiers de configuration sont accédés ou mis à jour. Le niveau @code{actions} enregistre la soumission, la suspension, la libération, la modification et l'annulation des travaux et toutes les conditions de @code{config}. Le niveau @code{all} enregistre toutes les requêtes." #. type: deftypevr #: doc/guix.texi:12232 msgid "Defaults to @samp{actions}." -msgstr "" +msgstr "La valeur par défaut est @samp{actions}." #. type: deftypevr #: doc/guix.texi:12234 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean auto-purge-jobs?" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} boolean auto-purge-jobs?" #. type: deftypevr #: doc/guix.texi:12237 msgid "Specifies whether to purge job history data automatically when it is no longer required for quotas." -msgstr "" +msgstr "Spécifie s'il faut vider l'historique des travaux automatiquement lorsqu'il n'est plus nécessaire pour les quotas." #. type: deftypevr #: doc/guix.texi:12241 #, no-wrap msgid "{@code{cups-configuration} parameter} browse-local-protocols browse-local-protocols" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} browse-local-protocols browse-local-protocols" #. type: deftypevr #: doc/guix.texi:12243 msgid "Specifies which protocols to use for local printer sharing." -msgstr "" +msgstr "Spécifie les protocoles à utiliser pour partager les imprimantes sur le réseau local." #. type: deftypevr #: doc/guix.texi:12245 msgid "Defaults to @samp{dnssd}." -msgstr "" +msgstr "La valeur par défaut est @samp{dnssd}." #. type: deftypevr #: doc/guix.texi:12247 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean browse-web-if?" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} boolean browse-web-if?" #. type: deftypevr #: doc/guix.texi:12249 msgid "Specifies whether the CUPS web interface is advertised." -msgstr "" +msgstr "Spécifie si l'interface web de CUPS est publiée." #. type: deftypevr #: doc/guix.texi:12253 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean browsing?" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} boolean browsing?" #. type: deftypevr #: doc/guix.texi:12255 msgid "Specifies whether shared printers are advertised." -msgstr "" +msgstr "Spécifie si les imprimantes partagées sont publiées." #. type: deftypevr #: doc/guix.texi:12259 #, no-wrap msgid "{@code{cups-configuration} parameter} string classification" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} string classification" #. type: deftypevr #: doc/guix.texi:12264 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 "" +msgstr "Spécifie la classification de sécurité du serveur. N'importe quel nom de bannière peut être utilisé, comme « classifié », « confidentiel », « secret », « top secret » et « déclassifié » ou la bannière peut être omise pour désactiver les fonctions d'impression sécurisées." #. type: deftypevr #: doc/guix.texi:12266 doc/guix.texi:12603 doc/guix.texi:14019 @@ -22157,109 +22511,109 @@ msgstr "" #: doc/guix.texi:19935 doc/guix.texi:19942 doc/guix.texi:19949 #: doc/guix.texi:19957 doc/guix.texi:19965 msgid "Defaults to @samp{\"\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:12268 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean classify-override?" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} boolean classify-override?" #. type: deftypevr #: doc/guix.texi:12271 msgid "Specifies whether users may override the classification (cover page) of individual print jobs using the @code{job-sheets} option." -msgstr "" +msgstr "Spécifie si les utilisateurs peuvent remplacer la classification (page de couverture) des travaux d'impression individuels avec l'option @code{job-sheets}." #. type: deftypevr #: doc/guix.texi:12275 #, no-wrap msgid "{@code{cups-configuration} parameter} default-auth-type default-auth-type" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} default-auth-type default-auth-type" #. type: deftypevr #: doc/guix.texi:12277 msgid "Specifies the default type of authentication to use." -msgstr "" +msgstr "Spécifie le type d'authentification par défaut à utiliser." #. type: deftypevr #: doc/guix.texi:12279 msgid "Defaults to @samp{Basic}." -msgstr "" +msgstr "La valeur par défaut est @samp{Basic}." #. type: deftypevr #: doc/guix.texi:12281 #, no-wrap msgid "{@code{cups-configuration} parameter} default-encryption default-encryption" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} default-encryption default-encryption" #. type: deftypevr #: doc/guix.texi:12283 msgid "Specifies whether encryption will be used for authenticated requests." -msgstr "" +msgstr "Spécifie si le chiffrement sera utilisé pour les requêtes authentifiées." #. type: deftypevr #: doc/guix.texi:12285 msgid "Defaults to @samp{Required}." -msgstr "" +msgstr "La valeur par défaut est @samp{Required}." #. type: deftypevr #: doc/guix.texi:12287 #, no-wrap msgid "{@code{cups-configuration} parameter} string default-language" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} string default-language" #. type: deftypevr #: doc/guix.texi:12289 msgid "Specifies the default language to use for text and web content." -msgstr "" +msgstr "Spécifie la langue par défaut à utiliser pour le contenu textuel et web." #. type: deftypevr #: doc/guix.texi:12291 msgid "Defaults to @samp{\"en\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"en\"}." #. type: deftypevr #: doc/guix.texi:12293 #, no-wrap msgid "{@code{cups-configuration} parameter} string default-paper-size" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} string default-paper-size" #. type: deftypevr #: doc/guix.texi:12298 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 "" +msgstr "Spécifie la taille de papier par défaut pour les nouvelles queues d'impression. @samp{\"Auto\"} utilise la valeur par défaut du paramètre de régionalisation, tandis que @samp{\"None\"} spécifie qu'il n'y a pas de taille par défaut. Des noms de tailles spécifique sont par exemple @samp{\"Letter\"} et @samp{\"A4\"}." #. type: deftypevr #: doc/guix.texi:12300 msgid "Defaults to @samp{\"Auto\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"Auto\"}." #. type: deftypevr #: doc/guix.texi:12302 #, no-wrap msgid "{@code{cups-configuration} parameter} string default-policy" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} string default-policy" #. type: deftypevr #: doc/guix.texi:12304 msgid "Specifies the default access policy to use." -msgstr "" +msgstr "Spécifie la politique d'accès par défaut à utiliser." #. type: deftypevr #: doc/guix.texi:12306 msgid "Defaults to @samp{\"default\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"default\"}." #. type: deftypevr #: doc/guix.texi:12308 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean default-shared?" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} boolean default-shared?" #. type: deftypevr #: doc/guix.texi:12310 msgid "Specifies whether local printers are shared by default." -msgstr "" +msgstr "Spécifie si les imprimantes locales sont partagées par défaut." #. type: deftypevr #: doc/guix.texi:12312 doc/guix.texi:12392 doc/guix.texi:12688 @@ -22271,51 +22625,51 @@ msgstr "" #: doc/guix.texi:18025 doc/guix.texi:18165 doc/guix.texi:19198 #: doc/guix.texi:19286 doc/guix.texi:19302 doc/guix.texi:19352 msgid "Defaults to @samp{#t}." -msgstr "" +msgstr "La valeur par défaut est @samp{#t}." #. type: deftypevr #: doc/guix.texi:12314 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer dirty-clean-interval" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer dirty-clean-interval" #. type: deftypevr #: doc/guix.texi:12318 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 "" +msgstr "Spécifie le délai pour mettre à jour les fichiers de configuration et d'état. Une valeur de 0 fait que la mise à jour arrive aussi vite que possible, typiquement en quelques millisecondes." #. type: deftypevr #: doc/guix.texi:12320 doc/guix.texi:12368 doc/guix.texi:12377 #: doc/guix.texi:12398 doc/guix.texi:12695 msgid "Defaults to @samp{30}." -msgstr "" +msgstr "La valeur par défaut est @samp{30}." #. type: deftypevr #: doc/guix.texi:12322 #, no-wrap msgid "{@code{cups-configuration} parameter} error-policy error-policy" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} error-policy error-policy" #. type: deftypevr #: doc/guix.texi:12328 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-this-job}, which retries the failed job immediately; and @code{stop-printer}, which stops the printer." -msgstr "" +msgstr "Spécifie ce qu'il faut faire si une erreur a lieu. Les valeurs possibles sont @code{abort-job}, qui supprimera les travaux d'impression en échec ; @code{retry-job}, qui tentera de nouveau l'impression plus tard ; @code{retry-this-job}, qui retentera l'impression immédiatement ; et @code{stop-printer} qui arrête l'imprimante." #. type: deftypevr #: doc/guix.texi:12330 msgid "Defaults to @samp{stop-printer}." -msgstr "" +msgstr "La valeur par défaut est @samp{stop-printer}." #. type: deftypevr #: doc/guix.texi:12332 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer filter-limit" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer filter-limit" #. type: deftypevr #: doc/guix.texi:12340 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 "" +msgstr "Spécifie le coût maximum des filtres qui sont lancés en même temps, pour minimiser les problèmes de ressources de disque, de mémoire et de CPU. Une limite de 0 désactive la limite de filtrage. Une impression standard vers une imprimante non-PostScript requirt une limite de filtre d'environ 200. Une imprimante PostScript requiert environ la moitié (100). Mettre en place la limite en dessous de ces valeurs limitera l'ordonnanceur à un seul travail d'impression à la fois." #. type: deftypevr #: doc/guix.texi:12342 doc/guix.texi:12350 doc/guix.texi:12405 @@ -22324,62 +22678,62 @@ msgstr "" #: doc/guix.texi:17938 doc/guix.texi:19191 doc/guix.texi:19491 #: doc/guix.texi:19665 msgid "Defaults to @samp{0}." -msgstr "" +msgstr "La valeur par défaut est @samp{0}." #. type: deftypevr #: doc/guix.texi:12344 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer filter-nice" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer filter-nice" #. type: deftypevr #: doc/guix.texi:12348 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 "" +msgstr "Spécifie la priorité des filtres de l'ordonnanceur qui sont lancés pour imprimer un travail. La valeur va de 0, la plus grande priorité, à 19, la plus basse priorité." #. type: deftypevr #: doc/guix.texi:12352 #, no-wrap msgid "{@code{cups-configuration} parameter} host-name-lookups host-name-lookups" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} host-name-lookups host-name-lookups" #. type: deftypevr #: doc/guix.texi:12359 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 "" +msgstr "Spécifie s'il faut faire des résolutions inverses sur les clients qui se connectent. Le paramètre @code{double} fait que @code{cupsd} vérifie que le nom d'hôte résolu depuis l'adresse correspond à l'une des adresses renvoyées par ce nom d'hôte. Les résolutions doubles évitent aussi que des clients avec des adresses non enregistrées ne s'adressent à votre serveur. N'initialisez cette valeur qu'à @code{#t} ou @code{double} que si c'est absolument nécessaire." #. type: deftypevr #: doc/guix.texi:12363 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer job-kill-delay" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer job-kill-delay" #. type: deftypevr #: doc/guix.texi:12366 msgid "Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job." -msgstr "" +msgstr "Spécifie le nombre de secondes à attendre avant de tuer les filtres et les moteurs associés avec un travail annulé ou suspendu." #. type: deftypevr #: doc/guix.texi:12370 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-interval" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer job-retry-interval" #. type: deftypevr #: doc/guix.texi:12375 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 "" +msgstr "Spécifie l'intervalle des nouvelles tentatives en secondes. C'est typiquement utilisé pour les queues de fax mais peut aussi être utilisé avec des queues d'impressions normales dont la politique d'erreur est @code{retry-job} ou @code{retry-current-job}." #. type: deftypevr #: doc/guix.texi:12379 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-limit" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer job-retry-limit" #. type: deftypevr #: doc/guix.texi:12384 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 "" +msgstr "Spécifie le nombre de nouvelles tentatives pour les travaux. C'est typiquement utilisé pour les queues de fax mais peut aussi être utilisé pour les queues d'impressions dont la politique d'erreur est @code{retry-job} ou @code{retry-current-job}." #. type: deftypevr #: doc/guix.texi:12386 doc/guix.texi:18417 doc/guix.texi:18437 @@ -22389,105 +22743,105 @@ msgstr "" #: doc/guix.texi:18688 doc/guix.texi:19143 doc/guix.texi:19151 #: doc/guix.texi:19159 doc/guix.texi:19183 msgid "Defaults to @samp{5}." -msgstr "" +msgstr "La valeur par défaut est @samp{5}." #. type: deftypevr #: doc/guix.texi:12388 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean keep-alive?" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} boolean keep-alive?" #. type: deftypevr #: doc/guix.texi:12390 msgid "Specifies whether to support HTTP keep-alive connections." -msgstr "" +msgstr "Spécifie s'il faut supporter les connexion HTTP keep-alive." #. type: deftypevr #: doc/guix.texi:12394 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer keep-alive-timeout" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer keep-alive-timeout" #. type: deftypevr #: doc/guix.texi:12396 msgid "Specifies how long an idle client connection remains open, in seconds." -msgstr "" +msgstr "Spécifie combien de temps les connexions inactives avec les clients restent ouvertes, en secondes." #. type: deftypevr #: doc/guix.texi:12400 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer limit-request-body" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer limit-request-body" #. type: deftypevr #: doc/guix.texi:12403 msgid "Specifies the maximum size of print files, IPP requests, and HTML form data. A limit of 0 disables the limit check." -msgstr "" +msgstr "Spécifie la taille maximale des fichiers à imprimer, des requêtes IPP et des données de formulaires HTML. Une limite de 0 désactive la vérification de la limite." #. type: deftypevr #: doc/guix.texi:12407 #, no-wrap msgid "{@code{cups-configuration} parameter} multiline-string-list listen" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} multiline-string-list listen" #. type: deftypevr #: doc/guix.texi:12414 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 "" +msgstr "Écoute sur les interfaces spécifiées. Les valeurs valides sont de la forme @var{adresse}:@var{port}, où @var{adresse} est sotit une daresse IPv6 dans des crochets, soit une adresse IPv4, soit @code{*} pour indiquer toutes les adresses. Les valeurs peuvent aussi être des noms de fichiers de socket UNIX domain. La directive Listen est similaire à la directive Port mais vous permet de restreindre l'accès à des interfaces ou des réseaux spécifiques." #. type: deftypevr #: doc/guix.texi:12416 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer listen-back-log" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer listen-back-log" #. type: deftypevr #: doc/guix.texi:12423 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 "" +msgstr "Spécifie le nombre de connexions en attente qui seront permises. Ça n'affecte normalement que les serveurs très actifs qui ont atteint la limite MaxClients, mais peut aussi être déclenché par un grand nombre de connexions simultanées. Lorsque la limite est atteinte, le système d'exploitation refusera les connexions supplémentaires jusqu'à ce que l'ordonnanceur accepte les connexions en attente." #. type: deftypevr #: doc/guix.texi:12425 msgid "Defaults to @samp{128}." -msgstr "" +msgstr "La valeur par défaut est @samp{128}." #. type: deftypevr #: doc/guix.texi:12427 #, no-wrap msgid "{@code{cups-configuration} parameter} location-access-control-list location-access-controls" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} location-access-control-list location-access-controls" #. type: deftypevr #: doc/guix.texi:12429 msgid "Specifies a set of additional access controls." -msgstr "" +msgstr "Spécifie un ensemble de contrôles d'accès supplémentaires." #. type: deftypevr #: doc/guix.texi:12431 msgid "Available @code{location-access-controls} fields are:" -msgstr "" +msgstr "Les champs de @code{location-access-controls} disponibles sont :" #. type: deftypevr #: doc/guix.texi:12432 #, no-wrap msgid "{@code{location-access-controls} parameter} file-name path" -msgstr "" +msgstr "{paramètre de @code{location-access-controls}} file-name path" #. type: deftypevr #: doc/guix.texi:12434 msgid "Specifies the URI path to which the access control applies." -msgstr "" +msgstr "Spécifie le chemin d'URI auquel les contrôles d'accès s'appliquent." #. type: deftypevr #: doc/guix.texi:12436 #, no-wrap msgid "{@code{location-access-controls} parameter} access-control-list access-controls" -msgstr "" +msgstr "{paramètre de @code{location-access-controls}} access-control-list access-controls" #. type: deftypevr #: doc/guix.texi:12439 msgid "Access controls for all access to this path, in the same format as the @code{access-controls} of @code{operation-access-control}." -msgstr "" +msgstr "Les contrôles d'accès pour tous les accès à ce chemin, dans le même format que le champ @code{access-controls} de @code{operation-access-control}." #. type: deftypevr #: doc/guix.texi:12441 doc/guix.texi:12447 doc/guix.texi:12461 @@ -22499,679 +22853,679 @@ msgstr "" #: doc/guix.texi:19727 doc/guix.texi:19735 doc/guix.texi:19771 #: doc/guix.texi:19921 doc/guix.texi:19972 doc/guix.texi:19981 msgid "Defaults to @samp{()}." -msgstr "" +msgstr "La valeur par défaut est @samp{()}." #. type: deftypevr #: doc/guix.texi:12443 #, no-wrap msgid "{@code{location-access-controls} parameter} method-access-control-list method-access-controls" -msgstr "" +msgstr "{paramètre de @code{location-access-controls}} method-access-control-list method-access-controls" #. type: deftypevr #: doc/guix.texi:12445 msgid "Access controls for method-specific access to this path." -msgstr "" +msgstr "Contrôles d'accès pour les accès spécifiques à la méthode à ce chemin." #. type: deftypevr #: doc/guix.texi:12449 msgid "Available @code{method-access-controls} fields are:" -msgstr "" +msgstr "Les champs de @code{method-access-controls} disponibles sont :" #. type: deftypevr #: doc/guix.texi:12450 #, no-wrap msgid "{@code{method-access-controls} parameter} boolean reverse?" -msgstr "" +msgstr "{paramètre de @code{method-access-controls}} boolean reverse?" #. type: deftypevr #: doc/guix.texi:12453 msgid "If @code{#t}, apply access controls to all methods except the listed methods. Otherwise apply to only the listed methods." -msgstr "" +msgstr "Si la valeur est @code{#t}, applique les contrôles d'accès à toutes les méthodes sauf les méthodes listées. Sinon, applique le contrôle uniquement aux méthodes listées." #. type: deftypevr #: doc/guix.texi:12457 #, no-wrap msgid "{@code{method-access-controls} parameter} method-list methods" -msgstr "" +msgstr "{paramètre de @code{method-access-controls}} method-list methods" #. type: deftypevr #: doc/guix.texi:12459 msgid "Methods to which this access control applies." -msgstr "" +msgstr "Les méthodes auxquelles ce contrôle d'accès s'applique." #. type: deftypevr #: doc/guix.texi:12463 #, no-wrap msgid "{@code{method-access-controls} parameter} access-control-list access-controls" -msgstr "" +msgstr "{paramètre de @code{method-access-controls}} access-control-list access-controls" #. type: deftypevr #: doc/guix.texi:12466 msgid "Access control directives, as a list of strings. Each string should be one directive, such as \"Order allow,deny\"." -msgstr "" +msgstr "Directives de contrôle d'accès, comme une liste de chaînes de caractères. Chaque chaîne devrait être une directive, comme « Order allow, deny »." #. type: deftypevr #: doc/guix.texi:12472 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer log-debug-history" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer log-debug-history" #. type: deftypevr #: doc/guix.texi:12476 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 "" +msgstr "Spécifie le nombre de messages de débogage qui sont retenu pour la journalisation si une erreur arrive dans un travail d'impression. Les messages de débogage sont journalisés indépendamment du paramètre LogLevel." #. type: deftypevr #: doc/guix.texi:12478 doc/guix.texi:12499 doc/guix.texi:12506 #: doc/guix.texi:14369 doc/guix.texi:17291 msgid "Defaults to @samp{100}." -msgstr "" +msgstr "La valeur par défaut est @samp{100}." #. type: deftypevr #: doc/guix.texi:12480 #, no-wrap msgid "{@code{cups-configuration} parameter} log-level log-level" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} log-level log-level" #. type: deftypevr #: doc/guix.texi:12483 msgid "Specifies the level of logging for the ErrorLog file. The value @code{none} stops all logging while @code{debug2} logs everything." -msgstr "" +msgstr "Spécifie le niveau de journalisation du fichier ErrorLog. La valeur @code{none} arrête toute journalisation alors que que @code{debug2} enregistre tout." #. type: deftypevr #: doc/guix.texi:12485 msgid "Defaults to @samp{info}." -msgstr "" +msgstr "La valeur par défaut est @samp{info}." #. type: deftypevr #: doc/guix.texi:12487 #, no-wrap msgid "{@code{cups-configuration} parameter} log-time-format log-time-format" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} log-time-format log-time-format" #. type: deftypevr #: doc/guix.texi:12490 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 "" +msgstr "Spécifie le format de la date et de l'heure dans les fichiers de journaux. La valeur @code{standard} enregistre les secondes entières alors que @code{usecs} enregistre les microsecondes." #. type: deftypevr #: doc/guix.texi:12492 msgid "Defaults to @samp{standard}." -msgstr "" +msgstr "La valeur par défaut est @samp{standard}." #. type: deftypevr #: doc/guix.texi:12494 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-clients" #. type: deftypevr #: doc/guix.texi:12497 msgid "Specifies the maximum number of simultaneous clients that are allowed by the scheduler." -msgstr "" +msgstr "Spécifie le nombre maximum de clients simultanés qui sont autorisés par l'ordonnanceur." #. type: deftypevr #: doc/guix.texi:12501 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients-per-host" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-clients-per-host" #. type: deftypevr #: doc/guix.texi:12504 msgid "Specifies the maximum number of simultaneous clients that are allowed from a single address." -msgstr "" +msgstr "Spécifie le nombre maximum de clients simultanés permis depuis une même adresse." #. type: deftypevr #: doc/guix.texi:12508 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-copies" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-copies" #. type: deftypevr #: doc/guix.texi:12511 msgid "Specifies the maximum number of copies that a user can print of each job." -msgstr "" +msgstr "Spécifie le nombre maximum de copies qu'un utilisateur peut imprimer pour chaque travail." #. type: deftypevr #: doc/guix.texi:12513 msgid "Defaults to @samp{9999}." -msgstr "" +msgstr "La valeur par défaut est @samp{9999}." #. type: deftypevr #: doc/guix.texi:12515 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-hold-time" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-hold-time" #. type: deftypevr #: doc/guix.texi:12519 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 "" +msgstr "Spécifie la durée maximum qu'un travail peut rester dans l'état de suspension @code{indefinite} avant qu'il ne soit annulé. La valeur 0 désactive l'annulation des travaux suspendus." #. type: deftypevr #: doc/guix.texi:12523 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-jobs" #. type: deftypevr #: doc/guix.texi:12526 msgid "Specifies the maximum number of simultaneous jobs that are allowed. Set to 0 to allow an unlimited number of jobs." -msgstr "" +msgstr "Spécifie le nombre maximum de travaux simultanés autorisés. La valeur 0 permet un nombre illimité de travaux." #. type: deftypevr #: doc/guix.texi:12528 msgid "Defaults to @samp{500}." -msgstr "" +msgstr "La valeur par défaut est @samp{500}." #. type: deftypevr #: doc/guix.texi:12530 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-printer" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-jobs-per-printer" #. type: deftypevr #: doc/guix.texi:12533 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 "" +msgstr "Spécifie le nombre maximum de travaux simultanés autorisés par imprimante. La valeur 0 permet au plus MaxJobs travaux par imprimante." #. type: deftypevr #: doc/guix.texi:12537 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-user" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-jobs-per-user" #. type: deftypevr #: doc/guix.texi:12540 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 "" +msgstr "Spécifie le nombre maximum de travaux simultanés permis par utilisateur. La valeur 0 permet au plus MaxJobs travaux par utilisateur." #. type: deftypevr #: doc/guix.texi:12544 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-job-time" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-job-time" #. type: deftypevr #: doc/guix.texi:12547 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 "" +msgstr "Spécifie la durée maximum qu'un travail peut prendre avant qu'il ne soit annulé, en secondes. Indiquez 0 pour désactiver l'annulation des travaux « coincés »." #. type: deftypevr #: doc/guix.texi:12549 msgid "Defaults to @samp{10800}." -msgstr "" +msgstr "La valeur par défaut est @samp{10800}." #. type: deftypevr #: doc/guix.texi:12551 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer max-log-size" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-log-size" #. type: deftypevr #: doc/guix.texi:12554 msgid "Specifies the maximum size of the log files before they are rotated, in bytes. The value 0 disables log rotation." -msgstr "" +msgstr "Spécifie la taille maximale des fichiers de journaux avant qu'on ne les fasse tourner, en octets. La valeur 0 désactive la rotation." #. type: deftypevr #: doc/guix.texi:12556 msgid "Defaults to @samp{1048576}." -msgstr "" +msgstr "La valeur par défaut est @samp{1048576}." #. type: deftypevr #: doc/guix.texi:12558 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer multiple-operation-timeout" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer multiple-operation-timeout" #. type: deftypevr #: doc/guix.texi:12561 msgid "Specifies the maximum amount of time to allow between files in a multiple file print job, in seconds." -msgstr "" +msgstr "Spécifie la durée maximale à permettre entre les fichiers d'un travail en contenant plusieurs, en secondes." #. type: deftypevr #: doc/guix.texi:12563 doc/guix.texi:12777 msgid "Defaults to @samp{300}." -msgstr "" +msgstr "La valeur par défaut est @samp{300}." #. type: deftypevr #: doc/guix.texi:12565 #, no-wrap msgid "{@code{cups-configuration} parameter} string page-log-format" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} string page-log-format" #. type: deftypevr #: doc/guix.texi:12570 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 "" +msgstr "Spécifie le format des lignes PageLog. Les séquences qui commencent par un pourcent (@samp{%}) sont remplacées par l'information correspondante, tandis que les autres caractères sont copiés littéralement. Les séquences pourcent suivantes sont reconnues :" #. type: item #: doc/guix.texi:12572 #, no-wrap msgid "%%" -msgstr "" +msgstr "%%" #. type: table #: doc/guix.texi:12574 msgid "insert a single percent character" -msgstr "" +msgstr "insère un seul caractères pourcent" #. type: item #: doc/guix.texi:12575 #, no-wrap msgid "%@{name@}" -msgstr "" +msgstr "%@{name@}" #. type: table #: doc/guix.texi:12577 msgid "insert the value of the specified IPP attribute" -msgstr "" +msgstr "insère la valeur de l'attribut IPP spécifié" #. type: item #: doc/guix.texi:12578 #, no-wrap msgid "%C" -msgstr "" +msgstr "%C" #. type: table #: doc/guix.texi:12580 msgid "insert the number of copies for the current page" -msgstr "" +msgstr "insère le nombre de copies pour la page actuelle" #. type: item #: doc/guix.texi:12581 #, no-wrap msgid "%P" -msgstr "" +msgstr "%P" #. type: table #: doc/guix.texi:12583 msgid "insert the current page number" -msgstr "" +msgstr "insère le numéro de page actuelle" #. type: item #: doc/guix.texi:12584 #, no-wrap msgid "%T" -msgstr "" +msgstr "%T" #. type: table #: doc/guix.texi:12586 msgid "insert the current date and time in common log format" -msgstr "" +msgstr "insère la date et l'heure actuelle dans un format de journal commun" #. type: item #: doc/guix.texi:12587 #, no-wrap msgid "%j" -msgstr "" +msgstr "%j" #. type: table #: doc/guix.texi:12589 msgid "insert the job ID" -msgstr "" +msgstr "insère l'ID du travail" #. type: item #: doc/guix.texi:12590 doc/guix.texi:13979 #, no-wrap msgid "%p" -msgstr "" +msgstr "%p" #. type: table #: doc/guix.texi:12592 msgid "insert the printer name" -msgstr "" +msgstr "insère le nom de l'imprimante" #. type: item #: doc/guix.texi:12593 doc/guix.texi:14002 #, no-wrap msgid "%u" -msgstr "" +msgstr "%u" #. type: table #: doc/guix.texi:12595 msgid "insert the username" -msgstr "" +msgstr "insère le nom d'utilisateur" #. type: deftypevr #: doc/guix.texi:12601 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 "" +msgstr "Si la valeur est la chaîne vide, le PageLog est désactivée. La chaîne @code{%p %u %j %T %P %C %@{job-billing@} %@{job-originating-host-name@} %@{job-name@} %@{media@} %@{sides@}} crée un PageLog avec les entrées standards." #. type: deftypevr #: doc/guix.texi:12605 #, no-wrap msgid "{@code{cups-configuration} parameter} environment-variables environment-variables" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} environment-variables environment-variables" #. type: deftypevr #: doc/guix.texi:12608 msgid "Passes the specified environment variable(s) to child processes; a list of strings." -msgstr "" +msgstr "Passe les variables d'environnement spécifiées aux processus fils ; une liste de chaînes de caractères." #. type: deftypevr #: doc/guix.texi:12612 #, no-wrap msgid "{@code{cups-configuration} parameter} policy-configuration-list policies" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} policy-configuration-list policies" #. type: deftypevr #: doc/guix.texi:12614 msgid "Specifies named access control policies." -msgstr "" +msgstr "Spécifie des politiques de contrôle d'accès nommées." #. type: deftypevr #: doc/guix.texi:12616 msgid "Available @code{policy-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{policy-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:12617 #, no-wrap msgid "{@code{policy-configuration} parameter} string name" -msgstr "" +msgstr "{paramètre de @code{policy-configuration}} string name" #. type: deftypevr #: doc/guix.texi:12619 msgid "Name of the policy." -msgstr "" +msgstr "Nom de la politique." #. type: deftypevr #: doc/guix.texi:12621 #, no-wrap msgid "{@code{policy-configuration} parameter} string job-private-access" -msgstr "" +msgstr "{paramètre de @code{policy-configuration}} string job-private-access" #. type: deftypevr #: doc/guix.texi:12631 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 "" +msgstr "Spécifie une liste d'accès pour les valeurs privées du travail. @code{@@ACL} correspond aux valeurs requesting-user-name-allowed ou requesting-user-name-denied de l'imprimante. @code{@@OWNER} correspond au propriétaire du travail. @code{@@SYSTEM} correspond aux groupes listés dans le champ @code{system-group} de la configuration @code{files-config}, qui est réifié dans le fichier @code{cups-files.conf(5)}. Les autres éléments possibles de la liste d'accès sont des noms d'utilisateurs spécifiques et @code{@@@var{group}} pour indiquer les membres d'un groupe spécifique. La liste d'accès peut aussi être simplement @code{all} ou @code{default}." #. type: deftypevr #: doc/guix.texi:12633 doc/guix.texi:12655 msgid "Defaults to @samp{\"@@OWNER @@SYSTEM\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"@@OWNER @@SYSTEM\"}." #. type: deftypevr #: doc/guix.texi:12635 #, no-wrap msgid "{@code{policy-configuration} parameter} string job-private-values" -msgstr "" +msgstr "{paramètre de @code{policy-configuration}} string job-private-values" #. type: deftypevr #: doc/guix.texi:12638 doc/guix.texi:12660 msgid "Specifies the list of job values to make private, or @code{all}, @code{default}, or @code{none}." -msgstr "" +msgstr "Spécifie la liste des valeurs de travaux à rendre privée, ou @code{all}, @code{default}, ou @code{none}." #. type: deftypevr #: doc/guix.texi:12641 msgid "Defaults to @samp{\"job-name job-originating-host-name job-originating-user-name phone\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"job-name job-originating-host-name job-originating-user-name phone\"}." #. type: deftypevr #: doc/guix.texi:12643 #, no-wrap msgid "{@code{policy-configuration} parameter} string subscription-private-access" -msgstr "" +msgstr "{paramètre de @code{policy-configuration}} string subscription-private-access" #. type: deftypevr #: doc/guix.texi:12653 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 "" +msgstr "Spécifie un liste d'accès pour les valeurs privées de la souscription. @code{@@ACL} correspond aux valeurs requesting-user-name-allowed ou requesting-user-name-denied de l'imprimante. @code{@@OWNER} correspond au propriétaire du travail. @code{@@SYSTEM} correspond aux groupes listés dans le champ @code{system-group} de la configuration @code{files-config}, qui est réifié dans le fichier @code{cups-files.conf(5)}. Les autres éléments possibles de la liste d'accès sont des noms d'utilisateurs spécifiques et @code{@@@var{group}} pour indiquer les membres d'un groupe spécifique. La liste d'accès peut aussi être simplement @code{all} ou @code{default}." #. type: deftypevr #: doc/guix.texi:12657 #, no-wrap msgid "{@code{policy-configuration} parameter} string subscription-private-values" -msgstr "" +msgstr "{paramètre de @code{policy-configuration}} string subscription-private-values" #. type: deftypevr #: doc/guix.texi:12663 msgid "Defaults to @samp{\"notify-events notify-pull-method notify-recipient-uri notify-subscriber-user-name notify-user-data\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"notify-events notify-pull-method notify-recipient-uri notify-subscriber-user-name notify-user-data\"}." #. type: deftypevr #: doc/guix.texi:12665 #, no-wrap msgid "{@code{policy-configuration} parameter} operation-access-control-list access-controls" -msgstr "" +msgstr "{paramètre de @code{policy-configuration}} operation-access-control-list access-controls" #. type: deftypevr #: doc/guix.texi:12667 msgid "Access control by IPP operation." -msgstr "" +msgstr "Contrôle d'accès par les actions IPP." #. type: deftypevr #: doc/guix.texi:12672 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-files" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} boolean-or-non-negative-integer preserve-job-files" #. type: deftypevr #: doc/guix.texi:12677 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 "" +msgstr "Spécifie si les fichiers de travaux (les documents) sont préservés après qu'un travail est imprimé. Si une valeur numérique est spécifiée, les fichiers de travaux sont préservés pour le nombre de secondes indiquées après l'impression. Sinon, une valeur booléenne s'applique indéfiniment." #. type: deftypevr #: doc/guix.texi:12679 msgid "Defaults to @samp{86400}." -msgstr "" +msgstr "La valeur par défaut est @samp{86400}." #. type: deftypevr #: doc/guix.texi:12681 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-history" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} boolean-or-non-negative-integer preserve-job-history" #. type: deftypevr #: doc/guix.texi:12686 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 "" +msgstr "Spécifie si l'historique des travaux est préservé après qu'un travail est imprimé. Si une valeur numérique est spécifiée, l'historique des travaux est préservé pour le nombre de secondes indiquées après l'impression. Si la valeur est @code{#t}, l'historique des travaux est préservé jusqu'à atteindre la limite MaxJobs." #. type: deftypevr #: doc/guix.texi:12690 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer reload-timeout" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer reload-timeout" #. type: deftypevr #: doc/guix.texi:12693 msgid "Specifies the amount of time to wait for job completion before restarting the scheduler." -msgstr "" +msgstr "Spécifie la durée d'attente pour la fin des travaux avant de redémarrer l'ordonnanceur." #. type: deftypevr #: doc/guix.texi:12697 #, no-wrap msgid "{@code{cups-configuration} parameter} string rip-cache" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} string rip-cache" #. type: deftypevr #: doc/guix.texi:12700 msgid "Specifies the maximum amount of memory to use when converting documents into bitmaps for a printer." -msgstr "" +msgstr "Spécifie la quantité de mémoire maximale à utiliser pour convertir des documents en bitmaps pour l'imprimante." #. type: deftypevr #: doc/guix.texi:12702 msgid "Defaults to @samp{\"128m\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"128m\"}." #. type: deftypevr #: doc/guix.texi:12704 #, no-wrap msgid "{@code{cups-configuration} parameter} string server-admin" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} string server-admin" #. type: deftypevr #: doc/guix.texi:12706 msgid "Specifies the email address of the server administrator." -msgstr "" +msgstr "Spécifie l'adresse de courriel de l'administrateur système." #. type: deftypevr #: doc/guix.texi:12708 msgid "Defaults to @samp{\"root@@localhost.localdomain\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"root@@localhost.localdomain\"}." #. type: deftypevr #: doc/guix.texi:12710 #, no-wrap msgid "{@code{cups-configuration} parameter} host-name-list-or-* server-alias" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} host-name-list-or-* server-alias" #. type: deftypevr #: doc/guix.texi:12718 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 "" +msgstr "La directive ServerAlias est utilisée pour la validation des en-tête HTTP Host lorsque les clients se connectent à l'ordonnanceur depuis des interfaces externes. Utiliser le nom spécial @code{*} peut exposer votre système à des attaques connues de recombinaison DNS dans le navigateur, même lorsque vous accédez au site à travers un pare-feu. Si la découverte automatique des autres noms ne fonctionne pas, nous vous recommandons de lister chaque nom alternatif avec une directive SeverAlias plutôt que d'utiliser @code{*}." #. type: deftypevr #: doc/guix.texi:12720 msgid "Defaults to @samp{*}." -msgstr "" +msgstr "La valeur par défaut est @samp{*}." #. type: deftypevr #: doc/guix.texi:12722 #, no-wrap msgid "{@code{cups-configuration} parameter} string server-name" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} string server-name" #. type: deftypevr #: doc/guix.texi:12724 msgid "Specifies the fully-qualified host name of the server." -msgstr "" +msgstr "Spécifie le nom d'hôte pleinement qualifié du serveur." #. type: deftypevr #: doc/guix.texi:12726 msgid "Defaults to @samp{\"localhost\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"localhost\"}." #. type: deftypevr #: doc/guix.texi:12728 #, no-wrap msgid "{@code{cups-configuration} parameter} server-tokens server-tokens" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} server-tokens server-tokens" #. type: deftypevr #: doc/guix.texi:12736 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 "" +msgstr "Spécifie les informations incluses dans les en-têtes Server des réponses HTTP. @code{None} désactive l'en-tête Server. @code{ProductOnly} rapporte @code{CUPS}. @code{Major} rapporte @code{CUPS 2}. @code{Minor} rapporte @code{CUPS 2.0}. @code{Minimal} rapporte @code{CUPS 2.0.0}. @code{OS} rapporte @code{CUPS 2.0.0 (@var{uname})} où @var{uname} est la sortie de la commande @code{uname}. @code{Full} rapporte @code{CUPS 2.0.0 (@var{uname}) IPP/2.0}." #. type: deftypevr #: doc/guix.texi:12738 msgid "Defaults to @samp{Minimal}." -msgstr "" +msgstr "La valeur par défaut est @samp{Minimal}." #. type: deftypevr #: doc/guix.texi:12740 #, no-wrap msgid "{@code{cups-configuration} parameter} string set-env" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} string set-env" #. type: deftypevr #: doc/guix.texi:12742 msgid "Set the specified environment variable to be passed to child processes." -msgstr "" +msgstr "Indique que la variable d'environnement spécifiée doit être passée aux processus fils." #. type: deftypevr #: doc/guix.texi:12744 msgid "Defaults to @samp{\"variable value\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"variable value\"}." #. type: deftypevr #: doc/guix.texi:12746 #, no-wrap msgid "{@code{cups-configuration} parameter} multiline-string-list ssl-listen" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} multiline-string-list ssl-listen" #. type: deftypevr #: doc/guix.texi:12751 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 "" +msgstr "Écoute des connexions chiffrées sur les interfaces spécifiées. Les valeurs valides sont de la forme @var{adresse}:@var{port}, où @var{adresse} est soit une adresse IPv6 dans des crochets, soit une adresse IPv4, soit @code{*} pour indiquer toutes les interfaces." #. type: deftypevr #: doc/guix.texi:12755 #, no-wrap msgid "{@code{cups-configuration} parameter} ssl-options ssl-options" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} ssl-options ssl-options" #. type: deftypevr #: doc/guix.texi:12762 msgid "Sets encryption options. By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites. The @code{AllowRC4} option enables the 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer ones. The @code{AllowSSL3} option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0." -msgstr "" +msgstr "Indique les options de chiffrement. Par défaut, CUPS ne supporte que le chiffrement avec TLS 1.0 ou plus avec des suites de chiffrement connues pour être sures. L'option @code{AllowRC4} active les suites de chiffrement 128-bits RC4, qui sont requises pour certains vieux clients qui n'implémentent pas les nouvelles. L'option @code{AllowSSL3} active SSL v3.0, qui est requis par certains vieux clients qui ne supportent pas TLS v1.0." #. type: deftypevr #: doc/guix.texi:12766 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean strict-conformance?" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} boolean strict-conformance?" #. type: deftypevr #: doc/guix.texi:12769 msgid "Specifies whether the scheduler requires clients to strictly adhere to the IPP specifications." -msgstr "" +msgstr "Spécifie si l'ordonnanceur demande aux clients d'adhérer aux spécifications IPP." #. type: deftypevr #: doc/guix.texi:12773 #, no-wrap msgid "{@code{cups-configuration} parameter} non-negative-integer timeout" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} non-negative-integer timeout" #. type: deftypevr #: doc/guix.texi:12775 msgid "Specifies the HTTP request timeout, in seconds." -msgstr "" +msgstr "Spécifie le délai d'attente des requêtes HTTP, en secondes." #. type: deftypevr #: doc/guix.texi:12780 #, no-wrap msgid "{@code{cups-configuration} parameter} boolean web-interface?" -msgstr "" +msgstr "{paramètre de @code{cups-configuration}} boolean web-interface?" #. type: deftypevr #: doc/guix.texi:12782 msgid "Specifies whether the web interface is enabled." -msgstr "" +msgstr "Spécifie si l'interface web est activée." #. type: Plain text #: doc/guix.texi:12792 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 "" +msgstr "Maintenant, vous vous dîtes peut-être « oh la la, cher manuel de Guix, je t'aime bien mais arrête maintenant avec ces options de configuration »@footnote{NdT : je vous rassure, c'est aussi mon sentiment au moment de traduire ces lignes. Et pour moi, c'est encore loin d'être fini.}. En effet. cependant, encore un point supplémentaire : vous pouvez avoir un fichier @code{cupsd.conf} existant que vous pourriez vouloir utiliser. Dans ce cas, vous pouvez passer un @code{opaque-cups-configuration} en configuration d'un @code{cups-service-type}." #. type: Plain text #: doc/guix.texi:12794 msgid "Available @code{opaque-cups-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{opaque-cups-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:12795 #, no-wrap msgid "{@code{opaque-cups-configuration} parameter} package cups" -msgstr "" +msgstr "{paramètre de @code{opaque-cups-configuration}} package cups" #. type: deftypevr #: doc/guix.texi:12799 #, no-wrap msgid "{@code{opaque-cups-configuration} parameter} string cupsd.conf" -msgstr "" +msgstr "{paramètre de @code{opaque-cups-configuration}} string cupsd.conf" #. type: deftypevr #: doc/guix.texi:12801 msgid "The contents of the @code{cupsd.conf}, as a string." -msgstr "" +msgstr "Le contenu de @code{cupsd.conf}, en tant que chaîne de caractères." #. type: deftypevr #: doc/guix.texi:12803 #, no-wrap msgid "{@code{opaque-cups-configuration} parameter} string cups-files.conf" -msgstr "" +msgstr "{paramètre de @code{opaque-cups-configuration}} string cups-files.conf" #. type: deftypevr #: doc/guix.texi:12805 msgid "The contents of the @code{cups-files.conf} file, as a string." -msgstr "" +msgstr "Le contenu du fichier @code{cups-files.conf}, en tant que chaîne de caractères." #. type: Plain text #: doc/guix.texi:12810 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 "" +msgstr "Par exemple, si vos fichiers @code{cupsd.conf} et @code{cups-files.conf} sont dans des chaînes du même nom, pouvez instancier un service CUPS de cette manière :" #. type: example #: doc/guix.texi:12816 @@ -23182,80 +23536,84 @@ msgid "" " (cupsd.conf cupsd.conf)\n" " (cups-files.conf cups-files.conf)))\n" msgstr "" +"(service cups-service-type\n" +" (opaque-cups-configuration\n" +" (cupsd.conf cupsd.conf)\n" +" (cups-files.conf cups-files.conf)))\n" #. type: Plain text #: doc/guix.texi:12827 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 "" +msgstr "Le module @code{(gnu services desktop)} fournit des services qui sont habituellement utiles dans le contexte d'une installation « de bureau » — c'est-à-dire sur une machine qui fait tourner un service d'affichage graphique, éventuellement avec des interfaces utilisateurs graphiques, etc. Il définit aussi des services qui fournissent des environnements de bureau spécifiques comme GNOME, XFCE et MATE." #. type: Plain text #: doc/guix.texi:12831 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 "" +msgstr "Pour simplifier les choses, le module définit une variable contenant l'ensemble des services que les utilisateurs s'attendent en général à avoir sur une machine avec un environnement graphique et le réseau :" #. type: defvr #: doc/guix.texi:12832 #, no-wrap msgid "{Scheme Variable} %desktop-services" -msgstr "" +msgstr "{Variable Scheme} %desktop-services" #. type: defvr #: doc/guix.texi:12835 msgid "This is a list of services that builds upon @var{%base-services} and adds or adjusts services for a typical ``desktop'' setup." -msgstr "" +msgstr "C'est la liste des services qui étend @var{%base-services} en ajoutant ou en ajustant des services pour une configuration « de bureau » typique." #. type: defvr #: doc/guix.texi:12845 msgid "In particular, it adds a graphical login manager (@pxref{X Window, @code{slim-service}}), screen lockers, a network management tool (@pxref{Networking Services, @code{network-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 "" +msgstr "En particulier, il ajoute un gestionnaire de connexion graphique (@pxref{X Window, @code{slim-service}}), des verrouilleurs d'écran, un outil de gestion réseau (@pxref{Networking Services, @code{network-manager-service-type}}), des services de gestion de l'énergie et des couleurs, le gestionnaire de connexion et de session @code{elogind}, le service de privilèges Polkit, le service de géolocalisation GeoClue, le démon Accounts Service qui permet aux utilisateurs autorisés de changer leur mot de passe, un client NTP (@pxref{Networking Services}), le démon Avahi, et le service name service switch est configuré pour pouvoir utiliser @code{nss-mdns} (@pxref{Name Service Switch, mDNS})." #. type: Plain text #: doc/guix.texi:12850 msgid "The @var{%desktop-services} variable can be used as the @code{services} field of an @code{operating-system} declaration (@pxref{operating-system Reference, @code{services}})." -msgstr "" +msgstr "La variable @var{%desktop-services} peut être utilisée comme champ @code{services} d'une déclaration @code{operating-system} (@pxref{operating-system Reference, @code{services}})." #. type: Plain text #: doc/guix.texi:12873 msgid "Additionally, the @code{gnome-desktop-service}, @code{xfce-desktop-service}, @code{mate-desktop-service} 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} 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 made by @code{mate-desktop-service} 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." -msgstr "" +msgstr "En plus, les procédures @code{gnome-desktop-service}, @code{xfce-desktop-service}, @code{mate-desktop-service} et @code{enlightenment-desktop-service-type} peuvent ajouter GNOME, XFCE, MATE ou Enlightenment à un système. « Ajouter GNOME » signifie que les services du système comme les utilitaires d'ajustement de la luminosité et de gestion de l'énergie sont ajoutés au système, en étendant @code{polkit} et @code{dbus} de la bonne manière, ce qui permet à GNOME d'opérer avec des privilèges plus élevés sur un nombre limité d'interfaces systèmes spécialisées. En plus, ajouter un service construit par @code{gnome-desktop-service} ajoute le métapaquet GNOME au profil du système. de même, ajouter le service XFCE ajoute le métapaquet @code{xfce} au profil système, mais il permet aussi au gestionnaire de fichiers Thunar d'ouvrir une fenêtre de gestion des fichier « en mode root », si l'utilisateur s'authentifie avec le mot de passe administrateur via l'interface graphique polkit standard. « Ajouter MATE » signifie que @code{polkit} et @code{dbus} sont étendue de la bonne manière, ce qui permet à MATE d'opérer avec des privilèges plus élevés sur un nombre limité d'interface systèmes spécialisées. « Ajouter ENLIGHTENMENT » signifie que @code{dbus} est étendu comme il faut et que plusieurs binaires d'Enlightenment récupèrent le bit setuid, ce qui permet au verrouilleur d'écran d'Enlightenment et à d'autres fonctionnalités de fonctionner correctement." #. type: Plain text #: doc/guix.texi:12882 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 the @code{slim-service} for 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 "" +msgstr "Les environnement de bureau dans Guix utilisent le service d'affichage Xorg par défaut. Si vous voulez utiliser le protocol de serveur d'affichage plus récent Wayland, vous devez utiliser @code{sddm-service} à la place de @code{slim-service} comme gestionnaire de connexion graphique. Vous devriez ensuite sélectionner la session « GNOME (Wayland) » dans SDDM. Autrement, vous pouvez essayer de démarrer GNOME sur Wayland manuellement depuis un TTY avec la commande @command{XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session}. Actuellement seul GNOME support Wayland." #. type: deffn #: doc/guix.texi:12883 #, no-wrap msgid "{Scheme Procedure} gnome-desktop-service" -msgstr "" +msgstr "{Procédure Scheme} gnome-desktop-service" #. type: deffn #: doc/guix.texi:12887 msgid "Return a service that adds the @code{gnome} package to the system profile, and extends polkit with the actions from @code{gnome-settings-daemon}." -msgstr "" +msgstr "Renvoie un service qui ajoute le paquet @code{gnome} au profil système et étend polkit avec des actions de @code{gnome-settings-daemon}." #. type: deffn #: doc/guix.texi:12889 #, no-wrap msgid "{Scheme Procedure} xfce-desktop-service" -msgstr "" +msgstr "{Procédure Scheme} xfce-desktop-service" #. type: deffn #: doc/guix.texi:12894 msgid "Return a service that 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 "" +msgstr "Renvoie un service qui ajoute le paquet @code{xfce} au profil du système et étend polkit avec la capacité pour @code{thunar} de manipuler le système de fichier en tant que root depuis une session utilisateur, après que l'utilisateur s'est authentifié avec le mot de passe administrateur." #. type: deffn #: doc/guix.texi:12896 #, no-wrap msgid "{Scheme Procedure} mate-desktop-service" -msgstr "" +msgstr "{Procédure Scheme} mate-desktop-service" #. type: deffn #: doc/guix.texi:12900 msgid "Return a service that adds the @code{mate} package to the system profile, and extends polkit with the actions from @code{mate-settings-daemon}." -msgstr "" +msgstr "Renvoie un service qui ajoute le paquet @code{mate} au profil du système et étend polkit avec les actions de @code{mate-settings-daemon}." #. type: deffn #: doc/guix.texi:12902 @@ -23266,13 +23624,13 @@ msgstr "{Procédure Scheme} enlightenment-desktop-service-type" #. type: deffn #: doc/guix.texi:12905 msgid "Return a service that adds the @code{enlightenment} package to the system profile, and extends dbus with actions from @code{efl}." -msgstr "" +msgstr "Renvoie un service qui ajoute le paquet @code{enlightenment} et étend dbus avec les actions de @code{efl}" #. type: deftp #: doc/guix.texi:12907 #, no-wrap msgid "{Data Type} enlightenment-desktop-service-configuration" -msgstr "" +msgstr "{Type de données} enlightenment-desktop-service-configuration" #. type: item #: doc/guix.texi:12909 @@ -23288,7 +23646,7 @@ msgstr "Le paquet enlightenment à utiliser." #. type: Plain text #: doc/guix.texi:12919 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 "" +msgstr "Comme les services de bureau GNOME, XFCE et MATE récupèrent tant de paquet, la variable @code{%desktop-services} par défaut n'inclut aucun d'entre eux. Pour ajouter GNOME, XFCE ou MATE, utilisez @code{cons} pour les ajouter à @code{%desktop-services} dans le champ @code{services} de votre @code{operating-system}." #. type: example #: doc/guix.texi:12930 @@ -23304,421 +23662,454 @@ msgid "" " %desktop-services))\n" " ...)\n" msgstr "" +"(use-modules (gnu))\n" +"(use-service-modules desktop)\n" +"(operating-system\n" +" ...\n" +" ;; cons* ajoute les élément à la liste donnée en dernier argument\n" +" (services (cons* (gnome-desktop-service)\n" +" (xfce-desktop-service)\n" +" %desktop-services))\n" +" ...)\n" #. type: Plain text #: doc/guix.texi:12934 msgid "These desktop environments will then be available as options in the graphical login window." -msgstr "" +msgstr "Ces environnements de bureau seront alors disponibles comme une option dans la fenêtre de connexion graphique." #. type: Plain text #: doc/guix.texi:12938 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 "" +msgstr "Les définitions de service qui sont vraiment incluses dans @code{%desktop-services} et fournies par @code{(gnu services dbus)} et @code{(gnu services desktop)} sont décrites plus bas." #. type: deffn #: doc/guix.texi:12939 #, no-wrap msgid "{Scheme Procedure} dbus-service [#:dbus @var{dbus}] [#:services '()]" -msgstr "" +msgstr "{Procédure Scheme} dbus-service [#:dbus @var{dbus}] [#:services '()]" #. type: deffn #: doc/guix.texi:12942 msgid "Return a service that runs the ``system bus'', using @var{dbus}, with support for @var{services}." -msgstr "" +msgstr "Renvoie un service qui lance le « bus système », @var{dbus}, avec le support de @var{services}." #. type: deffn #: doc/guix.texi:12946 msgid "@uref{http://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 "" +msgstr "@uref{http://dbus.freedesktop.org/, D-Bus} est un utilitaire de communication inter-processus. Son bus système est utilisé pour permettre à des services systèmes de communiquer et d'être notifiés d'événements systèmes." #. type: deffn #: doc/guix.texi:12951 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 "" +msgstr "@var{services} doit être une liste de paquets qui fournissent un répertoire @file{etc/dbus-1/system.d} contenant de la configuration D-Bus supplémentaire et des fichiers de politiques. Par exemple, pour permettre à avahi-daemon d'utiliser le bus système, @var{services} doit être égal à @code{(list avahi)}." #. type: deffn #: doc/guix.texi:12953 #, no-wrap msgid "{Scheme Procedure} elogind-service [#:config @var{config}]" -msgstr "" +msgstr "{Procédure Scheme} elogind-service [#:config @var{config}]" #. type: deffn #: doc/guix.texi:12959 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 "" +msgstr "Renvoie un service qui lance le démon de gestion de connexion et de session @code{elogind}. @uref{https://github.com/elogind/elogind, Elogind} expose une interface D-Bus qui peut être utilisée pour connaître quels utilisateurs sont connectés, le type de session qu'ils sont ouverte, suspendre le système, désactiver la veille système, redémarrer le système et d'autre taches." #. type: deffn #: doc/guix.texi:12963 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 "" +msgstr "Elogind gère la plupart des événements liés à l'énergie du système, par exemple mettre en veille le système quand l'écran est rabattu ou en l'éteignant quand le bouton de démarrage est appuyé." #. type: deffn #: doc/guix.texi:12968 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 "" +msgstr "L'argument @var{config} spécifie la configuration d'elogind et devrait être le résultat d'une invocation de @code{(elogind-configuration (@var{parameter} @var{value})...)}. Les paramètres disponibles et leur valeur par défaut sont :" #. type: item #: doc/guix.texi:12970 #, no-wrap msgid "kill-user-processes?" -msgstr "" +msgstr "kill-user-processes?" #. type: code{#1} #: doc/guix.texi:12972 doc/guix.texi:12990 doc/guix.texi:12992 #: doc/guix.texi:12994 doc/guix.texi:13006 msgid "#f" -msgstr "" +msgstr "#f" #. type: item #: doc/guix.texi:12972 #, no-wrap msgid "kill-only-users" -msgstr "" +msgstr "kill-only-users" #. type: code{#1} #: doc/guix.texi:12974 doc/guix.texi:13012 msgid "()" -msgstr "" +msgstr "()" #. type: item #: doc/guix.texi:12974 #, no-wrap msgid "kill-exclude-users" -msgstr "" +msgstr "kill-exclude-users" #. type: code{#1} #: doc/guix.texi:12976 msgid "(\"root\")" -msgstr "" +msgstr "(\"root\")" #. type: item #: doc/guix.texi:12976 #, no-wrap msgid "inhibit-delay-max-seconds" -msgstr "" +msgstr "inhibit-delay-max-seconds" #. type: code{#1} #: doc/guix.texi:12978 msgid "5" -msgstr "" +msgstr "5" #. type: item #: doc/guix.texi:12978 #, no-wrap msgid "handle-power-key" -msgstr "" +msgstr "handle-power-key" #. type: code{#1} #: doc/guix.texi:12980 msgid "poweroff" -msgstr "" +msgstr "poweroff" #. type: item #: doc/guix.texi:12980 #, no-wrap msgid "handle-suspend-key" -msgstr "" +msgstr "handle-suspend-key" #. type: code{#1} #: doc/guix.texi:12982 doc/guix.texi:12986 msgid "suspend" -msgstr "" +msgstr "suspend" #. type: item #: doc/guix.texi:12982 #, no-wrap msgid "handle-hibernate-key" -msgstr "" +msgstr "handle-hibernate-key" #. type: code{#1} #: doc/guix.texi:12984 msgid "hibernate" -msgstr "" +msgstr "hibernate" #. type: item #: doc/guix.texi:12984 #, no-wrap msgid "handle-lid-switch" -msgstr "" +msgstr "handle-lid-switch" #. type: item #: doc/guix.texi:12986 #, no-wrap msgid "handle-lid-switch-docked" -msgstr "" +msgstr "handle-lid-switch-docked" #. type: code{#1} #: doc/guix.texi:12988 doc/guix.texi:13000 msgid "ignore" -msgstr "" +msgstr "ignore" #. type: item #: doc/guix.texi:12988 #, no-wrap msgid "power-key-ignore-inhibited?" -msgstr "" +msgstr "power-key-ignore-inhibited?" #. type: item #: doc/guix.texi:12990 #, no-wrap msgid "suspend-key-ignore-inhibited?" -msgstr "" +msgstr "suspend-key-ignore-inhibited?" #. type: item #: doc/guix.texi:12992 #, no-wrap msgid "hibernate-key-ignore-inhibited?" -msgstr "" +msgstr "hibernate-key-ignore-inhibited?" #. type: item #: doc/guix.texi:12994 #, no-wrap msgid "lid-switch-ignore-inhibited?" -msgstr "" +msgstr "lid-switch-ignore-inhibited?" #. type: code{#1} #: doc/guix.texi:12996 doc/guix.texi:13008 msgid "#t" -msgstr "" +msgstr "#t" #. type: item #: doc/guix.texi:12996 #, no-wrap msgid "holdoff-timeout-seconds" -msgstr "" +msgstr "holdoff-timeout-seconds" #. type: code{#1} #: doc/guix.texi:12998 msgid "30" -msgstr "" +msgstr "30" #. type: item #: doc/guix.texi:12998 #, no-wrap msgid "idle-action" -msgstr "" +msgstr "idle-action" #. type: item #: doc/guix.texi:13000 #, no-wrap msgid "idle-action-seconds" -msgstr "" +msgstr "idle-action-seconds" #. type: code{#1} #: doc/guix.texi:13002 msgid "(* 30 60)" -msgstr "" +msgstr "(* 30 60)" #. type: item #: doc/guix.texi:13002 #, no-wrap msgid "runtime-directory-size-percent" -msgstr "" +msgstr "runtime-directory-size-percent" #. type: code{#1} #: doc/guix.texi:13004 msgid "10" -msgstr "" +msgstr "10" #. type: item #: doc/guix.texi:13004 #, no-wrap msgid "runtime-directory-size" -msgstr "" +msgstr "runtime-directory-size" #. type: item #: doc/guix.texi:13006 #, no-wrap msgid "remove-ipc?" -msgstr "" +msgstr "remove-ipc?" #. type: item #: doc/guix.texi:13008 #, no-wrap msgid "suspend-state" -msgstr "" +msgstr "suspend-state" #. type: code{#1} #: doc/guix.texi:13010 msgid "(\"mem\" \"standby\" \"freeze\")" -msgstr "" +msgstr "(\"mem\" \"standby\" \"freeze\")" #. type: item #: doc/guix.texi:13010 #, no-wrap msgid "suspend-mode" -msgstr "" +msgstr "suspend-mode" #. type: item #: doc/guix.texi:13012 #, no-wrap msgid "hibernate-state" -msgstr "" +msgstr "hibernate-state" #. type: code{#1} #: doc/guix.texi:13014 doc/guix.texi:13018 msgid "(\"disk\")" -msgstr "" +msgstr "(\"disk\")" #. type: item #: doc/guix.texi:13014 #, no-wrap msgid "hibernate-mode" -msgstr "" +msgstr "hibernate-mode" #. type: code{#1} #: doc/guix.texi:13016 msgid "(\"platform\" \"shutdown\")" -msgstr "" +msgstr "(\"platform\" \"shutdown\")" #. type: item #: doc/guix.texi:13016 #, no-wrap msgid "hybrid-sleep-state" -msgstr "" +msgstr "hybrid-sleep-state" #. type: item #: doc/guix.texi:13018 #, no-wrap msgid "hybrid-sleep-mode" -msgstr "" +msgstr "hybrid-sleep-mode" #. type: code{#1} #: doc/guix.texi:13020 msgid "(\"suspend\" \"platform\" \"shutdown\")" -msgstr "" +msgstr "(\"suspend\" \"platform\" \"shutdown\")" #. type: deffn #: doc/guix.texi:13023 #, no-wrap msgid "{Scheme Procedure} accountsservice-service @" -msgstr "" +msgstr "{Procédure Scheme} accountsservice-service @" #. type: deffn #: doc/guix.texi:13031 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 "" +"[#:accountsservice @var{accountsservice}]\n" +"Renvoie un service qui lance AccountsService, un service système qui peut lister les comptes disponibles, changer leur mot de passe, etc. AccountsService s'intègre à Polkit pour permettre aux utilisateurs non privilégiés de pouvoir modifier la configuration de leur système. @uref{https://www.freedesktop.org/wiki/Software/AccountsService/, le site de accountsservice} pour trouver plus d'informations." #. type: deffn #: doc/guix.texi:13034 msgid "The @var{accountsservice} keyword argument is the @code{accountsservice} package to expose as a service." -msgstr "" +msgstr "L'argument @var{accountsservice} est le paquet @code{accountsservice} à exposer comme un service." #. type: deffn #: doc/guix.texi:13036 #, no-wrap msgid "{Scheme Procedure} polkit-service @" -msgstr "" +msgstr "{Procédure Scheme} polkit-service @" #. type: deffn #: doc/guix.texi:13045 msgid "[#:polkit @var{polkit}] Return a service that runs the @uref{http://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 "" +"[#:polkit @var{polkit}]\n" +"Renvoie un service qui lance le @uref{http://www.freedesktop.org/wiki/Software/polkit/, service de gestion des privilèges Polkit}, qui permet aux administrateurs systèmes de permettre l'accès à des opération privilégiées d'une manière structurée. En demandant au service Polkit, un composant système privilégié peut savoir lorsqu'il peut donner des privilèges supplémentaires à des utilisateurs normaux. Par exemple, un utilisateur normal peut obtenir le droit de mettre le système en veille si l'utilisateur est connecté localement." #. type: deffn #: doc/guix.texi:13047 #, no-wrap msgid "{Scheme Procedure} upower-service [#:upower @var{upower}] @" -msgstr "" +msgstr "{Procédure Scheme} upower-service [#:upower @var{upower}] @" #. type: deffn #: doc/guix.texi:13064 msgid "[#:watts-up-pro? #f] @ [#:poll-batteries? #t] @ [#:ignore-lid? #f] @ [#:use-percentage-for-policy? #f] @ [#:percentage-low 10] @ [#:percentage-critical 3] @ [#:percentage-action 2] @ [#:time-low 1200] @ [#:time-critical 300] @ [#:time-action 120] @ [#:critical-power-action 'hybrid-sleep] Return a service that runs @uref{http://upower.freedesktop.org/, @command{upowerd}}, a system-wide monitor for power consumption and battery levels, with the given configuration settings. It implements the @code{org.freedesktop.UPower} D-Bus interface, and is notably used by GNOME." msgstr "" +"[#:watts-up-pro? #f] @\n" +"[#:poll-batteries? #t] @\n" +"[#:ignore-lid? #f] @\n" +"[#:use-percentage-for-policy? #f] @\n" +"[#:percentage-low 10] @\n" +"[#:percentage-critical 3] @\n" +"[#:percentage-action 2] @\n" +"[#:time-low 1200] @\n" +"[#:time-critical 300] @\n" +"[#:time-action 120] @\n" +"[#:critical-power-action 'hybrid-sleep] \n" +"Renvoie un service qui lance @uref{http://upower.freedesktop.org/, @command{upowerd}}, un moniteur système pour la consommation électrique et le niveau de batterie, avec les paramètres de configuration données. Il implémente l'interface D-Bus @code{org.freedesktop.UPower} et est notamment utilisé par GNOME." #. type: deffn #: doc/guix.texi:13066 #, no-wrap msgid "{Scheme Procedure} udisks-service [#:udisks @var{udisks}]" -msgstr "" +msgstr "{Procédure Scheme} udisks-service [#:udisks @var{udisks}]" #. type: deffn #: doc/guix.texi:13071 msgid "Return a service for @uref{http://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 "" +msgstr "Renvoie un service pour @uref{http://udisks.freedesktop.org/docs/latest/, UDisks}, un démon de @dfn{gestion de disques} qui fournit des notifications et la capacité de monter et démonter des disques à des interfaces utilisateurs. Les programmes qui parlent à UDisks sont par exemple la commande @command{udisksctl}, qui fait partie de UDisks et GNOME Disks." #. type: deffn #: doc/guix.texi:13073 #, no-wrap msgid "{Scheme Procedure} colord-service [#:colord @var{colord}]" -msgstr "" +msgstr "{Procédure Scheme} colord-service [#:colord @var{colord}]" #. type: deffn #: doc/guix.texi:13079 msgid "Return a 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{http://www.freedesktop.org/software/colord/, the colord web site} for more information." -msgstr "" +msgstr "Renvoie un service qui lance @command{colord}, un service système avec une interface D-Bus pour gérer les profils de couleur des périphériques d'entrées et de sorties comme les écrans et les scanners. Il est notamment utilisé par l'outil graphique GNOME Color Manager. Voir @uref{http://www.freedesktop.org/software/colord/, le site web de colord} pour plus d'informations." #. type: deffn #: doc/guix.texi:13081 #, no-wrap msgid "{Scheme Procedure} geoclue-application name [#:allowed? #t] [#:system? #f] [#:users '()]" -msgstr "" +msgstr "{Procédure Scheme} geoclue-application name [#:allowed? #t] [#:system? #f] [#:users '()]" #. type: deffn #: doc/guix.texi:13090 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 "" +msgstr "Renvoie une configuration qui permet d'accéder aux données de localisation de GeoClue. @var{name} est l'ID Desktop de l'application, sans la partie en @code{.desktop}. Si @var{allowed?} est vraie, l'application aura droit d'accéder aux informations de localisation par défaut. Le booléen @var{system?} indique si une application est un composant système ou non. Enfin @var{users} est la liste des UID des utilisateurs pour lesquels cette application a le droit d'accéder aux informations de géolocalisation. Une liste d'utilisateurs vide indique que tous les utilisateurs sont autorisés." #. type: defvr #: doc/guix.texi:13092 #, no-wrap msgid "{Scheme Variable} %standard-geoclue-applications" -msgstr "" +msgstr "{Variable Scheme} %standard-geoclue-applications" #. type: defvr #: doc/guix.texi:13099 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 "" +msgstr "la liste standard de configuration des application GeoClue connues, qui permet à l'utilitaire date-and-time de GNOME de demander l'emplacement actuel pour initialiser le fuseau horaire et aux navigateurs web IceCat et Epiphany de demander les informations de localisation. IceCat et Epiphany demandent tous deux à l'utilisateur avant de permettre à une page web de connaître l'emplacement de l'utilisateur." #. type: deffn #: doc/guix.texi:13101 #, no-wrap msgid "{Scheme Procedure} geoclue-service [#:colord @var{colord}] @" -msgstr "" +msgstr "{Procédure Scheme} geoclue-service [#:colord @var{colord}] @" #. type: deffn #: doc/guix.texi:13114 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 "" +"[#:whitelist '()] @\n" +"[#:wifi-geolocation-url \"https://location.services.mozilla.com/v1/geolocate?key=geoclue\"] @\n" +"[#:submit-data? #f] [#:wifi-submission-url \"https://location.services.mozilla.com/v1/submit?key=geoclue\"] @\n" +"[#:submission-nick \"geoclue\"] @\n" +"[#:applications %standard-geoclue-applications]\n" +"Renvoie un service qui lance le service de géolocalisation GeoClue. Ce service fournit une interface D-Bus pour permettre aux applications de demande l'accès à la position de l'utilisateur et éventuellement d'ajouter des informations à des bases de données de géolocalisation en ligne. Voir @uref{https://wiki.freedesktop.org/www/Software/GeoClue/, le site web de GeoClue} pour plus d'informations." #. type: deffn #: doc/guix.texi:13116 #, no-wrap msgid "{Scheme Procedure} bluetooth-service [#:bluez @var{bluez}] @" -msgstr "" +msgstr "{Procédure Scheme} bluetooth-service [#:bluez @var{bluez}] @" #. type: deffn #: doc/guix.texi:13123 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 "" +"[@w{#:auto-enable? #f}]\n" +"Renvoie un service qui lance le démon @command{bluetoothd} qui gère tous les appareils Bluetooth et fournit un certain nombre d'interfaces D-Bus. Lorsque @var{auto-enable?} est vraie, le contrôler bluetooth est automatiquement alimenté au démarrage, ce qui peut être utile lorsque vous utilisez un clavier ou une souris bluetooth." #. type: deffn #: doc/guix.texi:13125 msgid "Users need to be in the @code{lp} group to access the D-Bus service." -msgstr "" +msgstr "Les utilisateurs doivent être dans le groupe @code{lp} pour accéder au service D-Bus." #. type: cindex #: doc/guix.texi:13130 #, no-wrap msgid "sound support" -msgstr "" +msgstr "support du son" #. type: cindex #: doc/guix.texi:13131 #, no-wrap msgid "ALSA" -msgstr "" +msgstr "ALSA" #. type: cindex #: doc/guix.texi:13132 #, no-wrap msgid "PulseAudio, sound support" -msgstr "" +msgstr "PulseAudio, support du son" #. type: Plain text #: doc/guix.texi:13139 msgid "The @code{(gnu services sound)} module provides an @code{alsa-service-type} service to generate an ALSA @file{/etc/asound.conf} configuration file. This configuration file is what allows applications that produce sound using ALSA to be correctly handled." -msgstr "" +msgstr "Le module @code{(gnu services sound)} fournit un service @code{alsa-service-type} pour générer un fichier de configuration @file{/etc/asound.conf}. Ce fichier de configuration est ce qui permet aux applications de produire du son avec ALSA d'être correctement gérées." #. type: deffn #: doc/guix.texi:13140 @@ -23729,391 +24120,394 @@ msgstr "{Variable Scheme} alsa-service-type" #. type: deffn #: doc/guix.texi:13143 msgid "This is the type for the @uref{https://alsa-project.org/, ALSA}, @command{alsa-configuration} record as in this example:" -msgstr "" +msgstr "C'est le type pour @uref{https://alsa-project.org/, ALSA}, que demande un enregistrement @command{alsa-configuration} comme dans cet exemple :" #. type: example #: doc/guix.texi:13146 #, no-wrap msgid "(service alsa-service-type)\n" -msgstr "" +msgstr "(service alsa-service-type)\n" #. type: deffn #: doc/guix.texi:13149 msgid "See below for details about @code{alsa-configuration}." -msgstr "" +msgstr "Voir plus bas pour des détails sur @code{alsa-configuration}." #. type: deftp #: doc/guix.texi:13151 #, no-wrap msgid "{Data Type} alsa-configuration" -msgstr "{Type de donnée} alsa-configuration" +msgstr "{Type de données} alsa-configuration" #. type: deftp #: doc/guix.texi:13153 msgid "Data type representing the configuration for @code{alsa-service}." -msgstr "" +msgstr "Type de données représentant la configuration pour @code{alsa-service}." #. type: item #: doc/guix.texi:13155 #, no-wrap msgid "@code{pulseaudio?} (default: @var{#t})" -msgstr "@code{pulseaudio?} (par défaut : @code{#t})" +msgstr "@code{pulseaudio?} (par défaut : @var{#t})" #. type: table #: doc/guix.texi:13158 msgid "Whether ALSA applications should transparently be made to use the @uref{http://www.pulseaudio.org/, PulseAudio} sound server." -msgstr "" +msgstr "Indique si les applications ALSA devraient utiliser le serveur de son @uref{http://www.pulseaudio.org/, PulseAudio} de manière transparente pour elles." #. type: table #: doc/guix.texi:13162 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 "" +msgstr "Utiliser PulseAudio vous permet dans lancer plusieurs applications qui produisent du son en même temps et de les contrôler individuellement via @command{pavucontrol} entre autres choses." #. type: item #: doc/guix.texi:13163 #, no-wrap msgid "@code{extra-options} (default: @var{\"\"})" -msgstr "@code{extra-options} (par défaut : @code{\"\"})" +msgstr "@code{extra-options} (par défaut : @var{\"\"})" #. type: table #: doc/guix.texi:13165 msgid "String to append to the @file{asound.conf} file." -msgstr "" +msgstr "Chaîne à ajouter au fichier @file{asound.conf}." #. type: cindex #: doc/guix.texi:13173 #, no-wrap msgid "SQL" -msgstr "" +msgstr "SQL" #. type: Plain text #: doc/guix.texi:13175 msgid "The @code{(gnu services databases)} module provides the following services." -msgstr "" +msgstr "Le module @code{(gnu services databases)} fournit les services suivants." #. type: deffn #: doc/guix.texi:13176 #, no-wrap msgid "{Scheme Procedure} postgresql-service [#:postgresql postgresql] @" -msgstr "" +msgstr "{Procédure Scheme} postgresql-service [#:postgresql postgresql] @" #. type: deffn #: doc/guix.texi:13181 msgid "[#:config-file] [#:data-directory ``/var/lib/postgresql/data''] @ [#:port 5432] [#:locale ``en_US.utf8''] Return a service that runs @var{postgresql}, the PostgreSQL database server." msgstr "" +"[#:config-file] [#:data-directory ``/var/lib/postgresql/data''] @\n" +"[#:port 5432] [#:locale ``en_US.utf8''] \n" +"Renvoie un service qui lance @var{postgresql}, le service de bases de données PostgreSQL." #. type: deffn #: doc/guix.texi:13185 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 "" +msgstr "Le démon PostgreSQL charge sa configuration à l'exécution depuis @var{config-file}, crée une grappe de bases de données avec @var{locale} comme paramètre de régionalisation par défaut, stockée dans @var{data-directory}. Il écoute ensuite sur @var{port}." #. type: deffn #: doc/guix.texi:13187 #, no-wrap msgid "{Scheme Procedure} mysql-service [#:config (mysql-configuration)]" -msgstr "" +msgstr "{Procédure Scheme} mysql-service [#:config (mysql-configuration)]" #. type: deffn #: doc/guix.texi:13190 msgid "Return a service that runs @command{mysqld}, the MySQL or MariaDB database server." -msgstr "" +msgstr "Renvoie un service qui lance @command{mysqld}, le service de bases de données MySQL ou MariaDB." #. type: deffn #: doc/guix.texi:13193 msgid "The optional @var{config} argument specifies the configuration for @command{mysqld}, which should be a @code{} object." -msgstr "" +msgstr "L'argument @var{config} facultatif spécifie la configuration de @command{mysqld}, qui devrait être un objet @code{}." #. type: deftp #: doc/guix.texi:13195 #, no-wrap msgid "{Data Type} mysql-configuration" -msgstr "" +msgstr "{Type de données} mysql-configuration" #. type: deftp #: doc/guix.texi:13197 msgid "Data type representing the configuration of @var{mysql-service}." -msgstr "" +msgstr "Type de données représentant la configuration de @var{mysql-service}." #. type: item #: doc/guix.texi:13199 #, no-wrap msgid "@code{mysql} (default: @var{mariadb})" -msgstr "" +msgstr "@code{mysql} (par défaut : @var{mariadb})" #. type: table #: doc/guix.texi:13202 msgid "Package object of the MySQL database server, can be either @var{mariadb} or @var{mysql}." -msgstr "" +msgstr "Objet paquet du serveur de base de données MySQL, qui peut être soit @var{mariadb}, soit @var{mysql}." #. type: table #: doc/guix.texi:13205 msgid "For MySQL, a temporary root password will be displayed at activation time. For MariaDB, the root password is empty." -msgstr "" +msgstr "Pour MySQL, un mot de passe root temporaire sera affiché à l'activation. Pour MariaDB, le mot de passe root est vide." #. type: item #: doc/guix.texi:13206 #, no-wrap msgid "@code{port} (default: @code{3306})" -msgstr "" +msgstr "@code{port} (par défaut : @code{3306})" #. type: table #: doc/guix.texi:13208 msgid "TCP port on which the database server listens for incoming connections." -msgstr "" +msgstr "Port TCP sur lequel le serveur de base de données écoute les connexions entrantes." #. type: defvr #: doc/guix.texi:13211 #, no-wrap msgid "{Scheme Variable} memcached-service-type" -msgstr "" +msgstr "{Variable Scheme} memcached-service-type" #. type: defvr #: doc/guix.texi:13215 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 "" +msgstr "C'est le type de service pour le service @uref{https://memcached.org/, Memcached} qui fournit un cache en mémoire distribué. La valeur pour le type de service est un objet @code{memcached-configuration}." #. type: example #: doc/guix.texi:13219 #, no-wrap msgid "(service memcached-service-type)\n" -msgstr "" +msgstr "(service memcached-service-type)\n" #. type: deftp #: doc/guix.texi:13221 #, no-wrap msgid "{Data Type} memcached-configuration" -msgstr "" +msgstr "{Type de données} memcached-configuration" #. type: deftp #: doc/guix.texi:13223 msgid "Data type representing the configuration of memcached." -msgstr "" +msgstr "Type de données représentant la configuration de memcached." #. type: item #: doc/guix.texi:13225 #, no-wrap msgid "@code{memcached} (default: @code{memcached})" -msgstr "" +msgstr "@code{memcached} (par défaut : @code{memcached})" #. type: table #: doc/guix.texi:13227 msgid "The Memcached package to use." -msgstr "" +msgstr "Le paquet Memcached à utiliser." #. type: item #: doc/guix.texi:13228 #, no-wrap msgid "@code{interfaces} (default: @code{'(\"0.0.0.0\")})" -msgstr "" +msgstr "@code{interfaces} (par défaut : @code{'(\"0.0.0.0\")})" #. type: table #: doc/guix.texi:13230 msgid "Network interfaces on which to listen." -msgstr "" +msgstr "Les interfaces réseaux sur lesquelles écouter." #. type: item #: doc/guix.texi:13231 #, no-wrap msgid "@code{tcp-port} (default: @code{11211})" -msgstr "" +msgstr "@code{tcp-port} (par défaut : @code{11211})" #. type: table #: doc/guix.texi:13233 msgid "Port on which to accept connections on," -msgstr "" +msgstr "Port sur lequel accepter les connexions." #. type: item #: doc/guix.texi:13234 #, no-wrap msgid "@code{udp-port} (default: @code{11211})" -msgstr "" +msgstr "@code{udp-port} (par défaut : @code{11211})" #. type: table #: doc/guix.texi:13237 msgid "Port on which to accept UDP connections on, a value of 0 will disable listening on a UDP socket." -msgstr "" +msgstr "Port sur lequel accepter les connexions UDP, une valeur de 0 désactive l'écoute en UDP." #. type: item #: doc/guix.texi:13238 #, no-wrap msgid "@code{additional-options} (default: @code{'()})" -msgstr "" +msgstr "@code{additional-options} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:13240 msgid "Additional command line options to pass to @code{memcached}." -msgstr "" +msgstr "Options de la ligne de commande supplémentaires à passer à @code{memcached}." #. type: defvr #: doc/guix.texi:13243 #, no-wrap msgid "{Scheme Variable} mongodb-service-type" -msgstr "" +msgstr "{Variable Scheme} mongodb-service-type" #. type: defvr #: doc/guix.texi:13246 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 "" +msgstr "C'est le type de service pour @uref{https://www.mongodb.com/, MongoDB}. La valeur de ce service est un objet @code{mongodb-configuration}." #. type: example #: doc/guix.texi:13250 #, no-wrap msgid "(service mongodb-service-type)\n" -msgstr "" +msgstr "(service mongodb-service-type)\n" #. type: deftp #: doc/guix.texi:13252 #, no-wrap msgid "{Data Type} mongodb-configuration" -msgstr "" +msgstr "{Type de données} mongodb-configuration" #. type: deftp #: doc/guix.texi:13254 msgid "Data type representing the configuration of mongodb." -msgstr "" +msgstr "Type de données représentant la configuration de mongodb." #. type: item #: doc/guix.texi:13256 #, no-wrap msgid "@code{mongodb} (default: @code{mongodb})" -msgstr "" +msgstr "@code{mongodb} (par défaut : @code{mongodb})" #. type: table #: doc/guix.texi:13258 msgid "The MongoDB package to use." -msgstr "" +msgstr "Le paquet MongoDB à utiliser." #. type: item #: doc/guix.texi:13259 #, no-wrap msgid "@code{config-file} (default: @code{%default-mongodb-configuration-file})" -msgstr "" +msgstr "@code{config-file} (par défaut : @code{%default-mongodb-configuration-file})" #. type: table #: doc/guix.texi:13261 msgid "The configuration file for MongoDB." -msgstr "" +msgstr "Le fichier de configuration pour MongoDB." #. type: item #: doc/guix.texi:13262 #, no-wrap msgid "@code{data-directory} (default: @code{\"/var/lib/mongodb\"})" -msgstr "" +msgstr "@code{data-directory} (par défaut : @code{\"/var/lib/mongodb\"})" #. type: table #: doc/guix.texi:13266 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 "" +msgstr "Cette valeur est utilisée pour créer le répertoire, pour qu'il existe et appartienne à l'utilisateur mongodb. Il devrait correspondre au data-directory que MongoDB est configuré pour utiliser dans son fichier de configuration." #. type: defvr #: doc/guix.texi:13269 #, no-wrap msgid "{Scheme Variable} redis-service-type" -msgstr "" +msgstr "{Variable Scheme} redis-service-type" #. type: defvr #: doc/guix.texi:13272 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 "" +msgstr "C'est le type de service pour la base clef-valeur @uref{https://redis.io/, Redis} dont la valeur est un objet @code{redis-configuration}." #. type: deftp #: doc/guix.texi:13274 #, no-wrap msgid "{Data Type} redis-configuration" -msgstr "" +msgstr "{Type de données} redis-configuration" #. type: deftp #: doc/guix.texi:13276 msgid "Data type representing the configuration of redis." -msgstr "" +msgstr "Type de données représentant la configuration de redis." #. type: item #: doc/guix.texi:13278 #, no-wrap msgid "@code{redis} (default: @code{redis})" -msgstr "" +msgstr "@code{redis} (par défaut : @code{redis})" #. type: table #: doc/guix.texi:13280 msgid "The Redis package to use." -msgstr "" +msgstr "Le paquet Redis à utiliser." #. type: item #: doc/guix.texi:13281 #, no-wrap msgid "@code{bind} (default: @code{\"127.0.0.1\"})" -msgstr "" +msgstr "@code{bind} (par défaut : @code{\"127.0.0.1\"})" #. type: table #: doc/guix.texi:13283 msgid "Network interface on which to listen." -msgstr "" +msgstr "Interface réseau sur laquelle écouter." #. type: item #: doc/guix.texi:13284 #, no-wrap msgid "@code{port} (default: @code{6379})" -msgstr "" +msgstr "@code{port} (par défaut : @code{6379})" #. type: table #: doc/guix.texi:13287 msgid "Port on which to accept connections on, a value of 0 will disable listening on a TCP socket." -msgstr "" +msgstr "Port sur lequel accepter les connexions, une valeur de 0 désactive l'écoute sur un socket TCP." #. type: item #: doc/guix.texi:13288 #, no-wrap msgid "@code{working-directory} (default: @code{\"/var/lib/redis\"})" -msgstr "" +msgstr "@code{working-directory} (par défaut : @code{\"/var/lib/redis\"})" #. type: table #: doc/guix.texi:13290 msgid "Directory in which to store the database and related files." -msgstr "" +msgstr "Répertoire dans lequel stocker la base de données et les fichiers liés." #. type: cindex #: doc/guix.texi:13296 #, no-wrap msgid "mail" -msgstr "" +msgstr "courriel" #. type: code{#1} #: doc/guix.texi:13297 doc/guix.texi:16457 #, no-wrap msgid "email" -msgstr "" +msgstr "email" #. type: Plain text #: doc/guix.texi:13302 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 "" +msgstr "Le module @code{(gnu services mail)} fournit des définitions de services Guix pour les services de courriel : des serveurs IMAP, POP3 et LMTP ainsi que des MTA (Mail Transport Agent). Que d'acronymes ! Ces services sont détaillés dans les sous-sections ci-dessous." #. type: subsubheading #: doc/guix.texi:13303 #, no-wrap msgid "Dovecot Service" -msgstr "" +msgstr "Service Dovecot" #. type: deffn #: doc/guix.texi:13305 #, no-wrap msgid "{Scheme Procedure} dovecot-service [#:config (dovecot-configuration)]" -msgstr "" +msgstr "{Procédure Scheme} dovecot-service [#:config (dovecot-configuration)]" #. type: deffn #: doc/guix.texi:13307 msgid "Return a service that runs the Dovecot IMAP/POP3/LMTP mail server." -msgstr "" +msgstr "Renvoie un service qui lance le serveur de courriel IMAP/POP3/LMTP Dovecot." #. type: Plain text #: doc/guix.texi:13317 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 "" +msgstr "Par défaut, Dovecot n'a pas besoin de beaucoup de configuration ; l'objet de configuration par défaut créé par @code{(dovecot-configuration)} suffira si votre courriel est livré dans @code{~/Maildir}. Un certificat auto-signé sera généré pour les connexions TLS, bien que Dovecot écoutera aussi sur les ports non chiffrés par défaut. Il y a quelques options cependant, que les administrateurs peuvent avoir besoin de changer et comme c'est le cas avec d'autres services, Guix permet aux administrateurs systèmes de spécifier ces paramètres via une interface Scheme unifiée." #. type: Plain text #: doc/guix.texi:13320 msgid "For example, to specify that mail is located at @code{maildir~/.mail}, one would instantiate the Dovecot service like this:" -msgstr "" +msgstr "Par exemple, pour spécifier que les courriels se trouvent dans @code{maildir~/.mail}, on peut instancier Dovecot de cette manière :" #. type: example #: doc/guix.texi:13325 @@ -24123,998 +24517,1001 @@ msgid "" " (dovecot-configuration\n" " (mail-location \"maildir:~/.mail\")))\n" msgstr "" +"(dovecot-service #:config\n" +" (dovecot-configuration\n" +" (mail-location \"maildir:~/.mail\")))\n" #. type: Plain text #: doc/guix.texi:13333 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 "" +msgstr "Les paramètres de configuration disponibles sont les suivants. Chaque définition des paramètres est précédé par son type ; par exemple, @samp{string-list foo} indique que le paramètre @code{foo} devrait être spécifié comme une liste de chaînes de caractères. Il y a aussi une manière de spécifier la configuration comme une chaîne de caractères, si vous avez un vieux fichier @code{dovecot.conf} que vous voulez porter depuis un autre système ; voir la fin pour plus de détails." #. type: Plain text #: doc/guix.texi:13343 msgid "Available @code{dovecot-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{dovecot-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:13344 #, no-wrap msgid "{@code{dovecot-configuration} parameter} package dovecot" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} package dovecot" #. type: deftypevr #: doc/guix.texi:13346 doc/guix.texi:14633 msgid "The dovecot package." -msgstr "" +msgstr "Le paquet dovecot" #. type: deftypevr #: doc/guix.texi:13348 #, no-wrap msgid "{@code{dovecot-configuration} parameter} comma-separated-string-list listen" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} comma-separated-string-list listen" #. type: deftypevr #: doc/guix.texi:13354 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 "" +msgstr "Une liste d'IP ou d'hôtes à écouter pour les connexions. @samp{*} écoute sur toutes les interfaces IPv4, @samp{::} écoute sur toutes les interfaces IPv6. Si vous voulez spécifier des ports différents de la valeur par défaut ou quelque chose de plus complexe, complétez les champs d'adresse et de port de @samp{inet-listener} des services spécifiques qui vous intéressent." #. type: deftypevr #: doc/guix.texi:13356 #, no-wrap msgid "{@code{dovecot-configuration} parameter} protocol-configuration-list protocols" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} protocol-configuration-list protocols" #. type: deftypevr #: doc/guix.texi:13359 msgid "List of protocols we want to serve. Available protocols include @samp{imap}, @samp{pop3}, and @samp{lmtp}." -msgstr "" +msgstr "Liste des protocoles que vous voulez servir. Les protocoles disponibles comprennent @samp{imap}, @samp{pop3} et @samp{lmtp}." #. type: deftypevr #: doc/guix.texi:13361 msgid "Available @code{protocol-configuration} fields are:" -msgstr "" +msgstr "Les champs @code{protocol-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:13362 #, no-wrap msgid "{@code{protocol-configuration} parameter} string name" -msgstr "" +msgstr "{paramètre de @code{protocol-configuration}} string name" #. type: deftypevr #: doc/guix.texi:13364 msgid "The name of the protocol." -msgstr "" +msgstr "Le nom du protocole." #. type: deftypevr #: doc/guix.texi:13366 #, no-wrap msgid "{@code{protocol-configuration} parameter} string auth-socket-path" -msgstr "" +msgstr "{paramètre de @code{protocol-configuration}} string auth-socket-path" #. type: deftypevr #: doc/guix.texi:13370 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 "" +msgstr "Le chemin d'un socket UNIX vers le serveur d'authentification maître pour trouver les utilisateurs. C'est utilisé par imap (pour les utilisateurs partagés) et lda. Sa valeur par défaut est @samp{\"/var/run/dovecot/auth-userdb\"}." #. type: deftypevr #: doc/guix.texi:13372 #, no-wrap msgid "{@code{protocol-configuration} parameter} space-separated-string-list mail-plugins" -msgstr "" +msgstr "{paramètre de @code{protocol-configuration}} space-separated-string-list mail-plugins" #. type: deftypevr #: doc/guix.texi:13374 msgid "Space separated list of plugins to load." -msgstr "" +msgstr "Liste de greffons à charger séparés par des espaces." #. type: deftypevr #: doc/guix.texi:13376 #, no-wrap msgid "{@code{protocol-configuration} parameter} non-negative-integer mail-max-userip-connections" -msgstr "" +msgstr "{paramètre de @code{protocol-configuration}} non-negative-integer mail-max-userip-connections" #. type: deftypevr #: doc/guix.texi:13380 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 "" +msgstr "Nombre maximum de connexions IMAP permises pour un utilisateur depuis chaque adresse IP. Remarque : la comparaison du nom d'utilisateur est sensible à la casse. Par défaut @samp{10}." #. type: deftypevr #: doc/guix.texi:13384 #, no-wrap msgid "{@code{dovecot-configuration} parameter} service-configuration-list services" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} service-configuration-list services" #. type: deftypevr #: doc/guix.texi:13388 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 "" +msgstr "Liste des services à activer. Les services disponibles comprennent @samp{imap}, @samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth} et @samp{lmtp}." #. type: deftypevr #: doc/guix.texi:13390 msgid "Available @code{service-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{service-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:13391 #, no-wrap msgid "{@code{service-configuration} parameter} string kind" -msgstr "" +msgstr "{paramètre de @code{service-configuration}} string kind" #. type: deftypevr #: doc/guix.texi:13396 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 "" +msgstr "Le type de service. Les valeurs valides comprennent @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} ou n'importe quoi d'autre." #. type: deftypevr #: doc/guix.texi:13398 #, no-wrap msgid "{@code{service-configuration} parameter} listener-configuration-list listeners" -msgstr "" +msgstr "{paramètre de @code{service-configuration}} listener-configuration-list listeners" #. type: deftypevr #: doc/guix.texi:13403 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 "" +msgstr "Les auditeurs du service. Un auditeur est soit un @code{unix-listener-configuration}, soit un @code{fifo-listener-configuration}, soit un @code{inet-listener-configuration}. La valeur par défaut est @samp{()}." #. type: deftypevr #: doc/guix.texi:13405 msgid "Available @code{unix-listener-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{unix-listener-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:13406 #, no-wrap msgid "{@code{unix-listener-configuration} parameter} string path" -msgstr "" +msgstr "{paramètre de @code{unix-listener-configuration}} string path" #. type: deftypevr #: doc/guix.texi:13409 doc/guix.texi:13432 msgid "Path to the file, relative to @code{base-dir} field. This is also used as the section name." -msgstr "" +msgstr "Chemin vers le fichier, relativement au champ @code{base-dir}. C'est aussi utilisé comme nom de section." #. type: deftypevr #: doc/guix.texi:13411 #, no-wrap msgid "{@code{unix-listener-configuration} parameter} string mode" -msgstr "" +msgstr "{paramètre de @code{unix-listener-configuration}} string mode" #. type: deftypevr #: doc/guix.texi:13414 doc/guix.texi:13437 msgid "The access mode for the socket. Defaults to @samp{\"0600\"}." -msgstr "" +msgstr "Le mode d'accès pour le socket. La valeur par défaut est @samp{\"0600\"}." #. type: deftypevr #: doc/guix.texi:13416 #, no-wrap msgid "{@code{unix-listener-configuration} parameter} string user" -msgstr "" +msgstr "{paramètre de @code{unix-listener-configuration}} string user" #. type: deftypevr #: doc/guix.texi:13419 doc/guix.texi:13442 msgid "The user to own the socket. Defaults to @samp{\"\"}." -msgstr "" +msgstr "L'utilisateur à qui appartient le socket. La valeur par défaut est @samp{\"\"}" #. type: deftypevr #: doc/guix.texi:13421 #, no-wrap msgid "{@code{unix-listener-configuration} parameter} string group" -msgstr "" +msgstr "{paramètre de @code{unix-listener-configuration}} string group" #. type: deftypevr #: doc/guix.texi:13424 doc/guix.texi:13447 msgid "The group to own the socket. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Le groupe auquel appartient le socket. La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:13428 msgid "Available @code{fifo-listener-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{fifo-listener-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:13429 #, no-wrap msgid "{@code{fifo-listener-configuration} parameter} string path" -msgstr "" +msgstr "{paramètre de @code{fifo-listener-configuration}} string path" #. type: deftypevr #: doc/guix.texi:13434 #, no-wrap msgid "{@code{fifo-listener-configuration} parameter} string mode" -msgstr "" +msgstr "{paramètre de @code{fifo-listener-configuration}} string mode" #. type: deftypevr #: doc/guix.texi:13439 #, no-wrap msgid "{@code{fifo-listener-configuration} parameter} string user" -msgstr "" +msgstr "{paramètre de @code{fifo-listener-configuration}} string user" #. type: deftypevr #: doc/guix.texi:13444 #, no-wrap msgid "{@code{fifo-listener-configuration} parameter} string group" -msgstr "" +msgstr "{paramètre de @code{fifo-listener-configuration}} string group" #. type: deftypevr #: doc/guix.texi:13451 msgid "Available @code{inet-listener-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{inet-listener-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:13452 #, no-wrap msgid "{@code{inet-listener-configuration} parameter} string protocol" -msgstr "" +msgstr "{paramètre de @code{inet-listener-configuration}} string protocol" #. type: deftypevr #: doc/guix.texi:13454 msgid "The protocol to listen for." -msgstr "" +msgstr "Le protocole à écouter." #. type: deftypevr #: doc/guix.texi:13456 #, no-wrap msgid "{@code{inet-listener-configuration} parameter} string address" -msgstr "" +msgstr "{paramètre de @code{inet-listener-configuration}} string address" #. type: deftypevr #: doc/guix.texi:13459 msgid "The address on which to listen, or empty for all addresses. Defaults to @samp{\"\"}." -msgstr "" +msgstr "L'adresse sur laquelle écouter, ou la chaîne vide pour toutes les adresses. La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:13461 #, no-wrap msgid "{@code{inet-listener-configuration} parameter} non-negative-integer port" -msgstr "" +msgstr "{paramètre de @code{inet-listener-configuration}} non-negative-integer port" #. type: deftypevr #: doc/guix.texi:13463 msgid "The port on which to listen." -msgstr "" +msgstr "Le port sur lequel écouter." #. type: deftypevr #: doc/guix.texi:13465 #, no-wrap msgid "{@code{inet-listener-configuration} parameter} boolean ssl?" -msgstr "" +msgstr "{paramètre de @code{inet-listener-configuration}} boolean ssl?" #. type: deftypevr #: doc/guix.texi:13469 msgid "Whether to use SSL for this service; @samp{yes}, @samp{no}, or @samp{required}. Defaults to @samp{#t}." -msgstr "" +msgstr "S'il faut utiliser SSL pour ce service ; @samp{yes}, @samp{no} ou @samp{required}. La valeur par défaut est @samp{#t}." #. type: deftypevr #: doc/guix.texi:13473 #, no-wrap msgid "{@code{service-configuration} parameter} non-negative-integer service-count" -msgstr "" +msgstr "{paramètre de @code{service-configuration}} non-negative-integer service-count" #. type: deftypevr #: doc/guix.texi:13478 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 "" +msgstr "Nombre de connexions à gérer avant de démarrer un nouveau processus. Typiquement les valeurs utiles sont 0 (sans limite) ou 1. 1 est plus sûr, mais 0 est plus rapide. . La valeur par défaut est @samp{1}." #. type: deftypevr #: doc/guix.texi:13480 #, no-wrap msgid "{@code{service-configuration} parameter} non-negative-integer process-min-avail" -msgstr "" +msgstr "{paramètre de @code{service-configuration}} non-negative-integer process-min-avail" #. type: deftypevr #: doc/guix.texi:13483 msgid "Number of processes to always keep waiting for more connections. Defaults to @samp{0}." -msgstr "" +msgstr "Nombre de processus à toujours garder en attente de connexions. La valeur par défaut est @samp{0}." #. type: deftypevr #: doc/guix.texi:13485 #, no-wrap msgid "{@code{service-configuration} parameter} non-negative-integer vsz-limit" -msgstr "" +msgstr "{paramètre de @code{service-configuration}} non-negative-integer vsz-limit" #. type: deftypevr #: doc/guix.texi:13489 msgid "If you set @samp{service-count 0}, you probably need to grow this. Defaults to @samp{256000000}." -msgstr "" +msgstr "Si vous mettez @samp{service-count 0}, vous avez sans doute besoin d'augmenter ce paramètre. La valeur par défaut est @samp{256000000}." #. type: deftypevr #: doc/guix.texi:13493 #, no-wrap msgid "{@code{dovecot-configuration} parameter} dict-configuration dict" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} dict-configuration dict" #. type: deftypevr #: doc/guix.texi:13496 msgid "Dict configuration, as created by the @code{dict-configuration} constructor." -msgstr "" +msgstr "Configuration du dictionnaire, créé par le constructeur @code{dict-configuration}." #. type: deftypevr #: doc/guix.texi:13498 msgid "Available @code{dict-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{dict-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:13499 #, no-wrap msgid "{@code{dict-configuration} parameter} free-form-fields entries" -msgstr "" +msgstr "{paramètre de @code{dict-configuration}} free-form-fields entries" #. type: deftypevr #: doc/guix.texi:13502 msgid "A list of key-value pairs that this dict should hold. Defaults to @samp{()}." -msgstr "" +msgstr "Une liste de paires de clefs-valeurs que ce dictionnaire contient. La valeur par défaut est @samp{()}." #. type: deftypevr #: doc/guix.texi:13506 #, no-wrap msgid "{@code{dovecot-configuration} parameter} passdb-configuration-list passdbs" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} passdb-configuration-list passdbs" #. type: deftypevr #: doc/guix.texi:13509 msgid "A list of passdb configurations, each one created by the @code{passdb-configuration} constructor." -msgstr "" +msgstr "Une liste de configurations passdb, chacune créée par le constructeur @code{passdb-configuration}." #. type: deftypevr #: doc/guix.texi:13511 msgid "Available @code{passdb-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{passdb-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:13512 #, no-wrap msgid "{@code{passdb-configuration} parameter} string driver" -msgstr "" +msgstr "{paramètre de @code{passdb-configuration}} string driver" #. type: deftypevr #: doc/guix.texi:13517 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 "" +msgstr "Le pilote à utiliser par passdb. Les valeur valides comprennent @samp{pam}, @samp{passwd}, @samp{shadow}, @samp{bsdauth} et @samp{static}. La valeur par défaut est @samp{\"pam\"}." #. type: deftypevr #: doc/guix.texi:13519 #, no-wrap msgid "{@code{passdb-configuration} parameter} space-separated-string-list args" -msgstr "" +msgstr "{paramètre de @code{passdb-configuration}} space-separated-string-list args" #. type: deftypevr #: doc/guix.texi:13522 msgid "Space separated list of arguments to the passdb driver. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Liste d'arguments pour le pilote passdb séparés par des espaces. La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:13526 #, no-wrap msgid "{@code{dovecot-configuration} parameter} userdb-configuration-list userdbs" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} userdb-configuration-list userdbs" #. type: deftypevr #: doc/guix.texi:13529 msgid "List of userdb configurations, each one created by the @code{userdb-configuration} constructor." -msgstr "" +msgstr "Liste des configurations userdb, chacune créée par le constructeur @code{userdb-configuration}." #. type: deftypevr #: doc/guix.texi:13531 msgid "Available @code{userdb-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{userdb-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:13532 #, no-wrap msgid "{@code{userdb-configuration} parameter} string driver" -msgstr "" +msgstr "{paramètre de @code{userdb-configuration}} string driver" #. type: deftypevr #: doc/guix.texi:13536 msgid "The driver that the userdb should use. Valid values include @samp{passwd} and @samp{static}. Defaults to @samp{\"passwd\"}." -msgstr "" +msgstr "Le pilote que userdb devrait utiliser. Les valeurs valides comprennent @samp{passwd} et @samp{static}. La valeur par défaut est @samp{\"passwd\"}." #. type: deftypevr #: doc/guix.texi:13538 #, no-wrap msgid "{@code{userdb-configuration} parameter} space-separated-string-list args" -msgstr "" +msgstr "{paramètre de @code{userdb-configuration}} space-separated-string-list args" #. type: deftypevr #: doc/guix.texi:13541 msgid "Space separated list of arguments to the userdb driver. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Liste des arguments du pilote userdb séparés par des espaces. La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:13543 #, no-wrap msgid "{@code{userdb-configuration} parameter} free-form-args override-fields" -msgstr "" +msgstr "{paramètre de @code{userdb-configuration}} free-form-args override-fields" #. type: deftypevr #: doc/guix.texi:13546 msgid "Override fields from passwd. Defaults to @samp{()}." -msgstr "" +msgstr "Remplace des champs de passwd. La valeur par défaut est @samp{()}." #. type: deftypevr #: doc/guix.texi:13550 #, no-wrap msgid "{@code{dovecot-configuration} parameter} plugin-configuration plugin-configuration" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} plugin-configuration plugin-configuration" #. type: deftypevr #: doc/guix.texi:13553 msgid "Plug-in configuration, created by the @code{plugin-configuration} constructor." -msgstr "" +msgstr "Configuration du greffon, créé par le constructeur @code{plugin-configuration}." #. type: deftypevr #: doc/guix.texi:13555 #, no-wrap msgid "{@code{dovecot-configuration} parameter} list-of-namespace-configuration namespaces" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} list-of-namespace-configuration namespaces" #. type: deftypevr #: doc/guix.texi:13558 msgid "List of namespaces. Each item in the list is created by the @code{namespace-configuration} constructor." -msgstr "" +msgstr "Liste d'espaces de noms. Chaque élément de la liste est créé par le constructeur @code{namespace-configuration}." #. type: deftypevr #: doc/guix.texi:13560 msgid "Available @code{namespace-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{namespace-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:13561 #, no-wrap msgid "{@code{namespace-configuration} parameter} string name" -msgstr "" +msgstr "{paramètre de @code{namespace-configuration}} string name" #. type: deftypevr #: doc/guix.texi:13563 msgid "Name for this namespace." -msgstr "" +msgstr "Nom de cet espace de nom." #. type: deftypevr #: doc/guix.texi:13565 #, no-wrap msgid "{@code{namespace-configuration} parameter} string type" -msgstr "" +msgstr "{paramètre de @code{namespace-configuration}} string type" #. type: deftypevr #: doc/guix.texi:13568 msgid "Namespace type: @samp{private}, @samp{shared} or @samp{public}. Defaults to @samp{\"private\"}." -msgstr "" +msgstr "Type d'espace de nom : @samp{private}, @samp{shared} ou @samp{public}. La valeur par défaut est @samp{\"private\"}." #. type: deftypevr #: doc/guix.texi:13570 #, no-wrap msgid "{@code{namespace-configuration} parameter} string separator" -msgstr "" +msgstr "{paramètre de @code{namespace-configuration}} string separator" #. type: deftypevr #: doc/guix.texi:13576 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 "" +msgstr "Séparateur de hiérarchie à utiliser. Vous devriez utiliser le même séparateur pour tous les espaces de noms ou certains clients seront confus. @samp{/} est généralement une bonne valeur. La valeur par défaut dépend cependant du format de stockage sous-jacent. La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:13578 #, no-wrap msgid "{@code{namespace-configuration} parameter} string prefix" -msgstr "" +msgstr "{paramètre de @code{namespace-configuration}} string prefix" #. type: deftypevr #: doc/guix.texi:13582 msgid "Prefix required to access this namespace. This needs to be different for all namespaces. For example @samp{Public/}. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Préfixe requis pour accéder à cet espace de nom. Ce paramètres doit être différent pour tous les espaces de noms. Par exemple @samp{Public/}. La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:13584 #, no-wrap msgid "{@code{namespace-configuration} parameter} string location" -msgstr "" +msgstr "{paramètre de @code{namespace-configuration}} string location" #. type: deftypevr #: doc/guix.texi:13588 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 "" +msgstr "Emplacement physique de la boîte aux lettres. C'est le même format que mail_location, qui est aussi la valeur par défaut. La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:13590 #, no-wrap msgid "{@code{namespace-configuration} parameter} boolean inbox?" -msgstr "" +msgstr "{paramètre de @code{namespace-configuration}} boolean inbox?" #. type: deftypevr #: doc/guix.texi:13594 msgid "There can be only one INBOX, and this setting defines which namespace has it. Defaults to @samp{#f}." -msgstr "" +msgstr "Il ne peut y avoir qu'un INBOX, et ce paramètre définit l'espace de nom qui le possède. La valeur par défaut est @samp{#f}." #. type: deftypevr #: doc/guix.texi:13596 #, no-wrap msgid "{@code{namespace-configuration} parameter} boolean hidden?" -msgstr "" +msgstr "{paramètre de @code{namespace-configuration}} boolean hidden?" #. type: deftypevr #: doc/guix.texi:13604 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 "" +msgstr "Si l'espace de nom est caché, il n'est pas publié auprès des clients par l'extension NAMESPACE. Vous voudrez aussi sans doute indiquer @samp{list? #f}. C'est surtout utile lors de la conversion depuis un autre serveur avec des espaces de noms différents que vous voulez rendre obsolètes sans les casser. Par exemple vous pouvez cacher les espaces de noms avec les préfixes @samp{~/mail/}, @samp{~%u/mail/} et @samp{mail/}. La valeur par défaut est @samp{#f}." #. type: deftypevr #: doc/guix.texi:13606 #, no-wrap msgid "{@code{namespace-configuration} parameter} boolean list?" -msgstr "" +msgstr "{paramètre de @code{namespace-configuration}} boolean list?" #. type: deftypevr #: doc/guix.texi:13612 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 "" +msgstr "Montre les boîtes aux lettres sons cet espace de nom avec la commande LIST. Cela rend l'espace de nom visible pour les clients qui ne supportent pas l'extension NAMESPACE. La valeur spéciale @code{children} liste les boîtes aux lettres filles mais cache le préfixe de l'espace de nom. La valeur par défaut est @samp{#t}." #. type: deftypevr #: doc/guix.texi:13614 #, no-wrap msgid "{@code{namespace-configuration} parameter} boolean subscriptions?" -msgstr "" +msgstr "{paramètre de @code{namespace-configuration}} boolean subscriptions?" #. type: deftypevr #: doc/guix.texi:13619 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 "" +msgstr "Les espaces de noms gèrent leur propre souscription. Si la valeur est @code{#f}, l'espace de nom parent s'en charge. Le préfixe vide devrait toujours avoir cette valeur à @code{#t}. La valeur par défaut est @samp{#t}." #. type: deftypevr #: doc/guix.texi:13621 #, no-wrap msgid "{@code{namespace-configuration} parameter} mailbox-configuration-list mailboxes" -msgstr "" +msgstr "{paramètre de @code{namespace-configuration}} mailbox-configuration-list mailboxes" #. type: deftypevr #: doc/guix.texi:13624 msgid "List of predefined mailboxes in this namespace. Defaults to @samp{()}." -msgstr "" +msgstr "Liste des boîtes aux lettres prédéfinies dans cet espace de nom. La valeur par défaut est @samp{()}." #. type: deftypevr #: doc/guix.texi:13626 msgid "Available @code{mailbox-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{mailbox-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:13627 #, no-wrap msgid "{@code{mailbox-configuration} parameter} string name" -msgstr "" +msgstr "{paramètre de @code{mailbox-configuration}} string name" #. type: deftypevr #: doc/guix.texi:13629 msgid "Name for this mailbox." -msgstr "" +msgstr "Nom de cette boîte aux lettres." #. type: deftypevr #: doc/guix.texi:13631 #, no-wrap msgid "{@code{mailbox-configuration} parameter} string auto" -msgstr "" +msgstr "{paramètre de @code{mailbox-configuration}} string auto" #. type: deftypevr #: doc/guix.texi:13635 msgid "@samp{create} will automatically create this mailbox. @samp{subscribe} will both create and subscribe to the mailbox. Defaults to @samp{\"no\"}." -msgstr "" +msgstr "@samp{create} créera automatiquement cette boîte aux lettres. @samp{subscribe} créera et souscrira à la boîte aux lettres. La valeur par défaut est @samp{\"no\"}." #. type: deftypevr #: doc/guix.texi:13637 #, no-wrap msgid "{@code{mailbox-configuration} parameter} space-separated-string-list special-use" -msgstr "" +msgstr "{paramètre de @code{mailbox-configuration}} space-separated-string-list special-use" #. type: deftypevr #: doc/guix.texi:13642 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 "" +msgstr "Liste des attributs @code{SPECIAL-USE} IMAP spécifiés par la RFC 6154. Les valeurs valides sont @code{\\All}, @code{\\Archive}, @code{\\Drafts}, @code{\\Flagged}, @code{\\Junk}, @code{\\Sent} et @code{\\Trash}. La valeur par défaut est @samp{()}." #. type: deftypevr #: doc/guix.texi:13648 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name base-dir" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} file-name base-dir" #. type: deftypevr #: doc/guix.texi:13651 msgid "Base directory where to store runtime data. Defaults to @samp{\"/var/run/dovecot/\"}." -msgstr "" +msgstr "Répertoire de base où stocker les données d'exécution. La valeur par défaut est @samp{\"/var/run/dovecot/\"}." #. type: deftypevr #: doc/guix.texi:13653 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string login-greeting" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string login-greeting" #. type: deftypevr #: doc/guix.texi:13656 msgid "Greeting message for clients. Defaults to @samp{\"Dovecot ready.\"}." -msgstr "" +msgstr "Message d'accueil pour les clients. La valeur par défaut est @samp{\"Dovecot ready.\"}." #. type: deftypevr #: doc/guix.texi:13658 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-trusted-networks" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list login-trusted-networks" #. type: deftypevr #: doc/guix.texi:13665 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 "" +msgstr "Liste des groupes d'adresses de confiance. Les connexions depuis ces IP sont autorisées à modifier leurs adresses IP et leurs ports (pour la connexion et la vérification d'authentification). @samp{disable-plaintext-auth} est aussi ignoré pour ces réseaux. Typiquement vous voudrez spécifier votre mandataire IMAP ici. La valeur par défaut est @samp{()}." #. type: deftypevr #: doc/guix.texi:13667 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-access-sockets" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list login-access-sockets" #. type: deftypevr #: doc/guix.texi:13670 msgid "List of login access check sockets (e.g. tcpwrap). Defaults to @samp{()}." -msgstr "" +msgstr "Liste des sockets de vérification d'accès de connexion (p.@: ex.@: tcpwrap). La valeur par défaut est @samp{()}." #. type: deftypevr #: doc/guix.texi:13672 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean verbose-proctitle?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean verbose-proctitle?" #. type: deftypevr #: doc/guix.texi:13678 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 "" +msgstr "Montre des titres de processus plus verbeux (dans ps). Actuellement, montre le nom d'utilisateur et l'adresse IP. Utile pour voir qui utilise les processus IMAP (p.@: ex.@: des boîtes aux lettres partagées ou si le même uid est utilisé pour plusieurs comptes). La valeur par défaut est @samp{#f}." #. type: deftypevr #: doc/guix.texi:13680 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean shutdown-clients?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean shutdown-clients?" #. type: deftypevr #: doc/guix.texi:13686 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 "" +msgstr "Indique si les processus devraient toujours être tués lorsque le processus maître de Dovecot est éteint. La valeur @code{#f} signifie que Dovecot peut être mis à jour sans forcer les connexions clientes existantes à se fermer (bien que cela puisse être un problème si la mise à jour est un correctif de sécurité par exemple). La valeur par défaut est @samp{#t}." #. type: deftypevr #: doc/guix.texi:13688 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer doveadm-worker-count" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer doveadm-worker-count" #. type: deftypevr #: doc/guix.texi:13692 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 "" +msgstr "Si la valeur n'est pas zéro, lance les commandes de courriel via ce nombre de connexions au serveur doveadm au lieu de les lancer dans le même processus. La valeur par défaut est @samp{0}." #. type: deftypevr #: doc/guix.texi:13694 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string doveadm-socket-path" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string doveadm-socket-path" #. type: deftypevr #: doc/guix.texi:13697 msgid "UNIX socket or host:port used for connecting to doveadm server. Defaults to @samp{\"doveadm-server\"}." -msgstr "" +msgstr "Socket UNIX ou hôte:port utilisé pour se connecter au serveur doveadm. La valeur par défaut est @samp{\"doveadm-server\"}." #. type: deftypevr #: doc/guix.texi:13699 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list import-environment" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list import-environment" #. type: deftypevr #: doc/guix.texi:13703 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 "" +msgstr "Liste des variables d'environnement qui sont préservées au démarrage de Dovecot et passées à tous ses processus fils. Vous pouvez aussi donner des paires clef=valeur pour toujours spécifier ce paramètre." #. type: deftypevr #: doc/guix.texi:13705 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean disable-plaintext-auth?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean disable-plaintext-auth?" #. type: deftypevr #: doc/guix.texi:13712 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 "" +msgstr "Désactive la commande LOGIN et toutes les autres authentifications en texte clair à moins que SSL/TLS ne soit utilisé (capacité LOGINDISABLED). Remarquez que si l'IP distante correspond à l'IP locale (c.-à-d.@: que vous vous connectez depuis le même ordinateur), la connexion est considérée comme sécurisée et l'authentification en texte clair est permise. Voir aussi le paramètre ssl=required. La valeur par défaut est @samp{#t}." #. type: deftypevr #: doc/guix.texi:13714 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-cache-size" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer auth-cache-size" #. type: deftypevr #: doc/guix.texi:13719 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 "" +msgstr "Taille du cache d'authentification (p.@: ex.@: @samp{#e10e6}). 0 signifie qu'il est désactivé. Remarquez que bsdauth, PAM et vpopmail ont besoin que @samp{cache-key} soit indiqué pour que le cache soit utilisé. La valeur par défaut est @samp{0}." #. type: deftypevr #: doc/guix.texi:13721 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-cache-ttl" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string auth-cache-ttl" #. type: deftypevr #: doc/guix.texi:13729 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 "" +msgstr "Durée de vie des données en cache. Après l'expiration du TTL l'enregistrement en cache n'est plus utilisé *sauf* si la requête à la base de données principale revoie une erreur interne. Nous essayons aussi de gérer les changements de mot de passe automatiquement : si l'authentification précédente de l'utilisateur était réussie mais pas celle-ci, le cache n'est pas utilisé. Pour l'instant cela fonctionne avec l'authentification en texte clair uniquement. La valeur par défaut est @samp{\"1 hour\"}." #. type: deftypevr #: doc/guix.texi:13731 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-cache-negative-ttl" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string auth-cache-negative-ttl" #. type: deftypevr #: doc/guix.texi:13735 msgid "TTL for negative hits (user not found, password mismatch). 0 disables caching them completely. Defaults to @samp{\"1 hour\"}." -msgstr "" +msgstr "TTL pour les résultats négatifs (l'utilisateur n'est pas trouvé ou le mot de passe ne correspond pas). 0 désactive la mise en cache complètement. La valeur par défaut est @samp{\"1 hour\"}." #. type: deftypevr #: doc/guix.texi:13737 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-realms" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list auth-realms" #. type: deftypevr #: doc/guix.texi:13743 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 "" +msgstr "Liste des domaines pour les mécanismes d'authentification SASL qui en ont besoin. Vous pouvez laisser ce paramètre vide si vous ne voulez pas utiliser plusieurs domaines. Beaucoup de clients utilisent le premier domaine listé ici, donc gardez celui par défaut en premier. La valeur par défaut est @samp{()}" #. type: deftypevr #: doc/guix.texi:13745 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-default-realm" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string auth-default-realm" #. type: deftypevr #: doc/guix.texi:13750 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 "" +msgstr "Domaine par défaut à utiliser si aucun n'est spécifié. C'est utilisé pour les domaines SASL et pour ajouter @@domaine au nom d'utilisateur dans les authentification en texte clair. La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:13752 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-username-chars" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string auth-username-chars" #. type: deftypevr #: doc/guix.texi:13759 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 "" +msgstr "Liste des caractères autorisés dans les noms d'utilisateur. Si le nom d'utilisateur donné par l'utilisateur contient un caractère qui n'est pas listé ici, la connexion échoue automatiquement. C'est juste une vérification supplémentaire pour s'assure que l'utilisateur ne puisse pas exploiter des vulnérabilités potentielles d'échappement de guillemets avec les bases de données SQL/LDAP. Si vous voulez autoriser tous les caractères, indiquez la liste vide." #. type: deftypevr #: doc/guix.texi:13761 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-username-translation" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string auth-username-translation" #. type: deftypevr #: doc/guix.texi:13767 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 "" +msgstr "Traduction de caractères dans les noms d'utilisateur avant qu'ils ne soient cherchés en base. La valeur contient une série de caractère de -> à. Par exemple @samp{#@@/@@} signifie que @samp{#} et @samp{/} sont traduits en @samp{@@}. La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:13769 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-username-format" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string auth-username-format" #. type: deftypevr #: doc/guix.texi:13776 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 "" +msgstr "Format des noms d'utilisateur avant qu'ils ne soient cherchés en base. Vous pouvez utiliser les variables standard ici, p.@: ex.@: %Lu est le nom d'utilisateur en minuscule, %n enlève le domaine s'il est donné ou @samp{%n-AT-%d} changerait le @samp{@@} en @samp{-AT-}. Cette traduction est faite après les changements de @samp{auth-username-translation}. La valeur par défaut est @samp{\"%Lu\"}." #. type: deftypevr #: doc/guix.texi:13778 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-master-user-separator" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string auth-master-user-separator" #. type: deftypevr #: doc/guix.texi:13786 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 "" +msgstr "Si vous voulez permettre aux utilisateurs maîtres de se connecter en spécifiant le nom d'utilisateur maître dans la chaîne de nom d'utilisateur normal (c.-à-d.@: sans utiliser le support du mécanisme SASL pour cela), vous pouvez spécifier le caractère de séparation ici. Le format est ensuite . UW-IMAP utilise @samp{*} comme séparateur, donc ça pourrait être un bon choix. La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:13788 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-anonymous-username" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string auth-anonymous-username" #. type: deftypevr #: doc/guix.texi:13792 msgid "Username to use for users logging in with ANONYMOUS SASL mechanism. Defaults to @samp{\"anonymous\"}." -msgstr "" +msgstr "Nom d'utilisateur à utiliser pour les utilisateurs qui se connectent avec le mécanisme SASL ANONYMOUS. La valeur par défaut est @samp{\"anonymous\"}." #. type: deftypevr #: doc/guix.texi:13794 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-worker-max-count" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer auth-worker-max-count" #. type: deftypevr #: doc/guix.texi:13799 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 "" +msgstr "Nombre maximum de processus de travail dovecot-auth. Ils sont utilisés pour exécuter des requêtes passdb et userdb bloquantes (p.@: ex.@: MySQL et PAM). Ils sont créés automatiquement et détruits au besoin. La valeur par défaut est @samp{30}." #. type: deftypevr #: doc/guix.texi:13801 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-gssapi-hostname" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string auth-gssapi-hostname" #. type: deftypevr #: doc/guix.texi:13806 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 "" +msgstr "Nom d'hôte à utiliser dans les noms GSSAPI principaux. La valeur par défaut est d'utiliser le nom renvoyé par gethostname(). Utilisez @samp{$ALL} (avec des guillemets) pour permettre toutes les entrées keytab. La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:13808 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-krb5-keytab" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string auth-krb5-keytab" #. type: deftypevr #: doc/guix.texi:13814 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 "" +msgstr "Keytab Kerberos à utiliser pour le mécanisme GSSAPI. Utilisera la valeur par défaut du système (typiquement @file{/etc/krb5.keytab}) s'il n'est pas spécifié. Vous pourriez avoir besoin de faire en sorte que le service d'authentification tourne en root pour pouvoir lire ce fichier. La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:13816 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-use-winbind?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean auth-use-winbind?" #. type: deftypevr #: doc/guix.texi:13821 msgid "Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and @samp{ntlm-auth} helper. . Defaults to @samp{#f}." -msgstr "" +msgstr "Effectue l'authentification NTLM et GSS-SPNEGO avec le démon winbind de Samba et l'utilitaire @samp{ntlm-auth}. . La valeur par défaut est @samp{#f}." #. type: deftypevr #: doc/guix.texi:13823 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name auth-winbind-helper-path" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} file-name auth-winbind-helper-path" #. type: deftypevr #: doc/guix.texi:13826 msgid "Path for Samba's @samp{ntlm-auth} helper binary. Defaults to @samp{\"/usr/bin/ntlm_auth\"}." -msgstr "" +msgstr "Chemin du binaire @samp{ntlm-auth} de samba. La valeur par défaut est @samp{\"/usr/bin/ntlm_auth\"}." #. type: deftypevr #: doc/guix.texi:13828 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string auth-failure-delay" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string auth-failure-delay" #. type: deftypevr #: doc/guix.texi:13831 msgid "Time to delay before replying to failed authentications. Defaults to @samp{\"2 secs\"}." -msgstr "" +msgstr "Durée d'attente avant de répondre à des authentifications échouées. La valeur par défaut est @samp{\"2 secs\"}." #. type: deftypevr #: doc/guix.texi:13833 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-require-client-cert?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean auth-ssl-require-client-cert?" #. type: deftypevr #: doc/guix.texi:13837 msgid "Require a valid SSL client certificate or the authentication fails. Defaults to @samp{#f}." -msgstr "" +msgstr "Requiert un certification client SSL valide ou l'authentification échoue. La valeur par défaut est @samp{#f}." #. type: deftypevr #: doc/guix.texi:13839 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-username-from-cert?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean auth-ssl-username-from-cert?" #. type: deftypevr #: doc/guix.texi:13844 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 "" +msgstr "Prend le nom d'utilisateur du certificat SSL client, avec @code{X509_NAME_get_text_by_NID()} qui renvoie le CommonName du DN du sujet. La valeur par défaut est @samp{#f}." #. type: deftypevr #: doc/guix.texi:13846 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-mechanisms" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list auth-mechanisms" #. type: deftypevr #: doc/guix.texi:13852 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 "" +msgstr "Liste des mécanismes d'authentification souhaités. Les mécanismes supportés sont : @samp{plain}, @samp{login}, @samp{digest-md5}, @samp{cram-md5}, @samp{ntlm}, @samp{rpa}, @samp{apop}, @samp{anonymous}, @samp{gssapi}, @samp{otp}, @samp{skey} et @samp{gss-spnego}. Remarquez : Voir aussi le paramètre @samp{disable-plaintext-auth}." #. type: deftypevr #: doc/guix.texi:13854 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-servers" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list director-servers" #. type: deftypevr #: doc/guix.texi:13859 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 "" +msgstr "Liste des IP ou des noms d'hôtes des serveurs directeurs, dont soi-même. Les ports peuvent être spécifiés avec ip:port. Le port par défaut est le même que le @samp{inet-listener} du service directeur. La valeur par défaut est @samp{()}." #. type: deftypevr #: doc/guix.texi:13861 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-mail-servers" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list director-mail-servers" #. type: deftypevr #: doc/guix.texi:13865 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 "" +msgstr "Liste des IP ou des noms d'hôtes de tous les serveurs de courriel de la grappe. Les intervalles sont aussi permis, comme 10.0.0.10-10.0.0.30. La valeur par défaut est @samp{()}." #. type: deftypevr #: doc/guix.texi:13867 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string director-user-expire" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string director-user-expire" #. type: deftypevr #: doc/guix.texi:13871 msgid "How long to redirect users to a specific server after it no longer has any connections. Defaults to @samp{\"15 min\"}." -msgstr "" +msgstr "Combien de temps avant de rediriger les utilisateurs à un serveur spécifique après qu'il n'y a plus de connexion. La valeur par défaut est @samp{\"15 min\"}." #. type: deftypevr #: doc/guix.texi:13873 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string director-username-hash" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string director-username-hash" #. type: deftypevr #: doc/guix.texi:13878 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 "" +msgstr "La manière de traduire le nom d'utilisateur avant de le hasher. Les valeurs utiles comprennent %Ln si l'utilisateur peut se connecter avec ou sans @@domain, %Ld si les boîtes aux lettres sont partagées dans le domaine. La valeur par défaut est @samp{\"%Lu\"}." #. type: deftypevr #: doc/guix.texi:13880 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string log-path" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string log-path" #. type: deftypevr #: doc/guix.texi:13884 msgid "Log file to use for error messages. @samp{syslog} logs to syslog, @samp{/dev/stderr} logs to stderr. Defaults to @samp{\"syslog\"}." -msgstr "" +msgstr "Fichier de journal à utiliser pour les messages d'erreur. @samp{syslog} journalise vers syslog, @samp{/dev/stderr} vers la sortie d'erreur. La valeur par défaut est @samp{\"syslog\"}." #. type: deftypevr #: doc/guix.texi:13886 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string info-log-path" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string info-log-path" #. type: deftypevr #: doc/guix.texi:13890 msgid "Log file to use for informational messages. Defaults to @samp{log-path}. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Fichier de journal à utiliser pour les messages d'information. La valeur par défaut est @samp{log-path}. La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:13892 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string debug-log-path" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string debug-log-path" #. type: deftypevr #: doc/guix.texi:13896 msgid "Log file to use for debug messages. Defaults to @samp{info-log-path}. Defaults to @samp{\"\"}." -msgstr "" +msgstr "Fichier de journal à utiliser pour les messages de débogage. La valeur par défaut est @samp{info-log-path}. La valeur par défaut est @samp{\"\"}." #. type: deftypevr #: doc/guix.texi:13898 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string syslog-facility" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string syslog-facility" #. type: deftypevr #: doc/guix.texi:13903 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 "" +msgstr "Dispositif syslog à utiliser si vous journalisez avec syslog. Normalement si vous ne voulez pas utiliser @samp{mail}, vous voudrez utiliser local0..local7. D'autres dispositifs standard sont supportés. La valeur par défaut est @samp{\"mail\"}." #. type: deftypevr #: doc/guix.texi:13905 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-verbose?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean auth-verbose?" #. type: deftypevr #: doc/guix.texi:13909 @@ -25125,7 +25522,7 @@ msgstr "" #: doc/guix.texi:13911 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-verbose-passwords?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean auth-verbose-passwords?" #. type: deftypevr #: doc/guix.texi:13918 @@ -25136,7 +25533,7 @@ msgstr "" #: doc/guix.texi:13920 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-debug?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean auth-debug?" #. type: deftypevr #: doc/guix.texi:13924 @@ -25147,7 +25544,7 @@ msgstr "" #: doc/guix.texi:13926 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean auth-debug-passwords?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean auth-debug-passwords?" #. type: deftypevr #: doc/guix.texi:13931 @@ -25158,7 +25555,7 @@ msgstr "" #: doc/guix.texi:13933 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-debug?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean mail-debug?" #. type: deftypevr #: doc/guix.texi:13937 @@ -25169,7 +25566,7 @@ msgstr "" #: doc/guix.texi:13939 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean verbose-ssl?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean verbose-ssl?" #. type: deftypevr #: doc/guix.texi:13942 @@ -25180,7 +25577,7 @@ msgstr "" #: doc/guix.texi:13944 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string log-timestamp" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string log-timestamp" #. type: deftypevr #: doc/guix.texi:13948 @@ -25191,7 +25588,7 @@ msgstr "" #: doc/guix.texi:13950 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-log-format-elements" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list login-log-format-elements" #. type: deftypevr #: doc/guix.texi:13954 @@ -25202,7 +25599,7 @@ msgstr "" #: doc/guix.texi:13956 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string login-log-format" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string login-log-format" #. type: deftypevr #: doc/guix.texi:13960 @@ -25213,7 +25610,7 @@ msgstr "" #: doc/guix.texi:13962 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-log-prefix" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mail-log-prefix" #. type: deftypevr #: doc/guix.texi:13966 @@ -25224,7 +25621,7 @@ msgstr "" #: doc/guix.texi:13968 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string deliver-log-format" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string deliver-log-format" #. type: deftypevr #: doc/guix.texi:13970 @@ -25235,7 +25632,7 @@ msgstr "" #: doc/guix.texi:13971 #, no-wrap msgid "%$" -msgstr "" +msgstr "%$" #. type: table #: doc/guix.texi:13973 @@ -25246,7 +25643,7 @@ msgstr "" #: doc/guix.texi:13973 #, no-wrap msgid "%m" -msgstr "" +msgstr "%m" #. type: table #: doc/guix.texi:13975 @@ -25257,7 +25654,7 @@ msgstr "" #: doc/guix.texi:13975 doc/guix.texi:14507 #, no-wrap msgid "%s" -msgstr "" +msgstr "%s" #. type: table #: doc/guix.texi:13977 @@ -25268,7 +25665,7 @@ msgstr "" #: doc/guix.texi:13977 #, no-wrap msgid "%f" -msgstr "" +msgstr "%f" #. type: table #: doc/guix.texi:13979 @@ -25284,7 +25681,7 @@ msgstr "" #: doc/guix.texi:13981 #, no-wrap msgid "%w" -msgstr "" +msgstr "%w" #. type: table #: doc/guix.texi:13983 @@ -25294,13 +25691,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:13985 msgid "Defaults to @samp{\"msgid=%m: %$\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"msgid=%m: %$\"}." #. type: deftypevr #: doc/guix.texi:13987 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-location" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mail-location" #. type: deftypevr #: doc/guix.texi:13992 @@ -25326,7 +25723,7 @@ msgstr "" #: doc/guix.texi:14004 doc/guix.texi:14503 #, no-wrap msgid "%n" -msgstr "" +msgstr "%n" #. type: table #: doc/guix.texi:14006 @@ -25337,7 +25734,7 @@ msgstr "" #: doc/guix.texi:14006 #, no-wrap msgid "%d" -msgstr "" +msgstr "%d" #. type: table #: doc/guix.texi:14008 @@ -25348,7 +25745,7 @@ msgstr "" #: doc/guix.texi:14008 #, no-wrap msgid "%h" -msgstr "" +msgstr "%h" #. type: table #: doc/guix.texi:14010 @@ -25364,25 +25761,25 @@ msgstr "" #: doc/guix.texi:14014 #, no-wrap msgid "maildir:~/Maildir" -msgstr "" +msgstr "maildir:~/Maildir" #. type: item #: doc/guix.texi:14015 #, no-wrap msgid "mbox:~/mail:INBOX=/var/mail/%u" -msgstr "" +msgstr "mbox:~/mail:INBOX=/var/mail/%u" #. type: item #: doc/guix.texi:14016 #, no-wrap msgid "mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%" -msgstr "" +msgstr "mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%" #. type: deftypevr #: doc/guix.texi:14021 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-uid" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mail-uid" #. type: deftypevr #: doc/guix.texi:14026 @@ -25393,13 +25790,13 @@ msgstr "" #: doc/guix.texi:14028 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-gid" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mail-gid" #. type: deftypevr #: doc/guix.texi:14033 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-privileged-group" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mail-privileged-group" #. type: deftypevr #: doc/guix.texi:14039 @@ -25410,7 +25807,7 @@ msgstr "" #: doc/guix.texi:14041 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-access-groups" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mail-access-groups" #. type: deftypevr #: doc/guix.texi:14049 @@ -25421,7 +25818,7 @@ msgstr "" #: doc/guix.texi:14051 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-full-filesystem-access?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean mail-full-filesystem-access?" #. type: deftypevr #: doc/guix.texi:14057 @@ -25432,7 +25829,7 @@ msgstr "" #: doc/guix.texi:14059 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mmap-disable?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean mmap-disable?" #. type: deftypevr #: doc/guix.texi:14063 @@ -25443,7 +25840,7 @@ msgstr "" #: doc/guix.texi:14065 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean dotlock-use-excl?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean dotlock-use-excl?" #. type: deftypevr #: doc/guix.texi:14070 @@ -25454,7 +25851,7 @@ msgstr "" #: doc/guix.texi:14072 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-fsync" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mail-fsync" #. type: deftypevr #: doc/guix.texi:14074 @@ -25485,13 +25882,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:14083 msgid "Defaults to @samp{\"optimized\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"optimized\"}." #. type: deftypevr #: doc/guix.texi:14085 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-storage?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean mail-nfs-storage?" #. type: deftypevr #: doc/guix.texi:14090 @@ -25502,7 +25899,7 @@ msgstr "" #: doc/guix.texi:14092 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-index?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean mail-nfs-index?" #. type: deftypevr #: doc/guix.texi:14096 @@ -25513,7 +25910,7 @@ msgstr "" #: doc/guix.texi:14098 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string lock-method" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string lock-method" #. type: deftypevr #: doc/guix.texi:14104 @@ -25524,7 +25921,7 @@ msgstr "" #: doc/guix.texi:14106 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name mail-temp-dir" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} file-name mail-temp-dir" #. type: deftypevr #: doc/guix.texi:14110 @@ -25535,7 +25932,7 @@ msgstr "" #: doc/guix.texi:14112 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-uid" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer first-valid-uid" #. type: deftypevr #: doc/guix.texi:14118 @@ -25546,13 +25943,13 @@ msgstr "" #: doc/guix.texi:14120 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-uid" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer last-valid-uid" #. type: deftypevr #: doc/guix.texi:14125 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-gid" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer first-valid-gid" #. type: deftypevr #: doc/guix.texi:14130 @@ -25563,13 +25960,13 @@ msgstr "" #: doc/guix.texi:14132 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-gid" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer last-valid-gid" #. type: deftypevr #: doc/guix.texi:14137 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-max-keyword-length" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer mail-max-keyword-length" #. type: deftypevr #: doc/guix.texi:14141 @@ -25580,7 +25977,7 @@ msgstr "" #: doc/guix.texi:14143 #, no-wrap msgid "{@code{dovecot-configuration} parameter} colon-separated-file-name-list valid-chroot-dirs" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} colon-separated-file-name-list valid-chroot-dirs" #. type: deftypevr #: doc/guix.texi:14153 @@ -25591,7 +25988,7 @@ msgstr "" #: doc/guix.texi:14155 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-chroot" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mail-chroot" #. type: deftypevr #: doc/guix.texi:14164 @@ -25602,7 +25999,7 @@ msgstr "" #: doc/guix.texi:14166 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name auth-socket-path" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} file-name auth-socket-path" #. type: deftypevr #: doc/guix.texi:14170 @@ -25613,7 +26010,7 @@ msgstr "" #: doc/guix.texi:14172 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name mail-plugin-dir" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} file-name mail-plugin-dir" #. type: deftypevr #: doc/guix.texi:14175 @@ -25624,7 +26021,7 @@ msgstr "" #: doc/guix.texi:14177 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mail-plugins" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list mail-plugins" #. type: deftypevr #: doc/guix.texi:14181 @@ -25635,7 +26032,7 @@ msgstr "" #: doc/guix.texi:14183 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-cache-min-mail-count" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer mail-cache-min-mail-count" #. type: deftypevr #: doc/guix.texi:14188 @@ -25646,7 +26043,7 @@ msgstr "" #: doc/guix.texi:14190 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mailbox-idle-check-interval" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mailbox-idle-check-interval" #. type: deftypevr #: doc/guix.texi:14197 @@ -25657,7 +26054,7 @@ msgstr "" #: doc/guix.texi:14199 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mail-save-crlf?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean mail-save-crlf?" #. type: deftypevr #: doc/guix.texi:14206 @@ -25668,7 +26065,7 @@ msgstr "" #: doc/guix.texi:14208 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean maildir-stat-dirs?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean maildir-stat-dirs?" #. type: deftypevr #: doc/guix.texi:14216 @@ -25679,7 +26076,7 @@ msgstr "" #: doc/guix.texi:14218 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean maildir-copy-with-hardlinks?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean maildir-copy-with-hardlinks?" #. type: deftypevr #: doc/guix.texi:14223 @@ -25690,7 +26087,7 @@ msgstr "" #: doc/guix.texi:14225 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean maildir-very-dirty-syncs?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean maildir-very-dirty-syncs?" #. type: deftypevr #: doc/guix.texi:14230 @@ -25701,7 +26098,7 @@ msgstr "" #: doc/guix.texi:14232 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-read-locks" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list mbox-read-locks" #. type: deftypevr #: doc/guix.texi:14235 @@ -25712,7 +26109,7 @@ msgstr "" #: doc/guix.texi:14237 #, no-wrap msgid "dotlock" -msgstr "" +msgstr "dotlock" #. type: table #: doc/guix.texi:14241 @@ -25723,7 +26120,7 @@ msgstr "" #: doc/guix.texi:14241 #, no-wrap msgid "dotlock-try" -msgstr "" +msgstr "dotlock-try" #. type: table #: doc/guix.texi:14244 @@ -25734,7 +26131,7 @@ msgstr "" #: doc/guix.texi:14244 #, no-wrap msgid "fcntl" -msgstr "" +msgstr "fcntl" #. type: table #: doc/guix.texi:14246 @@ -25745,7 +26142,7 @@ msgstr "" #: doc/guix.texi:14246 #, no-wrap msgid "flock" -msgstr "" +msgstr "flock" #. type: table #: doc/guix.texi:14248 doc/guix.texi:14250 @@ -25756,7 +26153,7 @@ msgstr "" #: doc/guix.texi:14248 #, no-wrap msgid "lockf" -msgstr "" +msgstr "lockf" #. type: deftypevr #: doc/guix.texi:14256 @@ -25767,13 +26164,13 @@ msgstr "" #: doc/guix.texi:14258 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-write-locks" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list mbox-write-locks" #. type: deftypevr #: doc/guix.texi:14262 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mbox-lock-timeout" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mbox-lock-timeout" #. type: deftypevr #: doc/guix.texi:14265 @@ -25784,7 +26181,7 @@ msgstr "" #: doc/guix.texi:14267 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mbox-dotlock-change-timeout" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mbox-dotlock-change-timeout" #. type: deftypevr #: doc/guix.texi:14271 @@ -25795,7 +26192,7 @@ msgstr "" #: doc/guix.texi:14273 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mbox-dirty-syncs?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean mbox-dirty-syncs?" #. type: deftypevr #: doc/guix.texi:14284 @@ -25806,7 +26203,7 @@ msgstr "" #: doc/guix.texi:14286 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mbox-very-dirty-syncs?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean mbox-very-dirty-syncs?" #. type: deftypevr #: doc/guix.texi:14291 @@ -25817,7 +26214,7 @@ msgstr "" #: doc/guix.texi:14293 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mbox-lazy-writes?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean mbox-lazy-writes?" #. type: deftypevr #: doc/guix.texi:14299 @@ -25828,7 +26225,7 @@ msgstr "" #: doc/guix.texi:14301 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mbox-min-index-size" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer mbox-min-index-size" #. type: deftypevr #: doc/guix.texi:14306 @@ -25839,7 +26236,7 @@ msgstr "" #: doc/guix.texi:14308 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mdbox-rotate-size" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer mdbox-rotate-size" #. type: deftypevr #: doc/guix.texi:14311 @@ -25850,7 +26247,7 @@ msgstr "" #: doc/guix.texi:14313 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mdbox-rotate-interval" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mdbox-rotate-interval" #. type: deftypevr #: doc/guix.texi:14318 @@ -25861,7 +26258,7 @@ msgstr "" #: doc/guix.texi:14320 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean mdbox-preallocate-space?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean mdbox-preallocate-space?" #. type: deftypevr #: doc/guix.texi:14325 @@ -25872,7 +26269,7 @@ msgstr "" #: doc/guix.texi:14327 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-attachment-dir" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mail-attachment-dir" #. type: deftypevr #: doc/guix.texi:14331 @@ -25893,7 +26290,7 @@ msgstr "" #: doc/guix.texi:14338 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-attachment-min-size" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer mail-attachment-min-size" #. type: deftypevr #: doc/guix.texi:14343 @@ -25904,7 +26301,7 @@ msgstr "" #: doc/guix.texi:14345 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-attachment-fs" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mail-attachment-fs" #. type: deftypevr #: doc/guix.texi:14347 @@ -25947,13 +26344,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:14356 msgid "Defaults to @samp{\"sis posix\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"sis posix\"}." #. type: deftypevr #: doc/guix.texi:14358 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string mail-attachment-hash" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string mail-attachment-hash" #. type: deftypevr #: doc/guix.texi:14364 @@ -25964,24 +26361,24 @@ msgstr "" #: doc/guix.texi:14366 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-process-limit" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer default-process-limit" #. type: deftypevr #: doc/guix.texi:14371 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-client-limit" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer default-client-limit" #. type: deftypevr #: doc/guix.texi:14374 doc/guix.texi:18402 msgid "Defaults to @samp{1000}." -msgstr "" +msgstr "La valeur par défaut est @samp{1000}." #. type: deftypevr #: doc/guix.texi:14376 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-vsz-limit" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer default-vsz-limit" #. type: deftypevr #: doc/guix.texi:14381 @@ -25992,7 +26389,7 @@ msgstr "" #: doc/guix.texi:14383 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string default-login-user" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string default-login-user" #. type: deftypevr #: doc/guix.texi:14388 @@ -26003,7 +26400,7 @@ msgstr "" #: doc/guix.texi:14390 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string default-internal-user" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string default-internal-user" #. type: deftypevr #: doc/guix.texi:14395 @@ -26014,7 +26411,7 @@ msgstr "" #: doc/guix.texi:14397 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string ssl?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string ssl?" #. type: deftypevr #: doc/guix.texi:14400 @@ -26025,7 +26422,7 @@ msgstr "" #: doc/guix.texi:14402 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string ssl-cert" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string ssl-cert" #. type: deftypevr #: doc/guix.texi:14405 @@ -26036,7 +26433,7 @@ msgstr "" #: doc/guix.texi:14407 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string ssl-key" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string ssl-key" #. type: deftypevr #: doc/guix.texi:14412 @@ -26047,7 +26444,7 @@ msgstr "" #: doc/guix.texi:14414 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string ssl-key-password" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string ssl-key-password" #. type: deftypevr #: doc/guix.texi:14420 @@ -26058,7 +26455,7 @@ msgstr "" #: doc/guix.texi:14422 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string ssl-ca" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string ssl-ca" #. type: deftypevr #: doc/guix.texi:14428 @@ -26069,7 +26466,7 @@ msgstr "" #: doc/guix.texi:14430 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean ssl-require-crl?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean ssl-require-crl?" #. type: deftypevr #: doc/guix.texi:14433 @@ -26080,7 +26477,7 @@ msgstr "" #: doc/guix.texi:14435 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean ssl-verify-client-cert?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean ssl-verify-client-cert?" #. type: deftypevr #: doc/guix.texi:14439 @@ -26091,7 +26488,7 @@ msgstr "" #: doc/guix.texi:14441 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string ssl-cert-username-field" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string ssl-cert-username-field" #. type: deftypevr #: doc/guix.texi:14446 @@ -26102,7 +26499,7 @@ msgstr "" #: doc/guix.texi:14448 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string ssl-min-protocol" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string ssl-min-protocol" #. type: deftypevr #: doc/guix.texi:14451 @@ -26113,7 +26510,7 @@ msgstr "" #: doc/guix.texi:14453 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string ssl-cipher-list" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string ssl-cipher-list" #. type: deftypevr #: doc/guix.texi:14456 @@ -26124,7 +26521,7 @@ msgstr "" #: doc/guix.texi:14458 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string ssl-crypto-device" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string ssl-crypto-device" #. type: deftypevr #: doc/guix.texi:14461 @@ -26135,7 +26532,7 @@ msgstr "" #: doc/guix.texi:14463 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string postmaster-address" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string postmaster-address" #. type: deftypevr #: doc/guix.texi:14467 @@ -26146,7 +26543,7 @@ msgstr "" #: doc/guix.texi:14469 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string hostname" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string hostname" #. type: deftypevr #: doc/guix.texi:14473 @@ -26157,7 +26554,7 @@ msgstr "" #: doc/guix.texi:14475 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean quota-full-tempfail?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean quota-full-tempfail?" #. type: deftypevr #: doc/guix.texi:14479 @@ -26168,7 +26565,7 @@ msgstr "" #: doc/guix.texi:14481 #, no-wrap msgid "{@code{dovecot-configuration} parameter} file-name sendmail-path" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} file-name sendmail-path" #. type: deftypevr #: doc/guix.texi:14484 @@ -26179,7 +26576,7 @@ msgstr "" #: doc/guix.texi:14486 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string submission-host" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string submission-host" #. type: deftypevr #: doc/guix.texi:14490 @@ -26190,7 +26587,7 @@ msgstr "" #: doc/guix.texi:14492 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string rejection-subject" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string rejection-subject" #. type: deftypevr #: doc/guix.texi:14496 @@ -26201,7 +26598,7 @@ msgstr "" #: doc/guix.texi:14498 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string rejection-reason" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string rejection-reason" #. type: deftypevr #: doc/guix.texi:14501 @@ -26217,7 +26614,7 @@ msgstr "" #: doc/guix.texi:14505 #, no-wrap msgid "%r" -msgstr "" +msgstr "%r" #. type: table #: doc/guix.texi:14507 @@ -26233,7 +26630,7 @@ msgstr "" #: doc/guix.texi:14509 #, no-wrap msgid "%t" -msgstr "" +msgstr "%t" #. type: table #: doc/guix.texi:14511 @@ -26243,13 +26640,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:14513 msgid "Defaults to @samp{\"Your message to <%t> was automatically rejected:%n%r\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"Your message to <%t> was automatically rejected:%n%r\"}." #. type: deftypevr #: doc/guix.texi:14515 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string recipient-delimiter" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string recipient-delimiter" #. type: deftypevr #: doc/guix.texi:14519 @@ -26260,7 +26657,7 @@ msgstr "" #: doc/guix.texi:14521 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string lda-original-recipient-header" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string lda-original-recipient-header" #. type: deftypevr #: doc/guix.texi:14527 @@ -26271,7 +26668,7 @@ msgstr "" #: doc/guix.texi:14529 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autocreate?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean lda-mailbox-autocreate?" #. type: deftypevr #: doc/guix.texi:14533 @@ -26282,7 +26679,7 @@ msgstr "" #: doc/guix.texi:14535 #, no-wrap msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autosubscribe?" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} boolean lda-mailbox-autosubscribe?" #. type: deftypevr #: doc/guix.texi:14539 @@ -26293,7 +26690,7 @@ msgstr "" #: doc/guix.texi:14541 #, no-wrap msgid "{@code{dovecot-configuration} parameter} non-negative-integer imap-max-line-length" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer imap-max-line-length" #. type: deftypevr #: doc/guix.texi:14547 @@ -26304,7 +26701,7 @@ msgstr "" #: doc/guix.texi:14549 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-logout-format" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string imap-logout-format" #. type: deftypevr #: doc/guix.texi:14551 @@ -26315,7 +26712,7 @@ msgstr "" #: doc/guix.texi:14552 #, no-wrap msgid "%i" -msgstr "" +msgstr "%i" #. type: table #: doc/guix.texi:14554 @@ -26326,7 +26723,7 @@ msgstr "" #: doc/guix.texi:14554 #, no-wrap msgid "%o" -msgstr "" +msgstr "%o" #. type: table #: doc/guix.texi:14556 @@ -26342,7 +26739,7 @@ msgstr "" #: doc/guix.texi:14561 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-capability" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string imap-capability" #. type: deftypevr #: doc/guix.texi:14565 @@ -26353,7 +26750,7 @@ msgstr "" #: doc/guix.texi:14567 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-idle-notify-interval" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string imap-idle-notify-interval" #. type: deftypevr #: doc/guix.texi:14571 @@ -26364,7 +26761,7 @@ msgstr "" #: doc/guix.texi:14573 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-id-send" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string imap-id-send" #. type: deftypevr #: doc/guix.texi:14579 @@ -26375,7 +26772,7 @@ msgstr "" #: doc/guix.texi:14581 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-id-log" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string imap-id-log" #. type: deftypevr #: doc/guix.texi:14584 @@ -26386,7 +26783,7 @@ msgstr "" #: doc/guix.texi:14586 #, no-wrap msgid "{@code{dovecot-configuration} parameter} space-separated-string-list imap-client-workarounds" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list imap-client-workarounds" #. type: deftypevr #: doc/guix.texi:14588 @@ -26397,7 +26794,7 @@ msgstr "" #: doc/guix.texi:14590 #, no-wrap msgid "delay-newmail" -msgstr "" +msgstr "delay-newmail" #. type: table #: doc/guix.texi:14597 @@ -26408,7 +26805,7 @@ msgstr "" #: doc/guix.texi:14598 #, no-wrap msgid "tb-extra-mailbox-sep" -msgstr "" +msgstr "tb-extra-mailbox-sep" #. type: table #: doc/guix.texi:14602 @@ -26419,7 +26816,7 @@ msgstr "" #: doc/guix.texi:14603 #, no-wrap msgid "tb-lsub-flags" -msgstr "" +msgstr "tb-lsub-flags" #. type: table #: doc/guix.texi:14607 @@ -26430,7 +26827,7 @@ msgstr "" #: doc/guix.texi:14611 #, no-wrap msgid "{@code{dovecot-configuration} parameter} string imap-urlauth-host" -msgstr "" +msgstr "{paramètre de @code{dovecot-configuration}} string imap-urlauth-host" #. type: deftypevr #: doc/guix.texi:14614 @@ -26450,19 +26847,19 @@ msgstr "" #. type: Plain text #: doc/guix.texi:14630 msgid "Available @code{opaque-dovecot-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{opaque-dovecot-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:14631 #, no-wrap msgid "{@code{opaque-dovecot-configuration} parameter} package dovecot" -msgstr "" +msgstr "{paramètre de @code{opaque-dovecot-configuration}} package dovecot" #. type: deftypevr #: doc/guix.texi:14635 #, no-wrap msgid "{@code{opaque-dovecot-configuration} parameter} string string" -msgstr "" +msgstr "{paramètre de @code{opaque-dovecot-configuration}} string string" #. type: deftypevr #: doc/guix.texi:14637 @@ -26482,6 +26879,9 @@ msgid "" " (opaque-dovecot-configuration\n" " (string \"\")))\n" msgstr "" +"(dovecot-service #:config\n" +" (opaque-dovecot-configuration\n" +" (string \"\")))\n" #. type: subsubheading #: doc/guix.texi:14648 @@ -26493,7 +26893,7 @@ msgstr "" #: doc/guix.texi:14650 #, no-wrap msgid "{Scheme Variable} opensmtpd-service-type" -msgstr "" +msgstr "{Variable Scheme} opensmtpd-service-type" #. type: deffn #: doc/guix.texi:14654 @@ -26508,12 +26908,15 @@ msgid "" " (opensmtpd-configuration\n" " (config-file (local-file \"./my-smtpd.conf\"))))\n" msgstr "" +"(service opensmtpd-service-type\n" +" (opensmtpd-configuration\n" +" (config-file (local-file \"./my-smtpd.conf\"))))\n" #. type: deftp #: doc/guix.texi:14662 #, no-wrap msgid "{Data Type} opensmtpd-configuration" -msgstr "" +msgstr "{Type de données} opensmtpd-configuration" #. type: deftp #: doc/guix.texi:14664 @@ -26524,7 +26927,7 @@ msgstr "" #: doc/guix.texi:14666 #, no-wrap msgid "@code{package} (default: @var{opensmtpd})" -msgstr "" +msgstr "@code{package} (par défaut : @var{opensmtpd})" #. type: table #: doc/guix.texi:14668 @@ -26535,7 +26938,7 @@ msgstr "" #: doc/guix.texi:14669 #, no-wrap msgid "@code{config-file} (default: @var{%default-opensmtpd-file})" -msgstr "" +msgstr "@code{config-file} (par défaut : @var{%default-opensmtpd-file})" #. type: table #: doc/guix.texi:14674 @@ -26564,13 +26967,13 @@ msgstr "" #: doc/guix.texi:14682 #, no-wrap msgid "SMTP" -msgstr "" +msgstr "SMTP" #. type: deffn #: doc/guix.texi:14684 #, no-wrap msgid "{Scheme Variable} exim-service-type" -msgstr "" +msgstr "{Variable Scheme} exim-service-type" #. type: deffn #: doc/guix.texi:14688 @@ -26585,6 +26988,9 @@ msgid "" " (exim-configuration\n" " (config-file (local-file \"./my-exim.conf\"))))\n" msgstr "" +"(service exim-service-type\n" +" (exim-configuration\n" +" (config-file (local-file \"./my-exim.conf\"))))\n" #. type: Plain text #: doc/guix.texi:14699 @@ -26595,7 +27001,7 @@ msgstr "" #: doc/guix.texi:14700 #, no-wrap msgid "{Data Type} exim-configuration" -msgstr "" +msgstr "{Type de données} exim-configuration" #. type: deftp #: doc/guix.texi:14702 @@ -26606,7 +27012,7 @@ msgstr "" #: doc/guix.texi:14704 #, no-wrap msgid "@code{package} (default: @var{exim})" -msgstr "" +msgstr "@code{package} (par défaut : @var{exim})" #. type: table #: doc/guix.texi:14706 @@ -26640,7 +27046,7 @@ msgstr "" #: doc/guix.texi:14722 #, no-wrap msgid "{Scheme Variable} mail-aliases-service-type" -msgstr "" +msgstr "{Variable Scheme} mail-aliases-service-type" #. type: deffn #: doc/guix.texi:14725 @@ -26655,6 +27061,9 @@ msgid "" " '((\"postmaster\" \"bob\")\n" " (\"bob\" \"bob@@example.com\" \"bob@@example2.com\")))\n" msgstr "" +"(service mail-aliases-service-type\n" +" '((\"postmaster\" \"bob\")\n" +" (\"bob\" \"bob@@example.com\" \"bob@@example2.com\")))\n" #. type: Plain text #: doc/guix.texi:14738 @@ -26676,13 +27085,13 @@ msgstr "" #: doc/guix.texi:14749 #, no-wrap msgid "jabber" -msgstr "" +msgstr "jabber" #. type: cindex #: doc/guix.texi:14750 #, no-wrap msgid "XMPP" -msgstr "" +msgstr "XMPP" #. type: Plain text #: doc/guix.texi:14753 @@ -26699,7 +27108,7 @@ msgstr "" #: doc/guix.texi:14756 #, no-wrap msgid "{Scheme Variable} prosody-service-type" -msgstr "" +msgstr "{Variable Scheme} prosody-service-type" #. type: deffn #: doc/guix.texi:14760 @@ -26724,6 +27133,19 @@ msgid "" " (virtualhost-configuration\n" " (domain \"example.net\"))))))\n" msgstr "" +"(service prosody-service-type\n" +" (prosody-configuration\n" +" (modules-enabled (cons \"groups\" \"mam\" %default-modules-enabled))\n" +" (int-components\n" +" (list\n" +" (int-component-configuration\n" +" (hostname \"conference.example.net\")\n" +" (plugin \"muc\")\n" +" (mod-muc (mod-muc-configuration)))))\n" +" (virtualhosts\n" +" (list\n" +" (virtualhost-configuration\n" +" (domain \"example.net\"))))))\n" #. type: deffn #: doc/guix.texi:14778 @@ -26754,7 +27176,7 @@ msgstr "" #. type: Plain text #: doc/guix.texi:14801 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. Types starting with @code{maybe-} denote parameters that won't show up in @code{prosody.cfg.lua} when their value is @code{'disabled}." -msgstr "" +msgstr "Les paramètres de configuration disponibles sont les suivants. Chaque définition des paramètres est précédé par son type ; par exemple, @samp{string-list foo} indique que le paramètre @code{foo} devrait être spécifié comme une liste de chaînes de caractères. Les types précédés de @code{maybe-} signifient que le paramètre n'apparaîtra pas dans @code{prosody.cfg.lua} lorsque sa valeur est @code{'disabled}." #. type: Plain text #: doc/guix.texi:14805 @@ -26769,13 +27191,13 @@ msgstr "" #. type: Plain text #: doc/guix.texi:14818 msgid "Available @code{prosody-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{prosody-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:14819 #, no-wrap msgid "{@code{prosody-configuration} parameter} package prosody" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} package prosody" #. type: deftypevr #: doc/guix.texi:14821 @@ -26786,7 +27208,7 @@ msgstr "" #: doc/guix.texi:14823 #, no-wrap msgid "{@code{prosody-configuration} parameter} file-name data-path" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} file-name data-path" #. type: deftypevr #: doc/guix.texi:14827 @@ -26797,7 +27219,7 @@ msgstr "" #: doc/guix.texi:14829 #, no-wrap msgid "{@code{prosody-configuration} parameter} file-object-list plugin-paths" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} file-object-list plugin-paths" #. type: deftypevr #: doc/guix.texi:14833 @@ -26808,7 +27230,7 @@ msgstr "" #: doc/guix.texi:14835 #, no-wrap msgid "{@code{prosody-configuration} parameter} file-name certificates" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} file-name certificates" #. type: deftypevr #: doc/guix.texi:14840 @@ -26819,7 +27241,7 @@ msgstr "" #: doc/guix.texi:14842 #, no-wrap msgid "{@code{prosody-configuration} parameter} string-list admins" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} string-list admins" #. type: deftypevr #: doc/guix.texi:14848 @@ -26830,7 +27252,7 @@ msgstr "" #: doc/guix.texi:14850 #, no-wrap msgid "{@code{prosody-configuration} parameter} boolean use-libevent?" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} boolean use-libevent?" #. type: deftypevr #: doc/guix.texi:14854 @@ -26841,7 +27263,7 @@ msgstr "" #: doc/guix.texi:14856 #, no-wrap msgid "{@code{prosody-configuration} parameter} module-list modules-enabled" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} module-list modules-enabled" #. type: deftypevr #: doc/guix.texi:14862 @@ -26852,7 +27274,7 @@ msgstr "" #: doc/guix.texi:14864 #, no-wrap msgid "{@code{prosody-configuration} parameter} string-list modules-disabled" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} string-list modules-disabled" #. type: deftypevr #: doc/guix.texi:14868 @@ -26863,7 +27285,7 @@ msgstr "" #: doc/guix.texi:14870 #, no-wrap msgid "{@code{prosody-configuration} parameter} file-object groups-file" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} file-object groups-file" #. type: deftypevr #: doc/guix.texi:14875 @@ -26874,7 +27296,7 @@ msgstr "" #: doc/guix.texi:14877 #, no-wrap msgid "{@code{prosody-configuration} parameter} boolean allow-registration?" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} boolean allow-registration?" #. type: deftypevr #: doc/guix.texi:14881 @@ -26885,7 +27307,7 @@ msgstr "" #: doc/guix.texi:14883 #, no-wrap msgid "{@code{prosody-configuration} parameter} maybe-ssl-configuration ssl" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} maybe-ssl-configuration ssl" #. type: deftypevr #: doc/guix.texi:14888 @@ -26895,13 +27317,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:14890 msgid "Available @code{ssl-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{ssl-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:14891 #, no-wrap msgid "{@code{ssl-configuration} parameter} maybe-string protocol" -msgstr "" +msgstr "{paramètre de @code{ssl-configuration}} maybe-string protocol" #. type: deftypevr #: doc/guix.texi:14893 @@ -26912,7 +27334,7 @@ msgstr "" #: doc/guix.texi:14895 #, no-wrap msgid "{@code{ssl-configuration} parameter} maybe-file-name key" -msgstr "" +msgstr "{paramètre de @code{ssl-configuration}} maybe-file-name key" #. type: deftypevr #: doc/guix.texi:14897 @@ -26923,7 +27345,7 @@ msgstr "" #: doc/guix.texi:14899 #, no-wrap msgid "{@code{ssl-configuration} parameter} maybe-file-name certificate" -msgstr "" +msgstr "{paramètre de @code{ssl-configuration}} maybe-file-name certificate" #. type: deftypevr #: doc/guix.texi:14901 @@ -26934,7 +27356,7 @@ msgstr "" #: doc/guix.texi:14903 #, no-wrap msgid "{@code{ssl-configuration} parameter} file-object capath" -msgstr "" +msgstr "{paramètre de @code{ssl-configuration}} file-object capath" #. type: deftypevr #: doc/guix.texi:14907 @@ -26945,7 +27367,7 @@ msgstr "" #: doc/guix.texi:14909 #, no-wrap msgid "{@code{ssl-configuration} parameter} maybe-file-object cafile" -msgstr "" +msgstr "{paramètre de @code{ssl-configuration}} maybe-file-object cafile" #. type: deftypevr #: doc/guix.texi:14912 @@ -26956,7 +27378,7 @@ msgstr "" #: doc/guix.texi:14914 #, no-wrap msgid "{@code{ssl-configuration} parameter} maybe-string-list verify" -msgstr "" +msgstr "{paramètre de @code{ssl-configuration}} maybe-string-list verify" #. type: deftypevr #: doc/guix.texi:14917 @@ -26967,7 +27389,7 @@ msgstr "" #: doc/guix.texi:14919 #, no-wrap msgid "{@code{ssl-configuration} parameter} maybe-string-list options" -msgstr "" +msgstr "{paramètre de @code{ssl-configuration}} maybe-string-list options" #. type: deftypevr #: doc/guix.texi:14923 @@ -26978,7 +27400,7 @@ msgstr "" #: doc/guix.texi:14925 #, no-wrap msgid "{@code{ssl-configuration} parameter} maybe-non-negative-integer depth" -msgstr "" +msgstr "{paramètre de @code{ssl-configuration}} maybe-non-negative-integer depth" #. type: deftypevr #: doc/guix.texi:14928 @@ -26989,7 +27411,7 @@ msgstr "" #: doc/guix.texi:14930 #, no-wrap msgid "{@code{ssl-configuration} parameter} maybe-string ciphers" -msgstr "" +msgstr "{paramètre de @code{ssl-configuration}} maybe-string ciphers" #. type: deftypevr #: doc/guix.texi:14933 @@ -27000,7 +27422,7 @@ msgstr "" #: doc/guix.texi:14935 #, no-wrap msgid "{@code{ssl-configuration} parameter} maybe-file-name dhparam" -msgstr "" +msgstr "{paramètre de @code{ssl-configuration}} maybe-file-name dhparam" #. type: deftypevr #: doc/guix.texi:14939 @@ -27011,7 +27433,7 @@ msgstr "" #: doc/guix.texi:14941 #, no-wrap msgid "{@code{ssl-configuration} parameter} maybe-string curve" -msgstr "" +msgstr "{paramètre de @code{ssl-configuration}} maybe-string curve" #. type: deftypevr #: doc/guix.texi:14944 @@ -27022,7 +27444,7 @@ msgstr "" #: doc/guix.texi:14946 #, no-wrap msgid "{@code{ssl-configuration} parameter} maybe-string-list verifyext" -msgstr "" +msgstr "{paramètre de @code{ssl-configuration}} maybe-string-list verifyext" #. type: deftypevr #: doc/guix.texi:14948 @@ -27033,7 +27455,7 @@ msgstr "" #: doc/guix.texi:14950 #, no-wrap msgid "{@code{ssl-configuration} parameter} maybe-string password" -msgstr "" +msgstr "{paramètre de @code{ssl-configuration}} maybe-string password" #. type: deftypevr #: doc/guix.texi:14952 @@ -27044,7 +27466,7 @@ msgstr "" #: doc/guix.texi:14956 #, no-wrap msgid "{@code{prosody-configuration} parameter} boolean c2s-require-encryption?" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} boolean c2s-require-encryption?" #. type: deftypevr #: doc/guix.texi:14960 @@ -27055,7 +27477,7 @@ msgstr "" #: doc/guix.texi:14962 #, no-wrap msgid "{@code{prosody-configuration} parameter} string-list disable-sasl-mechanisms" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} string-list disable-sasl-mechanisms" #. type: deftypevr #: doc/guix.texi:14966 @@ -27066,7 +27488,7 @@ msgstr "" #: doc/guix.texi:14968 #, no-wrap msgid "{@code{prosody-configuration} parameter} boolean s2s-require-encryption?" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} boolean s2s-require-encryption?" #. type: deftypevr #: doc/guix.texi:14972 @@ -27077,7 +27499,7 @@ msgstr "" #: doc/guix.texi:14974 #, no-wrap msgid "{@code{prosody-configuration} parameter} boolean s2s-secure-auth?" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} boolean s2s-secure-auth?" #. type: deftypevr #: doc/guix.texi:14980 @@ -27088,7 +27510,7 @@ msgstr "" #: doc/guix.texi:14982 #, no-wrap msgid "{@code{prosody-configuration} parameter} string-list s2s-insecure-domains" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} string-list s2s-insecure-domains" #. type: deftypevr #: doc/guix.texi:14988 @@ -27099,7 +27521,7 @@ msgstr "" #: doc/guix.texi:14990 #, no-wrap msgid "{@code{prosody-configuration} parameter} string-list s2s-secure-domains" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} string-list s2s-secure-domains" #. type: deftypevr #: doc/guix.texi:14995 @@ -27110,7 +27532,7 @@ msgstr "" #: doc/guix.texi:14997 #, no-wrap msgid "{@code{prosody-configuration} parameter} string authentication" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} string authentication" #. type: deftypevr #: doc/guix.texi:15005 @@ -27121,7 +27543,7 @@ msgstr "" #: doc/guix.texi:15007 #, no-wrap msgid "{@code{prosody-configuration} parameter} maybe-string log" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} maybe-string log" #. type: deftypevr #: doc/guix.texi:15011 @@ -27132,7 +27554,7 @@ msgstr "" #: doc/guix.texi:15013 #, no-wrap msgid "{@code{prosody-configuration} parameter} file-name pidfile" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} file-name pidfile" #. type: deftypevr #: doc/guix.texi:15016 @@ -27143,7 +27565,7 @@ msgstr "" #: doc/guix.texi:15018 #, no-wrap msgid "{@code{prosody-configuration} parameter} maybe-non-negative-integer http-max-content-size" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} maybe-non-negative-integer http-max-content-size" #. type: deftypevr #: doc/guix.texi:15020 @@ -27154,7 +27576,7 @@ msgstr "" #: doc/guix.texi:15022 #, no-wrap msgid "{@code{prosody-configuration} parameter} maybe-string http-external-url" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} maybe-string http-external-url" #. type: deftypevr #: doc/guix.texi:15027 @@ -27165,7 +27587,7 @@ msgstr "" #: doc/guix.texi:15029 #, no-wrap msgid "{@code{prosody-configuration} parameter} virtualhost-configuration-list virtualhosts" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} virtualhost-configuration-list virtualhosts" #. type: deftypevr #: doc/guix.texi:15034 @@ -27185,7 +27607,7 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:15044 msgid "Available @code{virtualhost-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{virtualhost-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:15046 doc/guix.texi:15068 doc/guix.texi:15121 @@ -27196,7 +27618,7 @@ msgstr "" #: doc/guix.texi:15046 #, no-wrap msgid "{@code{virtualhost-configuration} parameter} string domain" -msgstr "" +msgstr "{paramètre de @code{virtualhost-configuration}} string domain" #. type: deftypevr #: doc/guix.texi:15048 @@ -27207,7 +27629,7 @@ msgstr "" #: doc/guix.texi:15052 #, no-wrap msgid "{@code{prosody-configuration} parameter} int-component-configuration-list int-components" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} int-component-configuration-list int-components" #. type: deftypevr #: doc/guix.texi:15057 @@ -27227,13 +27649,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:15066 msgid "Available @code{int-component-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{int-component-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:15068 #, no-wrap msgid "{@code{int-component-configuration} parameter} string hostname" -msgstr "" +msgstr "{paramètre de @code{int-component-configuration}} string hostname" #. type: deftypevr #: doc/guix.texi:15070 doc/guix.texi:15127 @@ -27244,7 +27666,7 @@ msgstr "" #: doc/guix.texi:15072 #, no-wrap msgid "{@code{int-component-configuration} parameter} string plugin" -msgstr "" +msgstr "{paramètre de @code{int-component-configuration}} string plugin" #. type: deftypevr #: doc/guix.texi:15074 @@ -27255,7 +27677,7 @@ msgstr "" #: doc/guix.texi:15076 #, no-wrap msgid "{@code{int-component-configuration} parameter} maybe-mod-muc-configuration mod-muc" -msgstr "" +msgstr "{paramètre de @code{int-component-configuration}} maybe-mod-muc-configuration mod-muc" #. type: deftypevr #: doc/guix.texi:15079 @@ -27275,13 +27697,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:15087 msgid "Available @code{mod-muc-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{mod-muc-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:15088 #, no-wrap msgid "{@code{mod-muc-configuration} parameter} string name" -msgstr "" +msgstr "{paramètre de @code{mod-muc-configuration}} string name" #. type: deftypevr #: doc/guix.texi:15091 @@ -27292,7 +27714,7 @@ msgstr "" #: doc/guix.texi:15093 #, no-wrap msgid "{@code{mod-muc-configuration} parameter} string-or-boolean restrict-room-creation" -msgstr "" +msgstr "{paramètre de @code{mod-muc-configuration}} string-or-boolean restrict-room-creation" #. type: deftypevr #: doc/guix.texi:15100 @@ -27303,7 +27725,7 @@ msgstr "" #: doc/guix.texi:15102 #, no-wrap msgid "{@code{mod-muc-configuration} parameter} non-negative-integer max-history-messages" -msgstr "" +msgstr "{paramètre de @code{mod-muc-configuration}} non-negative-integer max-history-messages" #. type: deftypevr #: doc/guix.texi:15106 @@ -27314,7 +27736,7 @@ msgstr "" #: doc/guix.texi:15112 #, no-wrap msgid "{@code{prosody-configuration} parameter} ext-component-configuration-list ext-components" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} ext-component-configuration-list ext-components" #. type: deftypevr #: doc/guix.texi:15117 @@ -27324,13 +27746,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:15119 msgid "Available @code{ext-component-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{ext-component-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:15121 #, no-wrap msgid "{@code{ext-component-configuration} parameter} string component-secret" -msgstr "" +msgstr "{paramètre de @code{ext-component-configuration}} string component-secret" #. type: deftypevr #: doc/guix.texi:15123 @@ -27341,13 +27763,13 @@ msgstr "" #: doc/guix.texi:15125 #, no-wrap msgid "{@code{ext-component-configuration} parameter} string hostname" -msgstr "" +msgstr "{paramètre de @code{ext-component-configuration}} string hostname" #. type: deftypevr #: doc/guix.texi:15131 #, no-wrap msgid "{@code{prosody-configuration} parameter} non-negative-integer-list component-ports" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} non-negative-integer-list component-ports" #. type: deftypevr #: doc/guix.texi:15134 @@ -27358,7 +27780,7 @@ msgstr "" #: doc/guix.texi:15136 #, no-wrap msgid "{@code{prosody-configuration} parameter} string component-interface" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} string component-interface" #. type: deftypevr #: doc/guix.texi:15139 @@ -27369,7 +27791,7 @@ msgstr "" #: doc/guix.texi:15141 #, no-wrap msgid "{@code{prosody-configuration} parameter} maybe-raw-content raw-content" -msgstr "" +msgstr "{paramètre de @code{prosody-configuration}} maybe-raw-content raw-content" #. type: deftypevr #: doc/guix.texi:15143 @@ -27385,7 +27807,7 @@ msgstr "" #: doc/guix.texi:15152 #, no-wrap msgid "{@code{opaque-prosody-configuration} parameter} package prosody" -msgstr "" +msgstr "{paramètre de @code{opaque-prosody-configuration}} package prosody" #. type: deftypevr #: doc/guix.texi:15154 @@ -27396,7 +27818,7 @@ msgstr "" #: doc/guix.texi:15156 #, no-wrap msgid "{@code{opaque-prosody-configuration} parameter} string prosody.cfg.lua" -msgstr "" +msgstr "{paramètre de @code{opaque-prosody-configuration}} string prosody.cfg.lua" #. type: deftypevr #: doc/guix.texi:15158 @@ -27444,7 +27866,7 @@ msgstr "" #: doc/guix.texi:15178 #, no-wrap msgid "{Scheme Variable} bitlbee-service-type" -msgstr "" +msgstr "{Variable Scheme} bitlbee-service-type" #. type: defvr #: doc/guix.texi:15182 @@ -27466,7 +27888,7 @@ msgstr "" #: doc/guix.texi:15191 #, no-wrap msgid "{Data Type} bitlbee-configuration" -msgstr "" +msgstr "{Type de données} bitlbee-configuration" #. type: deftp #: doc/guix.texi:15193 @@ -27477,13 +27899,13 @@ msgstr "" #: doc/guix.texi:15195 #, no-wrap msgid "@code{interface} (default: @code{\"127.0.0.1\"})" -msgstr "" +msgstr "@code{interface} (par défaut : @code{\"127.0.0.1\"})" #. type: itemx #: doc/guix.texi:15196 #, no-wrap msgid "@code{port} (default: @code{6667})" -msgstr "" +msgstr "@code{port} (par défaut : @code{6667})" #. type: table #: doc/guix.texi:15199 @@ -27499,12 +27921,12 @@ msgstr "" #: doc/guix.texi:15204 #, no-wrap msgid "@code{package} (default: @code{bitlbee})" -msgstr "" +msgstr "@code{package} (par défaut : @code{bitlbee})" #. type: table #: doc/guix.texi:15206 msgid "The BitlBee package to use." -msgstr "" +msgstr "Le paquet BitlBee à utiliser." #. type: item #: doc/guix.texi:15207 @@ -27521,7 +27943,7 @@ msgstr "" #: doc/guix.texi:15210 #, no-wrap msgid "@code{extra-settings} (default: @code{\"\"})" -msgstr "" +msgstr "@code{extra-settings} (par défaut : @code{\"\"})" #. type: table #: doc/guix.texi:15212 @@ -27549,7 +27971,7 @@ msgstr "" #: doc/guix.texi:15225 #, no-wrap msgid "{Data Type} murmur-configuration" -msgstr "" +msgstr "{Type de données} murmur-configuration" #. type: deftp #: doc/guix.texi:15228 @@ -27582,13 +28004,13 @@ msgstr "" #. type: deftp #: doc/guix.texi:15252 msgid "Available @code{murmur-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{murmur-configuration} disponibles sont :" #. type: item #: doc/guix.texi:15254 #, no-wrap msgid "@code{package} (default: @code{mumble})" -msgstr "" +msgstr "@code{package} (par défaut : @code{mumble})" #. type: table #: doc/guix.texi:15256 @@ -27599,7 +28021,7 @@ msgstr "" #: doc/guix.texi:15257 #, no-wrap msgid "@code{user} (default: @code{\"murmur\"})" -msgstr "" +msgstr "@code{user} (par défaut : @code{\"murmur\"})" #. type: table #: doc/guix.texi:15259 @@ -27610,7 +28032,7 @@ msgstr "" #: doc/guix.texi:15260 #, no-wrap msgid "@code{group} (default: @code{\"murmur\"})" -msgstr "" +msgstr "@code{group} (par défaut : @code{\"murmur\"})" #. type: table #: doc/guix.texi:15262 @@ -27621,7 +28043,7 @@ msgstr "" #: doc/guix.texi:15263 #, no-wrap msgid "@code{port} (default: @code{64738})" -msgstr "" +msgstr "@code{port} (par défaut : @code{64738})" #. type: table #: doc/guix.texi:15265 @@ -27632,7 +28054,7 @@ msgstr "" #: doc/guix.texi:15266 #, no-wrap msgid "@code{welcome-text} (default: @code{\"\"})" -msgstr "" +msgstr "@code{welcome-text} (par défaut : @code{\"\"})" #. type: table #: doc/guix.texi:15268 @@ -27643,7 +28065,7 @@ msgstr "" #: doc/guix.texi:15269 #, no-wrap msgid "@code{server-password} (default: @code{\"\"})" -msgstr "" +msgstr "@code{server-password} (par défaut : @code{\"\"})" #. type: table #: doc/guix.texi:15271 @@ -27654,7 +28076,7 @@ msgstr "" #: doc/guix.texi:15272 #, no-wrap msgid "@code{max-users} (default: @code{100})" -msgstr "" +msgstr "@code{max-users} (par défaut : @code{100})" #. type: table #: doc/guix.texi:15274 @@ -27665,7 +28087,7 @@ msgstr "" #: doc/guix.texi:15275 #, no-wrap msgid "@code{max-user-bandwidth} (default: @code{#f})" -msgstr "" +msgstr "@code{max-user-bandwidth} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15277 @@ -27676,7 +28098,7 @@ msgstr "" #: doc/guix.texi:15278 #, no-wrap msgid "@code{database-file} (default: @code{\"/var/lib/murmur/db.sqlite\"})" -msgstr "" +msgstr "@code{database-file} (par défaut : @code{\"/var/lib/murmur/db.sqlite\"})" #. type: table #: doc/guix.texi:15281 @@ -27687,7 +28109,7 @@ msgstr "" #: doc/guix.texi:15282 #, no-wrap msgid "@code{log-file} (default: @code{\"/var/log/murmur/murmur.log\"})" -msgstr "" +msgstr "@code{log-file} (par défaut : @code{\"/var/log/murmur/murmur.log\"})" #. type: table #: doc/guix.texi:15285 @@ -27698,7 +28120,7 @@ msgstr "" #: doc/guix.texi:15286 #, no-wrap msgid "@code{autoban-attempts} (default: @code{10})" -msgstr "" +msgstr "@code{autoban-attempts} (par défaut : @code{10})" #. type: table #: doc/guix.texi:15289 @@ -27709,7 +28131,7 @@ msgstr "" #: doc/guix.texi:15290 #, no-wrap msgid "@code{autoban-timeframe} (default: @code{120})" -msgstr "" +msgstr "@code{autoban-timeframe} (par défaut : @code{120})" #. type: table #: doc/guix.texi:15292 @@ -27720,7 +28142,7 @@ msgstr "" #: doc/guix.texi:15293 #, no-wrap msgid "@code{autoban-time} (default: @code{300})" -msgstr "" +msgstr "@code{autoban-time} (par défaut : @code{300})" #. type: table #: doc/guix.texi:15296 @@ -27731,7 +28153,7 @@ msgstr "" #: doc/guix.texi:15297 #, no-wrap msgid "@code{opus-threshold} (default: @code{100})" -msgstr "" +msgstr "@code{opus-threshold} (par défaut : @code{100})" #. type: table #: doc/guix.texi:15300 @@ -27742,7 +28164,7 @@ msgstr "" #: doc/guix.texi:15301 #, no-wrap msgid "@code{channel-nesting-limit} (default: @code{10})" -msgstr "" +msgstr "@code{channel-nesting-limit} (par défaut : @code{10})" #. type: table #: doc/guix.texi:15303 @@ -27753,7 +28175,7 @@ msgstr "" #: doc/guix.texi:15304 #, no-wrap msgid "@code{channelname-regex} (default: @code{#f})" -msgstr "" +msgstr "@code{channelname-regex} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15306 @@ -27764,7 +28186,7 @@ msgstr "" #: doc/guix.texi:15307 #, no-wrap msgid "@code{username-regex} (default: @code{#f})" -msgstr "" +msgstr "@code{username-regex} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15309 @@ -27775,7 +28197,7 @@ msgstr "" #: doc/guix.texi:15310 #, no-wrap msgid "@code{text-message-length} (default: @code{5000})" -msgstr "" +msgstr "@code{text-message-length} (par défaut : @code{5000})" #. type: table #: doc/guix.texi:15312 @@ -27786,7 +28208,7 @@ msgstr "" #: doc/guix.texi:15313 #, no-wrap msgid "@code{image-message-length} (default: @code{(* 128 1024)})" -msgstr "" +msgstr "@code{image-message-length} (par défaut : @code{(* 128 1024)})" #. type: table #: doc/guix.texi:15315 @@ -27797,7 +28219,7 @@ msgstr "" #: doc/guix.texi:15316 #, no-wrap msgid "@code{cert-required?} (default: @code{#f})" -msgstr "" +msgstr "@code{cert-required?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15319 @@ -27819,7 +28241,7 @@ msgstr "" #: doc/guix.texi:15324 #, no-wrap msgid "@code{allow-html?} (default: @code{#f})" -msgstr "" +msgstr "@code{allow-html?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15326 @@ -27830,7 +28252,7 @@ msgstr "" #: doc/guix.texi:15327 #, no-wrap msgid "@code{allow-ping?} (default: @code{#f})" -msgstr "" +msgstr "@code{allow-ping?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15331 @@ -27846,7 +28268,7 @@ msgstr "" #: doc/guix.texi:15334 #, no-wrap msgid "@code{bonjour?} (default: @code{#f})" -msgstr "" +msgstr "@code{bonjour?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15336 @@ -27857,7 +28279,7 @@ msgstr "" #: doc/guix.texi:15337 #, no-wrap msgid "@code{send-version?} (default: @code{#f})" -msgstr "" +msgstr "@code{send-version?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15339 @@ -27868,7 +28290,7 @@ msgstr "" #: doc/guix.texi:15340 #, no-wrap msgid "@code{log-days} (default: @code{31})" -msgstr "" +msgstr "@code{log-days} (par défaut : @code{31})" #. type: table #: doc/guix.texi:15344 @@ -27879,7 +28301,7 @@ msgstr "" #: doc/guix.texi:15345 #, no-wrap msgid "@code{obfuscate-ips?} (default @code{#t})" -msgstr "" +msgstr "@code{obfuscate-ips?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:15347 @@ -27890,7 +28312,7 @@ msgstr "" #: doc/guix.texi:15348 #, no-wrap msgid "@code{ssl-cert} (default: @code{#f})" -msgstr "" +msgstr "@code{ssl-cert} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15350 @@ -27907,7 +28329,7 @@ msgstr "" #: doc/guix.texi:15354 #, no-wrap msgid "@code{ssl-key} (default: @code{#f})" -msgstr "" +msgstr "@code{ssl-key} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15356 @@ -27924,7 +28346,7 @@ msgstr "" #: doc/guix.texi:15360 #, no-wrap msgid "@code{ssl-dh-params} (default: @code{#f})" -msgstr "" +msgstr "@code{ssl-dh-params} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15365 @@ -27935,7 +28357,7 @@ msgstr "" #: doc/guix.texi:15366 #, no-wrap msgid "@code{ssl-ciphers} (default: @code{#f})" -msgstr "" +msgstr "@code{ssl-ciphers} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15369 @@ -27961,7 +28383,7 @@ msgstr "" #: doc/guix.texi:15383 #, no-wrap msgid "@code{public-registration} (default: @code{#f})" -msgstr "" +msgstr "@code{public-registration} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15385 @@ -27982,7 +28404,7 @@ msgstr "" #: doc/guix.texi:15393 doc/guix.texi:15964 #, no-wrap msgid "@code{file} (default: @code{#f})" -msgstr "" +msgstr "@code{file} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15395 @@ -27993,7 +28415,7 @@ msgstr "" #: doc/guix.texi:15398 #, no-wrap msgid "{Data Type} murmur-public-registration-configuration" -msgstr "" +msgstr "{Type de données} murmur-public-registration-configuration" #. type: deftp #: doc/guix.texi:15400 @@ -28031,7 +28453,7 @@ msgstr "" #: doc/guix.texi:15413 #, no-wrap msgid "@code{hostname} (default: @code{#f})" -msgstr "" +msgstr "@code{hostname} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15416 @@ -28080,7 +28502,7 @@ msgstr "" #: doc/guix.texi:15448 #, no-wrap msgid "{Data Type} tailon-configuration" -msgstr "" +msgstr "{Type de données} tailon-configuration" #. type: deftp #: doc/guix.texi:15451 @@ -28091,7 +28513,7 @@ msgstr "" #: doc/guix.texi:15453 #, no-wrap msgid "@code{config-file} (default: @code{(tailon-configuration-file)})" -msgstr "" +msgstr "@code{config-file} (par défaut : @code{(tailon-configuration-file)})" #. type: table #: doc/guix.texi:15457 @@ -28116,18 +28538,18 @@ msgstr "" #: doc/guix.texi:15467 #, no-wrap msgid "@code{package} (default: @code{tailon})" -msgstr "" +msgstr "@code{package} (par défaut : @code{tailon})" #. type: table #: doc/guix.texi:15469 msgid "The tailon package to use." -msgstr "" +msgstr "Le paquet tailon à utiliser." #. type: deftp #: doc/guix.texi:15473 #, no-wrap msgid "{Data Type} tailon-configuration-file" -msgstr "" +msgstr "{Type de données} tailon-configuration-file" #. type: deftp #: doc/guix.texi:15476 @@ -28138,7 +28560,7 @@ msgstr "" #: doc/guix.texi:15478 #, no-wrap msgid "@code{files} (default: @code{(list \"/var/log\")})" -msgstr "" +msgstr "@code{files} (par défaut : @code{(list \"/var/log\")})" #. type: table #: doc/guix.texi:15483 @@ -28149,7 +28571,7 @@ msgstr "" #: doc/guix.texi:15484 #, no-wrap msgid "@code{bind} (default: @code{\"localhost:8080\"})" -msgstr "" +msgstr "@code{bind} (par défaut : @code{\"localhost:8080\"})" #. type: table #: doc/guix.texi:15486 @@ -28160,7 +28582,7 @@ msgstr "" #: doc/guix.texi:15487 #, no-wrap msgid "@code{relative-root} (default: @code{#f})" -msgstr "" +msgstr "@code{relative-root} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15489 @@ -28171,7 +28593,7 @@ msgstr "" #: doc/guix.texi:15490 #, no-wrap msgid "@code{allow-transfers?} (default: @code{#t})" -msgstr "" +msgstr "@code{allow-transfers?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:15492 @@ -28182,7 +28604,7 @@ msgstr "" #: doc/guix.texi:15493 #, no-wrap msgid "@code{follow-names?} (default: @code{#t})" -msgstr "" +msgstr "@code{follow-names?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:15495 @@ -28193,7 +28615,7 @@ msgstr "" #: doc/guix.texi:15496 #, no-wrap msgid "@code{tail-lines} (default: @code{200})" -msgstr "" +msgstr "@code{tail-lines} (par défaut : @code{200})" #. type: table #: doc/guix.texi:15498 @@ -28204,7 +28626,7 @@ msgstr "" #: doc/guix.texi:15499 #, no-wrap msgid "@code{allowed-commands} (default: @code{(list \"tail\" \"grep\" \"awk\")})" -msgstr "" +msgstr "@code{allowed-commands} (par défaut : @code{(list \"tail\" \"grep\" \"awk\")})" #. type: table #: doc/guix.texi:15501 @@ -28215,7 +28637,7 @@ msgstr "" #: doc/guix.texi:15502 #, no-wrap msgid "@code{debug?} (default: @code{#f})" -msgstr "" +msgstr "@code{debug?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15504 @@ -28226,7 +28648,7 @@ msgstr "" #: doc/guix.texi:15505 #, no-wrap msgid "@code{wrap-lines} (default: @code{#t})" -msgstr "" +msgstr "@code{wrap-lines} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:15509 @@ -28237,7 +28659,7 @@ msgstr "" #: doc/guix.texi:15510 #, no-wrap msgid "@code{http-auth} (default: @code{#f})" -msgstr "" +msgstr "@code{http-auth} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15514 @@ -28248,7 +28670,7 @@ msgstr "" #: doc/guix.texi:15515 #, no-wrap msgid "@code{users} (default: @code{#f})" -msgstr "" +msgstr "@code{users} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15520 @@ -28286,7 +28708,7 @@ msgstr "" #: doc/guix.texi:15537 #, no-wrap msgid "{Scheme Variable} darkstat-service-type" -msgstr "" +msgstr "{Variable Scheme} darkstat-service-type" #. type: defvar #: doc/guix.texi:15542 @@ -28306,7 +28728,7 @@ msgstr "" #: doc/guix.texi:15550 #, no-wrap msgid "{Data Type} darkstat-configuration" -msgstr "" +msgstr "{Type de données} darkstat-configuration" #. type: deftp #: doc/guix.texi:15552 @@ -28317,12 +28739,12 @@ msgstr "" #: doc/guix.texi:15554 #, no-wrap msgid "@code{package} (default: @code{darkstat})" -msgstr "" +msgstr "@code{package} (par défaut : @code{darkstat})" #. type: table #: doc/guix.texi:15556 msgid "The darkstat package to use." -msgstr "" +msgstr "Le paquet darkstat à utiliser." #. type: code{#1} #: doc/guix.texi:15557 @@ -28339,7 +28761,7 @@ msgstr "" #: doc/guix.texi:15560 #, no-wrap msgid "@code{port} (default: @code{\"667\"})" -msgstr "" +msgstr "@code{port} (par défaut : @code{\"667\"})" #. type: table #: doc/guix.texi:15562 @@ -28350,7 +28772,7 @@ msgstr "" #: doc/guix.texi:15563 #, no-wrap msgid "@code{bind-address} (default: @code{\"127.0.0.1\"})" -msgstr "" +msgstr "@code{bind-address} (par défaut : @code{\"127.0.0.1\"})" #. type: table #: doc/guix.texi:15565 @@ -28361,7 +28783,7 @@ msgstr "" #: doc/guix.texi:15566 #, no-wrap msgid "@code{base} (default: @code{\"/\"})" -msgstr "" +msgstr "@code{base} (par défaut : @code{\"/\"})" #. type: table #: doc/guix.texi:15569 @@ -28399,7 +28821,7 @@ msgstr "" #: doc/guix.texi:15593 #, no-wrap msgid "{Scheme Variable} krb5-service-type" -msgstr "" +msgstr "{Variable Scheme} krb5-service-type" #. type: defvr #: doc/guix.texi:15595 @@ -28472,7 +28894,7 @@ msgstr "" #: doc/guix.texi:15632 #, no-wrap msgid "{Data Type} krb5-realm" -msgstr "" +msgstr "{Type de données} krb5-realm" #. type: cindex #: doc/guix.texi:15633 @@ -28511,13 +28933,13 @@ msgstr "" #: doc/guix.texi:15650 #, no-wrap msgid "{Data Type} krb5-configuration" -msgstr "" +msgstr "{Type de données} krb5-configuration" #. type: item #: doc/guix.texi:15653 #, no-wrap msgid "@code{allow-weak-crypto?} (default: @code{#f})" -msgstr "" +msgstr "@code{allow-weak-crypto?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15656 @@ -28528,7 +28950,7 @@ msgstr "" #: doc/guix.texi:15657 #, no-wrap msgid "@code{default-realm} (default: @code{#f})" -msgstr "" +msgstr "@code{default-realm} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15664 @@ -28567,7 +28989,7 @@ msgstr "" #: doc/guix.texi:15682 #, no-wrap msgid "{Scheme Variable} pam-krb5-service-type" -msgstr "" +msgstr "{Variable Scheme} pam-krb5-service-type" #. type: defvr #: doc/guix.texi:15684 @@ -28578,7 +29000,7 @@ msgstr "" #: doc/guix.texi:15686 #, no-wrap msgid "{Data Type} pam-krb5-configuration" -msgstr "" +msgstr "{Type de données} pam-krb5-configuration" #. type: deftp #: doc/guix.texi:15689 @@ -28589,18 +29011,18 @@ msgstr "" #: doc/guix.texi:15690 #, no-wrap msgid "@code{pam-krb5} (default: @code{pam-krb5})" -msgstr "" +msgstr "@code{pam-krb5} (par défaut : @code{pam-krb5})" #. type: table #: doc/guix.texi:15692 msgid "The pam-krb5 package to use." -msgstr "" +msgstr "Le paquet pam-krb5 à utiliser." #. type: item #: doc/guix.texi:15693 #, no-wrap msgid "@code{minimum-uid} (default: @code{1000})" -msgstr "" +msgstr "@code{minimum-uid} (par défaut : @code{1000})" #. type: table #: doc/guix.texi:15696 @@ -28640,7 +29062,7 @@ msgstr "" #: doc/guix.texi:15711 #, no-wrap msgid "{Scheme Variable} httpd-service-type" -msgstr "" +msgstr "{Variable Scheme} httpd-service-type" #. type: deffn #: doc/guix.texi:15715 @@ -28691,7 +29113,7 @@ msgstr "" #: doc/guix.texi:15745 #, no-wrap msgid "{Data Type} httpd-configuration" -msgstr "" +msgstr "{Type de données} httpd-configuration" #. type: deffn #: doc/guix.texi:15747 @@ -28702,18 +29124,18 @@ msgstr "" #: doc/guix.texi:15749 #, no-wrap msgid "@code{package} (default: @code{httpd})" -msgstr "" +msgstr "@code{package} (par défaut : @code{httpd})" #. type: table #: doc/guix.texi:15751 msgid "The httpd package to use." -msgstr "" +msgstr "Le paquet httpd à utiliser." #. type: item #: doc/guix.texi:15752 doc/guix.texi:15811 #, no-wrap msgid "@code{pid-file} (default: @code{\"/var/run/httpd\"})" -msgstr "" +msgstr "@code{pid-file} (par défaut : @code{\"/var/run/httpd\"})" #. type: table #: doc/guix.texi:15754 @@ -28724,7 +29146,7 @@ msgstr "" #: doc/guix.texi:15755 #, no-wrap msgid "@code{config} (default: @code{(httpd-config-file)})" -msgstr "" +msgstr "@code{config} (par défaut : @code{(httpd-config-file)})" #. type: table #: doc/guix.texi:15760 @@ -28735,7 +29157,7 @@ msgstr "" #: doc/guix.texi:15764 #, no-wrap msgid "{Data Type} httpd-module" -msgstr "" +msgstr "{Type de données} httpd-module" #. type: deffn #: doc/guix.texi:15766 @@ -28756,7 +29178,7 @@ msgstr "" #: doc/guix.texi:15780 #, no-wrap msgid "{Data Type} httpd-config-file" -msgstr "" +msgstr "{Type de données} httpd-config-file" #. type: deffn #: doc/guix.texi:15782 @@ -28767,7 +29189,7 @@ msgstr "" #: doc/guix.texi:15784 #, no-wrap msgid "@code{modules} (default: @code{%default-httpd-modules})" -msgstr "" +msgstr "@code{modules} (par défaut : @code{%default-httpd-modules})" #. type: table #: doc/guix.texi:15787 @@ -28778,7 +29200,7 @@ msgstr "" #: doc/guix.texi:15788 #, no-wrap msgid "@code{server-root} (default: @code{httpd})" -msgstr "" +msgstr "@code{server-root} (par défaut : @code{httpd})" #. type: table #: doc/guix.texi:15792 @@ -28789,7 +29211,7 @@ msgstr "" #: doc/guix.texi:15793 #, no-wrap msgid "@code{server-name} (default: @code{#f})" -msgstr "" +msgstr "@code{server-name} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15797 @@ -28805,7 +29227,7 @@ msgstr "" #: doc/guix.texi:15802 #, no-wrap msgid "@code{document-root} (default: @code{\"/srv/http\"})" -msgstr "" +msgstr "@code{document-root} (par défaut : @code{\"/srv/http\"})" #. type: table #: doc/guix.texi:15804 @@ -28816,7 +29238,7 @@ msgstr "" #: doc/guix.texi:15805 #, no-wrap msgid "@code{listen} (default: @code{'(\"80\")})" -msgstr "" +msgstr "@code{listen} (par défaut : @code{'(\"80\")})" #. type: table #: doc/guix.texi:15810 @@ -28832,7 +29254,7 @@ msgstr "" #: doc/guix.texi:15816 #, no-wrap msgid "@code{error-log} (default: @code{\"/var/log/httpd/error_log\"})" -msgstr "" +msgstr "@code{error-log} (par défaut : @code{\"/var/log/httpd/error_log\"})" #. type: table #: doc/guix.texi:15818 @@ -28843,7 +29265,7 @@ msgstr "" #: doc/guix.texi:15819 #, no-wrap msgid "@code{user} (default: @code{\"httpd\"})" -msgstr "" +msgstr "@code{user} (par défaut : @code{\"httpd\"})" #. type: table #: doc/guix.texi:15821 @@ -28854,7 +29276,7 @@ msgstr "" #: doc/guix.texi:15822 #, no-wrap msgid "@code{group} (default: @code{\"httpd\"})" -msgstr "" +msgstr "@code{group} (par défaut : @code{\"httpd\"})" #. type: table #: doc/guix.texi:15824 @@ -28865,7 +29287,7 @@ msgstr "" #: doc/guix.texi:15825 #, no-wrap msgid "@code{extra-config} (default: @code{(list \"TypesConfig etc/httpd/mime.types\")})" -msgstr "" +msgstr "@code{extra-config} (par défaut : @code{(list \"TypesConfig etc/httpd/mime.types\")})" #. type: table #: doc/guix.texi:15828 @@ -28881,7 +29303,7 @@ msgstr "" #: doc/guix.texi:15835 #, no-wrap msgid "{Data Type} httpd-virtualhost" -msgstr "" +msgstr "{Type de données} httpd-virtualhost" #. type: deffn #: doc/guix.texi:15837 @@ -28897,7 +29319,7 @@ msgstr "" #: doc/guix.texi:15851 #, no-wrap msgid "addresses-and-ports" -msgstr "" +msgstr "addresses-and-ports" #. type: table #: doc/guix.texi:15853 @@ -28908,7 +29330,7 @@ msgstr "" #: doc/guix.texi:15854 #, no-wrap msgid "contents" -msgstr "" +msgstr "contents" #. type: table #: doc/guix.texi:15857 @@ -28919,13 +29341,13 @@ msgstr "" #: doc/guix.texi:15861 #, no-wrap msgid "NGINX" -msgstr "" +msgstr "NGINX" #. type: deffn #: doc/guix.texi:15863 #, no-wrap msgid "{Scheme Variable} nginx-service-type" -msgstr "" +msgstr "{Variable Scheme} nginx-service-type" #. type: deffn #: doc/guix.texi:15866 @@ -28958,6 +29380,10 @@ msgid "" " (root \"/srv/http/extra-website\")\n" " (try-files (list \"$uri\" \"$uri/index.html\")))))\n" msgstr "" +"(simple-service 'my-extra-server nginx-service-type\n" +" (list (nginx-server-configuration\n" +" (root \"/srv/http/extra-website\")\n" +" (try-files (list \"$uri\" \"$uri/index.html\")))))\n" #. type: Plain text #: doc/guix.texi:15898 @@ -28968,7 +29394,7 @@ msgstr "" #: doc/guix.texi:15899 #, no-wrap msgid "{Data Type} nginx-configuration" -msgstr "" +msgstr "{Type de données} nginx-configuration" #. type: deffn #: doc/guix.texi:15903 @@ -28979,18 +29405,18 @@ msgstr "" #: doc/guix.texi:15905 #, no-wrap msgid "@code{nginx} (default: @code{nginx})" -msgstr "" +msgstr "@code{nginx} (par défaut : @code{nginx})" #. type: table #: doc/guix.texi:15907 msgid "The nginx package to use." -msgstr "" +msgstr "Le paquet nginx à utiliser." #. type: item #: doc/guix.texi:15908 #, no-wrap msgid "@code{log-directory} (default: @code{\"/var/log/nginx\"})" -msgstr "" +msgstr "@code{log-directory} (par défaut : @code{\"/var/log/nginx\"})" #. type: table #: doc/guix.texi:15910 @@ -29001,7 +29427,7 @@ msgstr "" #: doc/guix.texi:15911 #, no-wrap msgid "@code{run-directory} (default: @code{\"/var/run/nginx\"})" -msgstr "" +msgstr "@code{run-directory} (par défaut : @code{\"/var/run/nginx\"})" #. type: table #: doc/guix.texi:15914 @@ -29012,7 +29438,7 @@ msgstr "" #: doc/guix.texi:15915 #, no-wrap msgid "@code{server-blocks} (default: @code{'()})" -msgstr "" +msgstr "@code{server-blocks} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:15919 @@ -29028,7 +29454,7 @@ msgstr "" #: doc/guix.texi:15932 #, no-wrap msgid "@code{upstream-blocks} (default: @code{'()})" -msgstr "" +msgstr "@code{upstream-blocks} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:15936 @@ -29062,6 +29488,23 @@ msgid "" " (servers (list \"server1.example.com\"\n" " \"server2.example.com\")))))))\n" msgstr "" +"(service\n" +" nginx-service-type\n" +" (nginx-configuration\n" +" (server-blocks\n" +" (list (nginx-server-configuration\n" +" (server-name '(\"www.example.com\"))\n" +" (root \"/srv/http/www.example.com\")\n" +" (locations\n" +" (list\n" +" (nginx-location-configuration\n" +" (uri \"/path1\")\n" +" (body '(\"proxy_pass http://server-proxy;\"))))))))\n" +" (upstream-blocks\n" +" (list (nginx-upstream-configuration\n" +" (name \"server-proxy\")\n" +" (servers (list \"server1.example.com\"\n" +" \"server2.example.com\")))))))\n" #. type: table #: doc/guix.texi:15970 @@ -29077,7 +29520,7 @@ msgstr "" #: doc/guix.texi:15975 #, no-wrap msgid "@code{server-names-hash-bucket-size} (default: @code{#f})" -msgstr "" +msgstr "@code{server-names-hash-bucket-size} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15978 @@ -29088,7 +29531,7 @@ msgstr "" #: doc/guix.texi:15979 #, no-wrap msgid "@code{server-names-hash-bucket-max-size} (default: @code{#f})" -msgstr "" +msgstr "@code{server-names-hash-bucket-max-size} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:15981 @@ -29110,7 +29553,7 @@ msgstr "" #: doc/guix.texi:15989 #, no-wrap msgid "{Data Type} nginx-server-configuration" -msgstr "" +msgstr "{Type de données} nginx-server-configuration" #. type: deftp #: doc/guix.texi:15992 @@ -29121,7 +29564,7 @@ msgstr "" #: doc/guix.texi:15994 #, no-wrap msgid "@code{listen} (default: @code{'(\"80\" \"443 ssl\")})" -msgstr "" +msgstr "@code{listen} (par défaut : @code{'(\"80\" \"443 ssl\")})" #. type: table #: doc/guix.texi:15999 @@ -29132,13 +29575,13 @@ msgstr "" #: doc/guix.texi:16002 #, no-wrap msgid "'(\"127.0.0.1:8000\" \"127.0.0.1\" \"8000\" \"*:8000\" \"localhost:8000\")\n" -msgstr "" +msgstr "'(\"127.0.0.1:8000\" \"127.0.0.1\" \"8000\" \"*:8000\" \"localhost:8000\")\n" #. type: item #: doc/guix.texi:16004 #, no-wrap msgid "@code{server-name} (default: @code{(list 'default)})" -msgstr "" +msgstr "@code{server-name} (par défaut : @code{(list 'default)})" #. type: table #: doc/guix.texi:16007 @@ -29149,7 +29592,7 @@ msgstr "" #: doc/guix.texi:16008 #, no-wrap msgid "@code{root} (default: @code{\"/srv/http\"})" -msgstr "" +msgstr "@code{root} (par défaut : @code{\"/srv/http\"})" #. type: table #: doc/guix.texi:16010 @@ -29160,7 +29603,7 @@ msgstr "" #: doc/guix.texi:16011 #, no-wrap msgid "@code{locations} (default: @code{'()})" -msgstr "" +msgstr "@code{locations} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:16015 @@ -29171,7 +29614,7 @@ msgstr "" #: doc/guix.texi:16016 #, no-wrap msgid "@code{index} (default: @code{(list \"index.html\")})" -msgstr "" +msgstr "@code{index} (par défaut : @code{(list \"index.html\")})" #. type: table #: doc/guix.texi:16019 @@ -29182,7 +29625,7 @@ msgstr "" #: doc/guix.texi:16020 #, no-wrap msgid "@code{try-files} (default: @code{'()})" -msgstr "" +msgstr "@code{try-files} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:16023 @@ -29193,7 +29636,7 @@ msgstr "" #: doc/guix.texi:16024 #, no-wrap msgid "@code{ssl-certificate} (default: @code{#f})" -msgstr "" +msgstr "@code{ssl-certificate} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16027 @@ -29204,7 +29647,7 @@ msgstr "" #: doc/guix.texi:16028 #, no-wrap msgid "@code{ssl-certificate-key} (default: @code{#f})" -msgstr "" +msgstr "@code{ssl-certificate-key} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16031 @@ -29215,7 +29658,7 @@ msgstr "" #: doc/guix.texi:16032 #, no-wrap msgid "@code{server-tokens?} (default: @code{#f})" -msgstr "" +msgstr "@code{server-tokens?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16034 @@ -29226,7 +29669,7 @@ msgstr "" #: doc/guix.texi:16035 #, no-wrap msgid "@code{raw-content} (default: @code{'()})" -msgstr "" +msgstr "@code{raw-content} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:16037 @@ -29237,7 +29680,7 @@ msgstr "" #: doc/guix.texi:16041 #, no-wrap msgid "{Data Type} nginx-upstream-configuration" -msgstr "" +msgstr "{Type de données} nginx-upstream-configuration" #. type: deftp #: doc/guix.texi:16044 @@ -29264,7 +29707,7 @@ msgstr "" #: doc/guix.texi:16060 #, no-wrap msgid "{Data Type} nginx-location-configuration" -msgstr "" +msgstr "{Type de données} nginx-location-configuration" #. type: deftp #: doc/guix.texi:16063 @@ -29296,7 +29739,7 @@ msgstr "" #: doc/guix.texi:16080 #, no-wrap msgid "{Data Type} nginx-named-location-configuration" -msgstr "" +msgstr "{Type de données} nginx-named-location-configuration" #. type: deftp #: doc/guix.texi:16085 @@ -29339,7 +29782,7 @@ msgstr "" #: doc/guix.texi:16115 #, no-wrap msgid "{Scheme Variable} fcgiwrap-service-type" -msgstr "" +msgstr "{Variable Scheme} fcgiwrap-service-type" #. type: defvr #: doc/guix.texi:16117 @@ -29350,7 +29793,7 @@ msgstr "" #: doc/guix.texi:16119 #, no-wrap msgid "{Data Type} fcgiwrap-configuration" -msgstr "" +msgstr "{Type de données} fcgiwrap-configuration" #. type: deftp #: doc/guix.texi:16122 @@ -29361,18 +29804,18 @@ msgstr "" #: doc/guix.texi:16123 #, no-wrap msgid "@code{package} (default: @code{fcgiwrap})" -msgstr "" +msgstr "@code{package} (par défaut : @code{fcgiwrap})" #. type: table #: doc/guix.texi:16125 msgid "The fcgiwrap package to use." -msgstr "" +msgstr "Le paquet fcgiwrap à utiliser." #. type: item #: doc/guix.texi:16126 #, no-wrap msgid "@code{socket} (default: @code{tcp:127.0.0.1:9000})" -msgstr "" +msgstr "@code{socket} (par défaut : @code{tcp:127.0.0.1:9000})" #. type: table #: doc/guix.texi:16132 @@ -29383,13 +29826,13 @@ msgstr "" #: doc/guix.texi:16133 #, no-wrap msgid "@code{user} (default: @code{fcgiwrap})" -msgstr "" +msgstr "@code{user} (par défaut : @code{fcgiwrap})" #. type: itemx #: doc/guix.texi:16134 #, no-wrap msgid "@code{group} (default: @code{fcgiwrap})" -msgstr "" +msgstr "@code{group} (par défaut : @code{fcgiwrap})" #. type: table #: doc/guix.texi:16139 @@ -29490,7 +29933,7 @@ msgstr "" #: doc/guix.texi:16170 #, no-wrap msgid "{Scheme Variable} php-fpm-service-type" -msgstr "" +msgstr "{Variable Scheme} php-fpm-service-type" #. type: defvr #: doc/guix.texi:16172 @@ -29501,7 +29944,7 @@ msgstr "" #: doc/guix.texi:16174 #, no-wrap msgid "{Data Type} php-fpm-configuration" -msgstr "" +msgstr "{Type de données} php-fpm-configuration" #. type: deftp #: doc/guix.texi:16176 @@ -29512,18 +29955,18 @@ msgstr "" #: doc/guix.texi:16177 #, no-wrap msgid "@code{php} (default: @code{php})" -msgstr "" +msgstr "@code{php} (par défaut : @code{php})" #. type: table #: doc/guix.texi:16179 msgid "The php package to use." -msgstr "" +msgstr "Le paquet php à utiliser." #. type: item #: doc/guix.texi:16179 #, no-wrap msgid "@code{socket} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.sock\")})" -msgstr "" +msgstr "@code{socket} (par défaut : @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.sock\")})" #. type: table #: doc/guix.texi:16181 @@ -29567,7 +30010,7 @@ msgstr "" #: doc/guix.texi:16190 #, no-wrap msgid "@code{user} (default: @code{php-fpm})" -msgstr "" +msgstr "@code{user} (par défaut : @code{php-fpm})" #. type: table #: doc/guix.texi:16192 @@ -29578,7 +30021,7 @@ msgstr "" #: doc/guix.texi:16192 #, no-wrap msgid "@code{group} (default: @code{php-fpm})" -msgstr "" +msgstr "@code{group} (par défaut : @code{php-fpm})" #. type: table #: doc/guix.texi:16194 @@ -29589,7 +30032,7 @@ msgstr "" #: doc/guix.texi:16194 #, no-wrap msgid "@code{socket-user} (default: @code{php-fpm})" -msgstr "" +msgstr "@code{socket-user} (par défaut : @code{php-fpm})" #. type: table #: doc/guix.texi:16196 @@ -29600,7 +30043,7 @@ msgstr "" #: doc/guix.texi:16196 #, no-wrap msgid "@code{socket-group} (default: @code{php-fpm})" -msgstr "" +msgstr "@code{socket-group} (par défaut : @code{php-fpm})" #. type: table #: doc/guix.texi:16198 @@ -29611,7 +30054,7 @@ msgstr "" #: doc/guix.texi:16198 #, no-wrap msgid "@code{pid-file} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.pid\")})" -msgstr "" +msgstr "@code{pid-file} (par défaut : @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.pid\")})" #. type: table #: doc/guix.texi:16201 @@ -29622,7 +30065,7 @@ msgstr "" #: doc/guix.texi:16201 #, no-wrap msgid "@code{log-file} (default: @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.log\")})" -msgstr "" +msgstr "@code{log-file} (par défaut : @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.log\")})" #. type: table #: doc/guix.texi:16203 @@ -29633,7 +30076,7 @@ msgstr "" #: doc/guix.texi:16203 #, no-wrap msgid "@code{process-manager} (default: @code{(php-fpm-dynamic-process-manager-configuration)})" -msgstr "" +msgstr "@code{process-manager} (par défaut : @code{(php-fpm-dynamic-process-manager-configuration)})" #. type: table #: doc/guix.texi:16206 @@ -29662,7 +30105,7 @@ msgstr "" #: doc/guix.texi:16211 #, no-wrap msgid "@code{display-errors} (default @code{#f})" -msgstr "" +msgstr "@code{display-errors} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16216 @@ -29673,7 +30116,7 @@ msgstr "" #: doc/guix.texi:16216 #, no-wrap msgid "@code{workers-logfile} (default @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.www.log\")})" -msgstr "" +msgstr "@code{workers-logfile} (par défaut : @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.www.log\")})" #. type: table #: doc/guix.texi:16219 @@ -29684,7 +30127,7 @@ msgstr "" #: doc/guix.texi:16219 #, no-wrap msgid "@code{file} (default @code{#f})" -msgstr "" +msgstr "@code{file} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16222 @@ -29706,7 +30149,7 @@ msgstr "" #: doc/guix.texi:16230 doc/guix.texi:16246 doc/guix.texi:16256 #, no-wrap msgid "@code{max-children} (default: @code{5})" -msgstr "" +msgstr "@code{max-children} (par défaut : @code{5})" #. type: table #: doc/guix.texi:16232 doc/guix.texi:16248 doc/guix.texi:16258 @@ -29717,7 +30160,7 @@ msgstr "" #: doc/guix.texi:16232 #, no-wrap msgid "@code{start-servers} (default: @code{2})" -msgstr "" +msgstr "@code{start-servers} (par défaut : @code{2})" #. type: table #: doc/guix.texi:16234 @@ -29728,7 +30171,7 @@ msgstr "" #: doc/guix.texi:16234 #, no-wrap msgid "@code{min-spare-servers} (default: @code{1})" -msgstr "" +msgstr "@code{min-spare-servers} (par défaut : @code{1})" #. type: table #: doc/guix.texi:16236 @@ -29739,7 +30182,7 @@ msgstr "" #: doc/guix.texi:16236 #, no-wrap msgid "@code{max-spare-servers} (default: @code{3})" -msgstr "" +msgstr "@code{max-spare-servers} (par défaut : @code{3})" #. type: table #: doc/guix.texi:16238 @@ -29772,7 +30215,7 @@ msgstr "" #: doc/guix.texi:16258 #, no-wrap msgid "@code{process-idle-timeout} (default: @code{10})" -msgstr "" +msgstr "@code{process-idle-timeout} (par défaut : @code{10})" #. type: table #: doc/guix.texi:16260 @@ -29783,7 +30226,7 @@ msgstr "" #: doc/guix.texi:16264 #, no-wrap msgid "{Scheme Procedure} nginx-php-fpm-location @" -msgstr "" +msgstr "{Procédure Scheme} nginx-php-fpm-location @" #. type: deffn #: doc/guix.texi:16270 @@ -29828,7 +30271,7 @@ msgstr "" #: doc/guix.texi:16293 #, no-wrap msgid "{Scheme Procedure} cat-avatar-generator-serice @" -msgstr "" +msgstr "{Procédure Scheme} cat-avatar-generator-serice @" #. type: deffn #: doc/guix.texi:16301 @@ -29884,7 +30327,7 @@ msgstr "" #: doc/guix.texi:16325 #, no-wrap msgid "{Data Type} hpcguix-web-configuration" -msgstr "{Type de donnée} hpcguix-web-configuration" +msgstr "{Type de données} hpcguix-web-configuration" #. type: deftp #: doc/guix.texi:16327 @@ -29939,7 +30382,7 @@ msgstr "Une procédure qui spécifie comment filtrer les paquets qui seront affi #: doc/guix.texi:16343 #, no-wrap msgid "@code{package-page-extension-proc} (default: @code{(const '())})" -msgstr "@code{package-page-extension-procinputs} (par défaut : @code{(const '())})" +msgstr "@code{package-page-extension-proc} (par défaut : @code{(const '())})" #. type: table #: doc/guix.texi:16345 @@ -29966,7 +30409,7 @@ msgstr "" #: doc/guix.texi:16354 #, no-wrap msgid "@code{package} (default: @code{hpcguix-web})" -msgstr "@code{packages} (par défaut : @code{hpcguix-web})" +msgstr "@code{package} (par défaut : @code{hpcguix-web})" #. type: table #: doc/guix.texi:16356 @@ -30044,7 +30487,7 @@ msgstr "" #: doc/guix.texi:16414 #, no-wrap msgid "{Scheme Variable} certbot-service-type" -msgstr "" +msgstr "{Variable Scheme} certbot-service-type" #. type: defvr #: doc/guix.texi:16417 @@ -30088,7 +30531,7 @@ msgstr "" #: doc/guix.texi:16440 #, no-wrap msgid "{Data Type} certbot-configuration" -msgstr "" +msgstr "{Type de données} certbot-configuration" #. type: deftp #: doc/guix.texi:16443 @@ -30099,18 +30542,18 @@ msgstr "" #: doc/guix.texi:16445 #, no-wrap msgid "@code{package} (default: @code{certbot})" -msgstr "" +msgstr "@code{package} (par défaut : @code{certbot})" #. type: table #: doc/guix.texi:16447 msgid "The certbot package to use." -msgstr "" +msgstr "Le paquet certbot à utiliser." #. type: item #: doc/guix.texi:16448 #, no-wrap msgid "@code{webroot} (default: @code{/var/www})" -msgstr "" +msgstr "@code{webroot} (par défaut : @code{/var/www})" #. type: table #: doc/guix.texi:16451 @@ -30121,7 +30564,7 @@ msgstr "" #: doc/guix.texi:16452 #, no-wrap msgid "@code{certificates} (default: @code{()})" -msgstr "" +msgstr "@code{certificates} (par défaut : @code{()})" #. type: table #: doc/guix.texi:16456 @@ -30137,7 +30580,7 @@ msgstr "" #: doc/guix.texi:16461 #, no-wrap msgid "@code{rsa-key-size} (default: @code{2048})" -msgstr "" +msgstr "@code{rsa-key-size} (par défaut : @code{2048})" #. type: table #: doc/guix.texi:16463 @@ -30174,7 +30617,7 @@ msgstr "" #: doc/guix.texi:16486 #, no-wrap msgid "{Data Type} certificate-configuration" -msgstr "" +msgstr "{Type de données} certificate-configuration" #. type: deftp #: doc/guix.texi:16489 @@ -30201,7 +30644,7 @@ msgstr "" #: doc/guix.texi:16498 #, no-wrap msgid "@code{domains} (default: @code{()})" -msgstr "" +msgstr "@code{domains} (par défaut : @code{()})" #. type: table #: doc/guix.texi:16501 @@ -30212,7 +30655,7 @@ msgstr "" #: doc/guix.texi:16502 #, no-wrap msgid "@code{deploy-hook} (default: @code{#f})" -msgstr "" +msgstr "@code{deploy-hook} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16510 @@ -30318,7 +30761,7 @@ msgstr "" #: doc/guix.texi:16569 #, no-wrap msgid "{Scheme Variable} knot-service-type" -msgstr "" +msgstr "{Variable Scheme} knot-service-type" #. type: deffn #: doc/guix.texi:16571 @@ -30339,7 +30782,7 @@ msgstr "" #: doc/guix.texi:16583 #, no-wrap msgid "{Data Type} knot-key-configuration" -msgstr "" +msgstr "{Type de données} knot-key-configuration" #. type: deftp #: doc/guix.texi:16586 @@ -30351,7 +30794,7 @@ msgstr "" #: doc/guix.texi:16749 doc/guix.texi:16784 #, no-wrap msgid "@code{id} (default: @code{\"\"})" -msgstr "" +msgstr "@code{id} (par défaut : @code{\"\"})" #. type: table #: doc/guix.texi:16591 @@ -30362,7 +30805,7 @@ msgstr "" #: doc/guix.texi:16592 #, no-wrap msgid "@code{algorithm} (default: @code{#f})" -msgstr "" +msgstr "@code{algorithm} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16596 @@ -30373,7 +30816,7 @@ msgstr "" #: doc/guix.texi:16597 #, no-wrap msgid "@code{secret} (default: @code{\"\"})" -msgstr "" +msgstr "@code{secret} (par défaut : @code{\"\"})" #. type: table #: doc/guix.texi:16599 @@ -30384,7 +30827,7 @@ msgstr "" #: doc/guix.texi:16603 #, no-wrap msgid "{Data Type} knot-acl-configuration" -msgstr "" +msgstr "{Type de données} knot-acl-configuration" #. type: deftp #: doc/guix.texi:16606 @@ -30400,7 +30843,7 @@ msgstr "" #: doc/guix.texi:16612 doc/guix.texi:16727 #, no-wrap msgid "@code{address} (default: @code{'()})" -msgstr "" +msgstr "@code{address} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:16616 @@ -30411,7 +30854,7 @@ msgstr "" #: doc/guix.texi:16617 #, no-wrap msgid "@code{key} (default: @code{'()})" -msgstr "" +msgstr "@code{key} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:16621 @@ -30422,7 +30865,7 @@ msgstr "" #: doc/guix.texi:16622 #, no-wrap msgid "@code{action} (default: @code{'()})" -msgstr "" +msgstr "@code{action} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:16626 @@ -30433,7 +30876,7 @@ msgstr "" #: doc/guix.texi:16627 #, no-wrap msgid "@code{deny?} (default: @code{#f})" -msgstr "" +msgstr "@code{deny?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16630 @@ -30444,7 +30887,7 @@ msgstr "" #: doc/guix.texi:16634 #, no-wrap msgid "{Data Type} zone-entry" -msgstr "" +msgstr "{Type de données} zone-entry" #. type: deftp #: doc/guix.texi:16637 @@ -30455,7 +30898,7 @@ msgstr "" #: doc/guix.texi:16639 #, no-wrap msgid "@code{name} (default: @code{\"@@\"})" -msgstr "" +msgstr "@code{name} (par défaut : @code{\"@@\"})" #. type: table #: doc/guix.texi:16645 @@ -30466,7 +30909,7 @@ msgstr "" #: doc/guix.texi:16646 #, no-wrap msgid "@code{ttl} (default: @code{\"\"})" -msgstr "" +msgstr "@code{ttl} (par défaut : @code{\"\"})" #. type: table #: doc/guix.texi:16648 @@ -30477,7 +30920,7 @@ msgstr "" #: doc/guix.texi:16649 #, no-wrap msgid "@code{class} (default: @code{\"IN\"})" -msgstr "" +msgstr "@code{class} (par défaut : @code{\"IN\"})" #. type: table #: doc/guix.texi:16652 @@ -30488,7 +30931,7 @@ msgstr "" #: doc/guix.texi:16653 #, no-wrap msgid "@code{type} (default: @code{\"A\"})" -msgstr "" +msgstr "@code{type} (par défaut : @code{\"A\"})" #. type: table #: doc/guix.texi:16657 @@ -30499,7 +30942,7 @@ msgstr "" #: doc/guix.texi:16658 #, no-wrap msgid "@code{data} (default: @code{\"\"})" -msgstr "" +msgstr "@code{data} (par défaut : @code{\"\"})" #. type: table #: doc/guix.texi:16662 @@ -30510,7 +30953,7 @@ msgstr "" #: doc/guix.texi:16666 #, no-wrap msgid "{Data Type} zone-file" -msgstr "" +msgstr "{Type de données} zone-file" #. type: deftp #: doc/guix.texi:16669 @@ -30526,7 +30969,7 @@ msgstr "" #: doc/guix.texi:16679 #, no-wrap msgid "@code{origin} (default: @code{\"\"})" -msgstr "" +msgstr "@code{origin} (par défaut : @code{\"\"})" #. type: table #: doc/guix.texi:16681 @@ -30537,7 +30980,7 @@ msgstr "" #: doc/guix.texi:16682 #, no-wrap msgid "@code{ns} (default: @code{\"ns\"})" -msgstr "" +msgstr "@code{ns} (par défaut : @code{\"ns\"})" #. type: table #: doc/guix.texi:16687 @@ -30548,7 +30991,7 @@ msgstr "" #: doc/guix.texi:16688 #, no-wrap msgid "@code{mail} (default: @code{\"hostmaster\"})" -msgstr "" +msgstr "@code{mail} (par défaut : @code{\"hostmaster\"})" #. type: table #: doc/guix.texi:16691 @@ -30559,7 +31002,7 @@ msgstr "" #: doc/guix.texi:16692 #, no-wrap msgid "@code{serial} (default: @code{1})" -msgstr "" +msgstr "@code{serial} (par défaut : @code{1})" #. type: table #: doc/guix.texi:16696 @@ -30570,7 +31013,7 @@ msgstr "" #: doc/guix.texi:16697 #, no-wrap msgid "@code{refresh} (default: @code{(* 2 24 3600)})" -msgstr "" +msgstr "@code{refresh} (par défaut : @code{(* 2 24 3600)})" #. type: table #: doc/guix.texi:16701 @@ -30581,7 +31024,7 @@ msgstr "" #: doc/guix.texi:16702 #, no-wrap msgid "@code{retry} (default: @code{(* 15 60)})" -msgstr "" +msgstr "@code{retry} (par défaut : @code{(* 15 60)})" #. type: table #: doc/guix.texi:16705 @@ -30592,7 +31035,7 @@ msgstr "" #: doc/guix.texi:16706 #, no-wrap msgid "@code{expiry} (default: @code{(* 14 24 3600)})" -msgstr "" +msgstr "@code{expiry} (par défaut : @code{(* 14 24 3600)})" #. type: table #: doc/guix.texi:16710 @@ -30603,7 +31046,7 @@ msgstr "" #: doc/guix.texi:16711 #, no-wrap msgid "@code{nx} (default: @code{3600})" -msgstr "" +msgstr "@code{nx} (par défaut : @code{3600})" #. type: table #: doc/guix.texi:16714 @@ -30614,7 +31057,7 @@ msgstr "" #: doc/guix.texi:16718 #, no-wrap msgid "{Data Type} knot-remote-configuration" -msgstr "" +msgstr "{Type de données} knot-remote-configuration" #. type: deftp #: doc/guix.texi:16721 @@ -30635,7 +31078,7 @@ msgstr "" #: doc/guix.texi:16732 #, no-wrap msgid "@code{via} (default: @code{'()})" -msgstr "" +msgstr "@code{via} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:16736 @@ -30646,7 +31089,7 @@ msgstr "" #: doc/guix.texi:16737 #, no-wrap msgid "@code{key} (default: @code{#f})" -msgstr "" +msgstr "@code{key} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16740 @@ -30657,7 +31100,7 @@ msgstr "" #: doc/guix.texi:16744 #, no-wrap msgid "{Data Type} knot-keystore-configuration" -msgstr "" +msgstr "{Type de données} knot-keystore-configuration" #. type: deftp #: doc/guix.texi:16747 @@ -30673,7 +31116,7 @@ msgstr "" #: doc/guix.texi:16752 #, no-wrap msgid "@code{backend} (default: @code{'pem})" -msgstr "" +msgstr "@code{backend} (par défaut : @code{'pem})" #. type: table #: doc/guix.texi:16754 @@ -30684,7 +31127,7 @@ msgstr "" #: doc/guix.texi:16755 #, no-wrap msgid "@code{config} (default: @code{\"/var/lib/knot/keys/keys\"})" -msgstr "" +msgstr "@code{config} (par défaut : @code{\"/var/lib/knot/keys/keys\"})" #. type: table #: doc/guix.texi:16759 @@ -30695,7 +31138,7 @@ msgstr "" #: doc/guix.texi:16763 #, no-wrap msgid "{Data Type} knot-policy-configuration" -msgstr "" +msgstr "{Type de données} knot-policy-configuration" #. type: deftp #: doc/guix.texi:16767 @@ -30726,7 +31169,7 @@ msgstr "" #: doc/guix.texi:16787 #, no-wrap msgid "@code{keystore} (default: @code{\"default\"})" -msgstr "" +msgstr "@code{keystore} (par défaut : @code{\"default\"})" #. type: table #: doc/guix.texi:16792 @@ -30737,7 +31180,7 @@ msgstr "" #: doc/guix.texi:16793 #, no-wrap msgid "@code{manual?} (default: @code{#f})" -msgstr "" +msgstr "@code{manual?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16795 @@ -30748,7 +31191,7 @@ msgstr "" #: doc/guix.texi:16796 #, no-wrap msgid "@code{single-type-signing?} (default: @code{#f})" -msgstr "" +msgstr "@code{single-type-signing?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16798 @@ -30759,7 +31202,7 @@ msgstr "" #: doc/guix.texi:16799 #, no-wrap msgid "@code{algorithm} (default: @code{\"ecdsap256sha256\"})" -msgstr "" +msgstr "@code{algorithm} (par défaut : @code{\"ecdsap256sha256\"})" #. type: table #: doc/guix.texi:16801 @@ -30770,7 +31213,7 @@ msgstr "" #: doc/guix.texi:16802 #, no-wrap msgid "@code{ksk-size} (default: @code{256})" -msgstr "" +msgstr "@code{ksk-size} (par défaut : @code{256})" #. type: table #: doc/guix.texi:16805 @@ -30781,7 +31224,7 @@ msgstr "" #: doc/guix.texi:16806 #, no-wrap msgid "@code{zsk-size} (default: @code{256})" -msgstr "" +msgstr "@code{zsk-size} (par défaut : @code{256})" #. type: table #: doc/guix.texi:16809 @@ -30792,7 +31235,7 @@ msgstr "" #: doc/guix.texi:16810 #, no-wrap msgid "@code{dnskey-ttl} (default: @code{'default})" -msgstr "" +msgstr "@code{dnskey-ttl} (par défaut : @code{'default})" #. type: table #: doc/guix.texi:16813 @@ -30803,7 +31246,7 @@ msgstr "" #: doc/guix.texi:16814 #, no-wrap msgid "@code{zsk-lifetime} (default: @code{(* 30 24 3600)})" -msgstr "" +msgstr "@code{zsk-lifetime} (par défaut : @code{(* 30 24 3600)})" #. type: table #: doc/guix.texi:16816 @@ -30814,7 +31257,7 @@ msgstr "" #: doc/guix.texi:16817 #, no-wrap msgid "@code{propagation-delay} (default: @code{(* 24 3600)})" -msgstr "" +msgstr "@code{propagation-delay} (par défaut : @code{(* 24 3600)})" #. type: table #: doc/guix.texi:16820 @@ -30825,7 +31268,7 @@ msgstr "" #: doc/guix.texi:16821 #, no-wrap msgid "@code{rrsig-lifetime} (default: @code{(* 14 24 3600)})" -msgstr "" +msgstr "@code{rrsig-lifetime} (par défaut : @code{(* 14 24 3600)})" #. type: table #: doc/guix.texi:16823 @@ -30836,7 +31279,7 @@ msgstr "" #: doc/guix.texi:16824 #, no-wrap msgid "@code{rrsig-refresh} (default: @code{(* 7 24 3600)})" -msgstr "" +msgstr "@code{rrsig-refresh} (par défaut : @code{(* 7 24 3600)})" #. type: table #: doc/guix.texi:16826 @@ -30847,7 +31290,7 @@ msgstr "" #: doc/guix.texi:16827 #, no-wrap msgid "@code{nsec3?} (default: @code{#f})" -msgstr "" +msgstr "@code{nsec3?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16829 @@ -30858,7 +31301,7 @@ msgstr "" #: doc/guix.texi:16830 #, no-wrap msgid "@code{nsec3-iterations} (default: @code{5})" -msgstr "" +msgstr "@code{nsec3-iterations} (par défaut : @code{5})" #. type: table #: doc/guix.texi:16832 @@ -30869,7 +31312,7 @@ msgstr "" #: doc/guix.texi:16833 #, no-wrap msgid "@code{nsec3-salt-length} (default: @code{8})" -msgstr "" +msgstr "@code{nsec3-salt-length} (par défaut : @code{8})" #. type: table #: doc/guix.texi:16836 @@ -30880,7 +31323,7 @@ msgstr "" #: doc/guix.texi:16837 #, no-wrap msgid "@code{nsec3-salt-lifetime} (default: @code{(* 30 24 3600)})" -msgstr "" +msgstr "@code{nsec3-salt-lifetime} (par défaut : @code{(* 30 24 3600)})" #. type: table #: doc/guix.texi:16839 @@ -30891,7 +31334,7 @@ msgstr "" #: doc/guix.texi:16843 #, no-wrap msgid "{Data Type} knot-zone-configuration" -msgstr "" +msgstr "{Type de données} knot-zone-configuration" #. type: deftp #: doc/guix.texi:16846 @@ -30902,7 +31345,7 @@ msgstr "" #: doc/guix.texi:16848 #, no-wrap msgid "@code{domain} (default: @code{\"\"})" -msgstr "" +msgstr "@code{domain} (par défaut : @code{\"\"})" #. type: table #: doc/guix.texi:16850 @@ -30913,7 +31356,7 @@ msgstr "" #: doc/guix.texi:16851 #, no-wrap msgid "@code{file} (default: @code{\"\"})" -msgstr "" +msgstr "@code{file} (par défaut : @code{\"\"})" #. type: table #: doc/guix.texi:16854 @@ -30924,7 +31367,7 @@ msgstr "" #: doc/guix.texi:16855 #, no-wrap msgid "@code{zone} (default: @code{(zone-file)})" -msgstr "" +msgstr "@code{zone} (par défaut : @code{(zone-file)})" #. type: table #: doc/guix.texi:16858 @@ -30935,7 +31378,7 @@ msgstr "" #: doc/guix.texi:16859 #, no-wrap msgid "@code{master} (default: @code{'()})" -msgstr "" +msgstr "@code{master} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:16862 @@ -30946,7 +31389,7 @@ msgstr "" #: doc/guix.texi:16863 #, no-wrap msgid "@code{ddns-master} (default: @code{#f})" -msgstr "" +msgstr "@code{ddns-master} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16866 @@ -30957,7 +31400,7 @@ msgstr "" #: doc/guix.texi:16867 #, no-wrap msgid "@code{notify} (default: @code{'()})" -msgstr "" +msgstr "@code{notify} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:16869 @@ -30968,7 +31411,7 @@ msgstr "" #: doc/guix.texi:16870 #, no-wrap msgid "@code{acl} (default: @code{'()})" -msgstr "" +msgstr "@code{acl} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:16872 @@ -30979,7 +31422,7 @@ msgstr "" #: doc/guix.texi:16873 #, no-wrap msgid "@code{semantic-checks?} (default: @code{#f})" -msgstr "" +msgstr "@code{semantic-checks?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16875 @@ -30990,7 +31433,7 @@ msgstr "" #: doc/guix.texi:16876 #, no-wrap msgid "@code{disable-any?} (default: @code{#f})" -msgstr "" +msgstr "@code{disable-any?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:16878 @@ -31001,7 +31444,7 @@ msgstr "" #: doc/guix.texi:16879 #, no-wrap msgid "@code{zonefile-sync} (default: @code{0})" -msgstr "" +msgstr "@code{zonefile-sync} (par défaut : @code{0})" #. type: table #: doc/guix.texi:16882 @@ -31012,7 +31455,7 @@ msgstr "" #: doc/guix.texi:16883 #, no-wrap msgid "@code{serial-policy} (default: @code{'increment})" -msgstr "" +msgstr "@code{serial-policy} (par défaut : @code{'increment})" #. type: table #: doc/guix.texi:16885 @@ -31023,7 +31466,7 @@ msgstr "" #: doc/guix.texi:16889 #, no-wrap msgid "{Data Type} knot-configuration" -msgstr "" +msgstr "{Type de données} knot-configuration" #. type: deftp #: doc/guix.texi:16892 @@ -31034,7 +31477,7 @@ msgstr "" #: doc/guix.texi:16894 #, no-wrap msgid "@code{knot} (default: @code{knot})" -msgstr "" +msgstr "@code{knot} (par défaut : @code{knot})" #. type: table #: doc/guix.texi:16896 @@ -31045,7 +31488,7 @@ msgstr "" #: doc/guix.texi:16897 #, no-wrap msgid "@code{run-directory} (default: @code{\"/var/run/knot\"})" -msgstr "" +msgstr "@code{run-directory} (par défaut : @code{\"/var/run/knot\"})" #. type: table #: doc/guix.texi:16899 @@ -31056,7 +31499,7 @@ msgstr "" #: doc/guix.texi:16900 #, no-wrap msgid "@code{listen-v4} (default: @code{\"0.0.0.0\"})" -msgstr "" +msgstr "@code{listen-v4} (par défaut : @code{\"0.0.0.0\"})" #. type: table #: doc/guix.texi:16902 doc/guix.texi:16905 @@ -31067,13 +31510,13 @@ msgstr "" #: doc/guix.texi:16903 #, no-wrap msgid "@code{listen-v6} (default: @code{\"::\"})" -msgstr "" +msgstr "@code{listen-v6} (par défaut : @code{\"::\"})" #. type: item #: doc/guix.texi:16906 #, no-wrap msgid "@code{listen-port} (default: @code{53})" -msgstr "" +msgstr "@code{listen-port} (par défaut : @code{53})" #. type: table #: doc/guix.texi:16908 @@ -31084,7 +31527,7 @@ msgstr "" #: doc/guix.texi:16909 #, no-wrap msgid "@code{keys} (default: @code{'()})" -msgstr "" +msgstr "@code{keys} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:16911 @@ -31095,7 +31538,7 @@ msgstr "" #: doc/guix.texi:16912 #, no-wrap msgid "@code{acls} (default: @code{'()})" -msgstr "" +msgstr "@code{acls} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:16914 @@ -31106,7 +31549,7 @@ msgstr "" #: doc/guix.texi:16915 #, no-wrap msgid "@code{remotes} (default: @code{'()})" -msgstr "" +msgstr "@code{remotes} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:16917 @@ -31117,7 +31560,7 @@ msgstr "" #: doc/guix.texi:16918 #, no-wrap msgid "@code{zones} (default: @code{'()})" -msgstr "" +msgstr "@code{zones} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:16920 @@ -31155,7 +31598,7 @@ msgstr "" #: doc/guix.texi:16938 #, no-wrap msgid "{Data Type} dnsmasq-configuration" -msgstr "{Type de donnée} dnsmasq-configuration" +msgstr "{Type de données} dnsmasq-configuration" #. type: deftp #: doc/guix.texi:16940 @@ -31166,7 +31609,7 @@ msgstr "Type de données qui représente la configuration de dnsmasq." #: doc/guix.texi:16942 #, no-wrap msgid "@code{package} (default: @var{dnsmasq})" -msgstr "@code{package} (par défaut : @code{dnsmasq})" +msgstr "@code{package} (par défaut : @var{dnsmasq})" #. type: table #: doc/guix.texi:16944 @@ -31287,7 +31730,7 @@ msgstr "" #: doc/guix.texi:16988 #, no-wrap msgid "{Scheme Procedure} openvpn-client-service @" -msgstr "" +msgstr "{Procédure Scheme} openvpn-client-service @" #. type: deffn #: doc/guix.texi:16990 @@ -31303,7 +31746,7 @@ msgstr "" #: doc/guix.texi:16994 #, no-wrap msgid "{Scheme Procedure} openvpn-server-service @" -msgstr "" +msgstr "{Procédure Scheme} openvpn-server-service @" #. type: deffn #: doc/guix.texi:16996 @@ -31323,13 +31766,13 @@ msgstr "" #. type: Plain text #: doc/guix.texi:17005 msgid "Available @code{openvpn-client-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{openvpn-client-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:17006 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} package openvpn" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} package openvpn" #. type: deftypevr #: doc/guix.texi:17008 doc/guix.texi:17144 @@ -31340,7 +31783,7 @@ msgstr "" #: doc/guix.texi:17011 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} string pid-file" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} string pid-file" #. type: deftypevr #: doc/guix.texi:17013 doc/guix.texi:17149 @@ -31350,13 +31793,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17015 doc/guix.texi:17151 msgid "Defaults to @samp{\"/var/run/openvpn/openvpn.pid\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/var/run/openvpn/openvpn.pid\"}." #. type: deftypevr #: doc/guix.texi:17018 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} proto proto" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} proto proto" #. type: deftypevr #: doc/guix.texi:17021 doc/guix.texi:17157 @@ -31366,13 +31809,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17023 doc/guix.texi:17159 msgid "Defaults to @samp{udp}." -msgstr "" +msgstr "La valeur par défaut est @samp{udp}." #. type: deftypevr #: doc/guix.texi:17026 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} dev dev" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} dev dev" #. type: deftypevr #: doc/guix.texi:17028 doc/guix.texi:17164 @@ -31382,13 +31825,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17030 doc/guix.texi:17166 msgid "Defaults to @samp{tun}." -msgstr "" +msgstr "La valeur par défaut est @samp{tun}." #. type: deftypevr #: doc/guix.texi:17033 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} string ca" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} string ca" #. type: deftypevr #: doc/guix.texi:17035 doc/guix.texi:17171 @@ -31398,13 +31841,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17037 doc/guix.texi:17173 msgid "Defaults to @samp{\"/etc/openvpn/ca.crt\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/etc/openvpn/ca.crt\"}." #. type: deftypevr #: doc/guix.texi:17040 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} string cert" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} string cert" #. type: deftypevr #: doc/guix.texi:17043 doc/guix.texi:17179 @@ -31414,13 +31857,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17045 doc/guix.texi:17181 msgid "Defaults to @samp{\"/etc/openvpn/client.crt\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/etc/openvpn/client.crt\"}." #. type: deftypevr #: doc/guix.texi:17048 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} string key" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} string key" #. type: deftypevr #: doc/guix.texi:17051 doc/guix.texi:17187 @@ -31430,13 +31873,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17053 doc/guix.texi:17189 msgid "Defaults to @samp{\"/etc/openvpn/client.key\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/etc/openvpn/client.key\"}." #. type: deftypevr #: doc/guix.texi:17056 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} boolean comp-lzo?" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} boolean comp-lzo?" #. type: deftypevr #: doc/guix.texi:17058 doc/guix.texi:17194 @@ -31447,7 +31890,7 @@ msgstr "" #: doc/guix.texi:17063 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} boolean persist-key?" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} boolean persist-key?" #. type: deftypevr #: doc/guix.texi:17065 doc/guix.texi:17201 @@ -31458,7 +31901,7 @@ msgstr "" #: doc/guix.texi:17070 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} boolean persist-tun?" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} boolean persist-tun?" #. type: deftypevr #: doc/guix.texi:17073 doc/guix.texi:17209 @@ -31469,7 +31912,7 @@ msgstr "" #: doc/guix.texi:17078 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} number verbosity" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} number verbosity" #. type: deftypevr #: doc/guix.texi:17080 doc/guix.texi:17216 @@ -31480,13 +31923,13 @@ msgstr "" #: doc/guix.texi:17082 doc/guix.texi:17218 doc/guix.texi:18495 #: doc/guix.texi:18718 msgid "Defaults to @samp{3}." -msgstr "" +msgstr "La valeur par défaut est @samp{3}." #. type: deftypevr #: doc/guix.texi:17085 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} tls-auth-client tls-auth" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} tls-auth-client tls-auth" #. type: deftypevr #: doc/guix.texi:17088 doc/guix.texi:17224 @@ -31497,7 +31940,7 @@ msgstr "" #: doc/guix.texi:17093 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} key-usage verify-key-usage?" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} key-usage verify-key-usage?" #. type: deftypevr #: doc/guix.texi:17095 @@ -31508,7 +31951,7 @@ msgstr "" #: doc/guix.texi:17100 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} bind bind?" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} bind bind?" #. type: deftypevr #: doc/guix.texi:17102 @@ -31519,7 +31962,7 @@ msgstr "" #: doc/guix.texi:17107 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} resolv-retry resolv-retry?" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} resolv-retry resolv-retry?" #. type: deftypevr #: doc/guix.texi:17109 @@ -31530,7 +31973,7 @@ msgstr "" #: doc/guix.texi:17114 #, no-wrap msgid "{@code{openvpn-client-configuration} parameter} openvpn-remote-list remote" -msgstr "" +msgstr "{paramètre de @code{openvpn-client-configuration}} openvpn-remote-list remote" #. type: deftypevr #: doc/guix.texi:17116 @@ -31540,13 +31983,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17120 msgid "Available @code{openvpn-remote-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{openvpn-remote-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:17121 #, no-wrap msgid "{@code{openvpn-remote-configuration} parameter} string name" -msgstr "" +msgstr "{paramètre de @code{openvpn-remote-configuration}} string name" #. type: deftypevr #: doc/guix.texi:17123 @@ -31556,13 +31999,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17125 msgid "Defaults to @samp{\"my-server\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"my-server\"}." #. type: deftypevr #: doc/guix.texi:17128 #, no-wrap msgid "{@code{openvpn-remote-configuration} parameter} number port" -msgstr "" +msgstr "{paramètre de @code{openvpn-remote-configuration}} number port" #. type: deftypevr #: doc/guix.texi:17130 @@ -31572,90 +32015,90 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17132 doc/guix.texi:17233 msgid "Defaults to @samp{1194}." -msgstr "" +msgstr "La valeur par défaut est @samp{1194}." #. type: Plain text #: doc/guix.texi:17141 msgid "Available @code{openvpn-server-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{openvpn-server-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:17142 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} package openvpn" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} package openvpn" #. type: deftypevr #: doc/guix.texi:17147 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string pid-file" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} string pid-file" #. type: deftypevr #: doc/guix.texi:17154 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} proto proto" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} proto proto" #. type: deftypevr #: doc/guix.texi:17162 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} dev dev" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} dev dev" #. type: deftypevr #: doc/guix.texi:17169 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string ca" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} string ca" #. type: deftypevr #: doc/guix.texi:17176 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string cert" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} string cert" #. type: deftypevr #: doc/guix.texi:17184 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string key" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} string key" #. type: deftypevr #: doc/guix.texi:17192 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} boolean comp-lzo?" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} boolean comp-lzo?" #. type: deftypevr #: doc/guix.texi:17199 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} boolean persist-key?" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} boolean persist-key?" #. type: deftypevr #: doc/guix.texi:17206 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} boolean persist-tun?" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} boolean persist-tun?" #. type: deftypevr #: doc/guix.texi:17214 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} number verbosity" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} number verbosity" #. type: deftypevr #: doc/guix.texi:17221 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} tls-auth-server tls-auth" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} tls-auth-server tls-auth" #. type: deftypevr #: doc/guix.texi:17229 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} number port" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} number port" #. type: deftypevr #: doc/guix.texi:17231 @@ -31666,7 +32109,7 @@ msgstr "" #: doc/guix.texi:17236 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} ip-mask server" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} ip-mask server" #. type: deftypevr #: doc/guix.texi:17238 @@ -31676,13 +32119,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17240 msgid "Defaults to @samp{\"10.8.0.0 255.255.255.0\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"10.8.0.0 255.255.255.0\"}." #. type: deftypevr #: doc/guix.texi:17243 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} cidr6 server-ipv6" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} cidr6 server-ipv6" #. type: deftypevr #: doc/guix.texi:17245 @@ -31693,7 +32136,7 @@ msgstr "" #: doc/guix.texi:17250 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string dh" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} string dh" #. type: deftypevr #: doc/guix.texi:17252 @@ -31703,13 +32146,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17254 msgid "Defaults to @samp{\"/etc/openvpn/dh2048.pem\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/etc/openvpn/dh2048.pem\"}." #. type: deftypevr #: doc/guix.texi:17257 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string ifconfig-pool-persist" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} string ifconfig-pool-persist" #. type: deftypevr #: doc/guix.texi:17259 @@ -31719,13 +32162,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17261 msgid "Defaults to @samp{\"/etc/openvpn/ipp.txt\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/etc/openvpn/ipp.txt\"}." #. type: deftypevr #: doc/guix.texi:17264 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} gateway redirect-gateway?" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} gateway redirect-gateway?" #. type: deftypevr #: doc/guix.texi:17266 @@ -31736,7 +32179,7 @@ msgstr "" #: doc/guix.texi:17271 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} boolean client-to-client?" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} boolean client-to-client?" #. type: deftypevr #: doc/guix.texi:17273 @@ -31747,7 +32190,7 @@ msgstr "" #: doc/guix.texi:17278 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} keepalive keepalive" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} keepalive keepalive" #. type: deftypevr #: doc/guix.texi:17284 @@ -31758,7 +32201,7 @@ msgstr "" #: doc/guix.texi:17287 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} number max-clients" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} number max-clients" #. type: deftypevr #: doc/guix.texi:17289 @@ -31769,7 +32212,7 @@ msgstr "" #: doc/guix.texi:17294 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} string status" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} string status" #. type: deftypevr #: doc/guix.texi:17297 @@ -31779,13 +32222,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17299 msgid "Defaults to @samp{\"/var/run/openvpn/status\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/var/run/openvpn/status\"}." #. type: deftypevr #: doc/guix.texi:17302 #, no-wrap msgid "{@code{openvpn-server-configuration} parameter} openvpn-ccd-list client-config-dir" -msgstr "" +msgstr "{paramètre de @code{openvpn-server-configuration}} openvpn-ccd-list client-config-dir" #. type: deftypevr #: doc/guix.texi:17304 @@ -31795,13 +32238,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17308 msgid "Available @code{openvpn-ccd-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{openvpn-ccd-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:17309 #, no-wrap msgid "{@code{openvpn-ccd-configuration} parameter} string name" -msgstr "" +msgstr "{paramètre de @code{openvpn-ccd-configuration}} string name" #. type: deftypevr #: doc/guix.texi:17311 @@ -31811,13 +32254,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17313 msgid "Defaults to @samp{\"client\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"client\"}." #. type: deftypevr #: doc/guix.texi:17316 #, no-wrap msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask iroute" -msgstr "" +msgstr "{paramètre de @code{openvpn-ccd-configuration}} ip-mask iroute" #. type: deftypevr #: doc/guix.texi:17318 @@ -31828,7 +32271,7 @@ msgstr "" #: doc/guix.texi:17323 #, no-wrap msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask ifconfig-push" -msgstr "" +msgstr "{paramètre de @code{openvpn-ccd-configuration}} ip-mask ifconfig-push" #. type: deftypevr #: doc/guix.texi:17325 @@ -31867,7 +32310,7 @@ msgstr "" #: doc/guix.texi:17352 #, no-wrap msgid "{Scheme Variable} rpcbind-service-type" -msgstr "" +msgstr "{Variable Scheme} rpcbind-service-type" #. type: defvr #: doc/guix.texi:17354 @@ -31878,7 +32321,7 @@ msgstr "" #: doc/guix.texi:17357 #, no-wrap msgid "{Data Type} rpcbind-configuration" -msgstr "" +msgstr "{Type de données} rpcbind-configuration" #. type: deftp #: doc/guix.texi:17360 @@ -31889,18 +32332,18 @@ msgstr "" #: doc/guix.texi:17361 #, no-wrap msgid "@code{rpcbind} (default: @code{rpcbind})" -msgstr "" +msgstr "@code{rpcbind} (par défaut : @code{rpcbind})" #. type: table #: doc/guix.texi:17363 msgid "The rpcbind package to use." -msgstr "" +msgstr "Le paquet rpcbind à utiliser." #. type: item #: doc/guix.texi:17364 #, no-wrap msgid "@code{warm-start?} (default: @code{#t})" -msgstr "" +msgstr "@code{warm-start?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:17368 @@ -31934,7 +32377,7 @@ msgstr "" #: doc/guix.texi:17379 #, no-wrap msgid "{Scheme Variable} pipefs-service-type" -msgstr "" +msgstr "{Variable Scheme} pipefs-service-type" #. type: defvr #: doc/guix.texi:17381 @@ -31945,7 +32388,7 @@ msgstr "" #: doc/guix.texi:17383 #, no-wrap msgid "{Data Type} pipefs-configuration" -msgstr "" +msgstr "{Type de données} pipefs-configuration" #. type: deftp #: doc/guix.texi:17386 @@ -31956,7 +32399,7 @@ msgstr "" #: doc/guix.texi:17387 #, no-wrap msgid "@code{mount-point} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})" -msgstr "" +msgstr "@code{mount-point} (par défaut : @code{\"/var/lib/nfs/rpc_pipefs\"})" #. type: table #: doc/guix.texi:17389 @@ -31996,7 +32439,7 @@ msgstr "" #: doc/guix.texi:17404 #, no-wrap msgid "{Scheme Variable} gss-service-type" -msgstr "" +msgstr "{Variable Scheme} gss-service-type" #. type: defvr #: doc/guix.texi:17406 @@ -32007,7 +32450,7 @@ msgstr "" #: doc/guix.texi:17408 #, no-wrap msgid "{Data Type} gss-configuration" -msgstr "" +msgstr "{Type de données} gss-configuration" #. type: deftp #: doc/guix.texi:17411 @@ -32018,7 +32461,7 @@ msgstr "" #: doc/guix.texi:17412 doc/guix.texi:17437 #, no-wrap msgid "@code{nfs-utils} (default: @code{nfs-utils})" -msgstr "" +msgstr "@code{nfs-utils} (par défaut : @code{nfs-utils})" #. type: table #: doc/guix.texi:17414 @@ -32029,7 +32472,7 @@ msgstr "" #: doc/guix.texi:17415 doc/guix.texi:17440 #, no-wrap msgid "@code{pipefs-directory} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})" -msgstr "" +msgstr "@code{pipefs-directory} (par défaut : @code{\"/var/lib/nfs/rpc_pipefs\"})" #. type: table #: doc/guix.texi:17417 doc/guix.texi:17442 @@ -32063,7 +32506,7 @@ msgstr "" #: doc/guix.texi:17429 #, no-wrap msgid "{Scheme Variable} idmap-service-type" -msgstr "" +msgstr "{Variable Scheme} idmap-service-type" #. type: defvr #: doc/guix.texi:17431 @@ -32074,7 +32517,7 @@ msgstr "" #: doc/guix.texi:17433 #, no-wrap msgid "{Data Type} idmap-configuration" -msgstr "" +msgstr "{Type de données} idmap-configuration" #. type: deftp #: doc/guix.texi:17436 @@ -32090,7 +32533,7 @@ msgstr "" #: doc/guix.texi:17443 #, no-wrap msgid "@code{domain} (default: @code{#f})" -msgstr "" +msgstr "@code{domain} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:17447 @@ -32117,7 +32560,7 @@ msgstr "" #: doc/guix.texi:17461 #, no-wrap msgid "{Scheme Procedure} cuirass-service-type" -msgstr "" +msgstr "{Procédure Scheme} cuirass-service-type" #. type: defvr #: doc/guix.texi:17464 @@ -32154,7 +32597,7 @@ msgstr "" #: doc/guix.texi:17489 #, no-wrap msgid "{Data Type} cuirass-configuration" -msgstr "" +msgstr "{Type de données} cuirass-configuration" #. type: deftp #: doc/guix.texi:17491 @@ -32165,7 +32608,7 @@ msgstr "" #: doc/guix.texi:17493 #, no-wrap msgid "@code{log-file} (default: @code{\"/var/log/cuirass.log\"})" -msgstr "" +msgstr "@code{log-file} (par défaut : @code{\"/var/log/cuirass.log\"})" #. type: table #: doc/guix.texi:17495 @@ -32176,7 +32619,7 @@ msgstr "" #: doc/guix.texi:17496 #, no-wrap msgid "@code{cache-directory} (default: @code{\"/var/cache/cuirass\"})" -msgstr "" +msgstr "@code{cache-directory} (par défaut : @code{\"/var/cache/cuirass\"})" #. type: table #: doc/guix.texi:17498 @@ -32187,7 +32630,7 @@ msgstr "" #: doc/guix.texi:17499 #, no-wrap msgid "@code{user} (default: @code{\"cuirass\"})" -msgstr "" +msgstr "@code{user} (par défaut : @code{\"cuirass\"})" #. type: table #: doc/guix.texi:17501 @@ -32198,7 +32641,7 @@ msgstr "" #: doc/guix.texi:17502 #, no-wrap msgid "@code{group} (default: @code{\"cuirass\"})" -msgstr "" +msgstr "@code{group} (par défaut : @code{\"cuirass\"})" #. type: table #: doc/guix.texi:17504 @@ -32209,7 +32652,7 @@ msgstr "" #: doc/guix.texi:17505 #, no-wrap msgid "@code{interval} (default: @code{60})" -msgstr "" +msgstr "@code{interval} (par défaut : @code{60})" #. type: table #: doc/guix.texi:17508 @@ -32220,7 +32663,7 @@ msgstr "" #: doc/guix.texi:17509 #, no-wrap msgid "@code{database} (default: @code{\"/var/run/cuirass/cuirass.db\"})" -msgstr "" +msgstr "@code{database} (par défaut : @code{\"/var/run/cuirass/cuirass.db\"})" #. type: table #: doc/guix.texi:17512 @@ -32231,7 +32674,7 @@ msgstr "" #: doc/guix.texi:17513 #, no-wrap msgid "@code{port} (default: @code{8081})" -msgstr "" +msgstr "@code{port} (par défaut : @code{8081})" #. type: table #: doc/guix.texi:17515 @@ -32247,7 +32690,7 @@ msgstr "" #: doc/guix.texi:17520 #, no-wrap msgid "@code{specifications} (default: @code{#~'()})" -msgstr "" +msgstr "@code{specifications} (par défaut : @code{#~'()})" #. type: table #: doc/guix.texi:17526 @@ -32258,7 +32701,7 @@ msgstr "" #: doc/guix.texi:17527 #, no-wrap msgid "@code{use-substitutes?} (default: @code{#f})" -msgstr "" +msgstr "@code{use-substitutes?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:17530 @@ -32269,7 +32712,7 @@ msgstr "" #: doc/guix.texi:17531 #, no-wrap msgid "@code{one-shot?} (default: @code{#f})" -msgstr "" +msgstr "@code{one-shot?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:17533 @@ -32280,7 +32723,7 @@ msgstr "" #: doc/guix.texi:17534 #, no-wrap msgid "@code{fallback?} (default: @code{#f})" -msgstr "" +msgstr "@code{fallback?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:17537 @@ -32291,7 +32734,7 @@ msgstr "" #: doc/guix.texi:17538 #, no-wrap msgid "@code{load-path} (default: @code{'()})" -msgstr "" +msgstr "@code{load-path} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:17541 @@ -32302,12 +32745,12 @@ msgstr "" #: doc/guix.texi:17542 #, no-wrap msgid "@code{cuirass} (default: @code{cuirass})" -msgstr "" +msgstr "@code{cuirass} (par défaut : @code{cuirass})" #. type: table #: doc/guix.texi:17544 msgid "The Cuirass package to use." -msgstr "" +msgstr "Le paquet Cuirass à utiliser." #. type: cindex #: doc/guix.texi:17550 @@ -32329,7 +32772,7 @@ msgstr "" #: doc/guix.texi:17560 #, no-wrap msgid "{Scheme Variable} tlp-service-type" -msgstr "" +msgstr "{Variable Scheme} tlp-service-type" #. type: deffn #: doc/guix.texi:17564 @@ -32355,13 +32798,13 @@ msgstr "" #. type: Plain text #: doc/guix.texi:17587 msgid "Available @code{tlp-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{tlp-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:17588 #, no-wrap msgid "{@code{tlp-configuration} parameter} package tlp" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} package tlp" #. type: deftypevr #: doc/guix.texi:17590 @@ -32372,7 +32815,7 @@ msgstr "" #: doc/guix.texi:17593 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean tlp-enable?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} boolean tlp-enable?" #. type: deftypevr #: doc/guix.texi:17595 @@ -32383,7 +32826,7 @@ msgstr "" #: doc/guix.texi:17600 #, no-wrap msgid "{@code{tlp-configuration} parameter} string tlp-default-mode" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string tlp-default-mode" #. type: deftypevr #: doc/guix.texi:17603 @@ -32393,13 +32836,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17605 msgid "Defaults to @samp{\"AC\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"AC\"}." #. type: deftypevr #: doc/guix.texi:17608 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} non-negative-integer disk-idle-secs-on-ac" #. type: deftypevr #: doc/guix.texi:17611 @@ -32410,7 +32853,7 @@ msgstr "" #: doc/guix.texi:17616 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} non-negative-integer disk-idle-secs-on-bat" #. type: deftypevr #: doc/guix.texi:17618 @@ -32420,13 +32863,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17620 msgid "Defaults to @samp{2}." -msgstr "" +msgstr "La valeur par défaut est @samp{2}." #. type: deftypevr #: doc/guix.texi:17623 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} non-negative-integer max-lost-work-secs-on-ac" #. type: deftypevr #: doc/guix.texi:17625 @@ -32437,13 +32880,13 @@ msgstr "" #: doc/guix.texi:17627 doc/guix.texi:17850 doc/guix.texi:19167 #: doc/guix.texi:19175 msgid "Defaults to @samp{15}." -msgstr "" +msgstr "La valeur par défaut est @samp{15}." #. type: deftypevr #: doc/guix.texi:17630 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} non-negative-integer max-lost-work-secs-on-bat" #. type: deftypevr #: doc/guix.texi:17632 @@ -32453,13 +32896,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17634 msgid "Defaults to @samp{60}." -msgstr "" +msgstr "La valeur par défaut est @samp{60}." #. type: deftypevr #: doc/guix.texi:17637 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-space-separated-string-list cpu-scaling-governor-on-ac" #. type: deftypevr #: doc/guix.texi:17641 @@ -32476,13 +32919,13 @@ msgstr "" #: doc/guix.texi:17843 doc/guix.texi:17998 doc/guix.texi:18018 #: doc/guix.texi:18033 doc/guix.texi:18040 msgid "Defaults to @samp{disabled}." -msgstr "" +msgstr "La valeur par défaut est @samp{disabled}." #. type: deftypevr #: doc/guix.texi:17646 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-space-separated-string-list cpu-scaling-governor-on-bat" #. type: deftypevr #: doc/guix.texi:17648 @@ -32493,7 +32936,7 @@ msgstr "" #: doc/guix.texi:17653 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-scaling-min-freq-on-ac" #. type: deftypevr #: doc/guix.texi:17655 @@ -32504,7 +32947,7 @@ msgstr "" #: doc/guix.texi:17660 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-scaling-max-freq-on-ac" #. type: deftypevr #: doc/guix.texi:17662 @@ -32515,7 +32958,7 @@ msgstr "" #: doc/guix.texi:17667 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-scaling-min-freq-on-bat" #. type: deftypevr #: doc/guix.texi:17669 @@ -32526,7 +32969,7 @@ msgstr "" #: doc/guix.texi:17674 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-scaling-max-freq-on-bat" #. type: deftypevr #: doc/guix.texi:17676 @@ -32537,7 +32980,7 @@ msgstr "" #: doc/guix.texi:17681 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-min-perf-on-ac" #. type: deftypevr #: doc/guix.texi:17684 @@ -32548,7 +32991,7 @@ msgstr "" #: doc/guix.texi:17689 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-max-perf-on-ac" #. type: deftypevr #: doc/guix.texi:17692 @@ -32559,7 +33002,7 @@ msgstr "" #: doc/guix.texi:17697 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-min-perf-on-bat" #. type: deftypevr #: doc/guix.texi:17699 @@ -32570,7 +33013,7 @@ msgstr "" #: doc/guix.texi:17704 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-max-perf-on-bat" #. type: deftypevr #: doc/guix.texi:17706 @@ -32581,7 +33024,7 @@ msgstr "" #: doc/guix.texi:17711 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-ac?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-boolean cpu-boost-on-ac?" #. type: deftypevr #: doc/guix.texi:17713 @@ -32592,7 +33035,7 @@ msgstr "" #: doc/guix.texi:17718 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-bat?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-boolean cpu-boost-on-bat?" #. type: deftypevr #: doc/guix.texi:17720 @@ -32603,7 +33046,7 @@ msgstr "" #: doc/guix.texi:17725 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-ac?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} boolean sched-powersave-on-ac?" #. type: deftypevr #: doc/guix.texi:17728 @@ -32614,7 +33057,7 @@ msgstr "" #: doc/guix.texi:17733 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-bat?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} boolean sched-powersave-on-bat?" #. type: deftypevr #: doc/guix.texi:17735 @@ -32625,7 +33068,7 @@ msgstr "" #: doc/guix.texi:17740 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean nmi-watchdog?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} boolean nmi-watchdog?" #. type: deftypevr #: doc/guix.texi:17742 @@ -32636,7 +33079,7 @@ msgstr "" #: doc/guix.texi:17747 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-string phc-controls" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-string phc-controls" #. type: deftypevr #: doc/guix.texi:17750 @@ -32647,7 +33090,7 @@ msgstr "" #: doc/guix.texi:17755 #, no-wrap msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string energy-perf-policy-on-ac" #. type: deftypevr #: doc/guix.texi:17758 @@ -32657,13 +33100,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17760 doc/guix.texi:17858 doc/guix.texi:17888 msgid "Defaults to @samp{\"performance\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"performance\"}." #. type: deftypevr #: doc/guix.texi:17763 #, no-wrap msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string energy-perf-policy-on-bat" #. type: deftypevr #: doc/guix.texi:17765 @@ -32673,13 +33116,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17767 doc/guix.texi:17865 msgid "Defaults to @samp{\"powersave\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"powersave\"}." #. type: deftypevr #: doc/guix.texi:17770 #, no-wrap msgid "{@code{tlp-configuration} parameter} space-separated-string-list disks-devices" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} space-separated-string-list disks-devices" #. type: deftypevr #: doc/guix.texi:17772 @@ -32690,7 +33133,7 @@ msgstr "" #: doc/guix.texi:17775 #, no-wrap msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} space-separated-string-list disk-apm-level-on-ac" #. type: deftypevr #: doc/guix.texi:17777 @@ -32701,7 +33144,7 @@ msgstr "" #: doc/guix.texi:17780 #, no-wrap msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} space-separated-string-list disk-apm-level-on-bat" #. type: deftypevr #: doc/guix.texi:17782 @@ -32712,7 +33155,7 @@ msgstr "" #: doc/guix.texi:17785 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-space-separated-string-list disk-spindown-timeout-on-ac" #. type: deftypevr #: doc/guix.texi:17788 @@ -32723,7 +33166,7 @@ msgstr "" #: doc/guix.texi:17793 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-space-separated-string-list disk-spindown-timeout-on-bat" #. type: deftypevr #: doc/guix.texi:17795 @@ -32734,7 +33177,7 @@ msgstr "" #: doc/guix.texi:17800 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-iosched" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-space-separated-string-list disk-iosched" #. type: deftypevr #: doc/guix.texi:17804 @@ -32745,7 +33188,7 @@ msgstr "" #: doc/guix.texi:17809 #, no-wrap msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string sata-linkpwr-on-ac" #. type: deftypevr #: doc/guix.texi:17812 @@ -32755,13 +33198,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17814 msgid "Defaults to @samp{\"max_performance\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"max_performance\"}." #. type: deftypevr #: doc/guix.texi:17817 #, no-wrap msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string sata-linkpwr-on-bat" #. type: deftypevr #: doc/guix.texi:17819 @@ -32771,13 +33214,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17821 msgid "Defaults to @samp{\"min_power\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"min_power\"}." #. type: deftypevr #: doc/guix.texi:17824 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-string sata-linkpwr-blacklist" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-string sata-linkpwr-blacklist" #. type: deftypevr #: doc/guix.texi:17826 @@ -32788,7 +33231,7 @@ msgstr "" #: doc/guix.texi:17831 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-ac?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-on-off-boolean ahci-runtime-pm-on-ac?" #. type: deftypevr #: doc/guix.texi:17834 @@ -32799,7 +33242,7 @@ msgstr "" #: doc/guix.texi:17839 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-bat?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-on-off-boolean ahci-runtime-pm-on-bat?" #. type: deftypevr #: doc/guix.texi:17841 @@ -32810,7 +33253,7 @@ msgstr "" #: doc/guix.texi:17846 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer ahci-runtime-pm-timeout" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} non-negative-integer ahci-runtime-pm-timeout" #. type: deftypevr #: doc/guix.texi:17848 @@ -32821,7 +33264,7 @@ msgstr "" #: doc/guix.texi:17853 #, no-wrap msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string pcie-aspm-on-ac" #. type: deftypevr #: doc/guix.texi:17856 @@ -32832,7 +33275,7 @@ msgstr "" #: doc/guix.texi:17861 #, no-wrap msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string pcie-aspm-on-bat" #. type: deftypevr #: doc/guix.texi:17863 @@ -32843,7 +33286,7 @@ msgstr "" #: doc/guix.texi:17868 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string radeon-power-profile-on-ac" #. type: deftypevr #: doc/guix.texi:17871 @@ -32853,13 +33296,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17873 msgid "Defaults to @samp{\"high\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"high\"}." #. type: deftypevr #: doc/guix.texi:17876 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string radeon-power-profile-on-bat" #. type: deftypevr #: doc/guix.texi:17878 @@ -32869,13 +33312,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17880 msgid "Defaults to @samp{\"low\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"low\"}." #. type: deftypevr #: doc/guix.texi:17883 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string radeon-dpm-state-on-ac" #. type: deftypevr #: doc/guix.texi:17886 @@ -32886,7 +33329,7 @@ msgstr "" #: doc/guix.texi:17891 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string radeon-dpm-state-on-bat" #. type: deftypevr #: doc/guix.texi:17893 @@ -32896,13 +33339,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17895 msgid "Defaults to @samp{\"battery\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"battery\"}." #. type: deftypevr #: doc/guix.texi:17898 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string radeon-dpm-perf-level-on-ac" #. type: deftypevr #: doc/guix.texi:17900 @@ -32912,13 +33355,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17902 doc/guix.texi:17909 doc/guix.texi:17983 msgid "Defaults to @samp{\"auto\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"auto\"}." #. type: deftypevr #: doc/guix.texi:17905 #, no-wrap msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string radeon-dpm-perf-level-on-bat" #. type: deftypevr #: doc/guix.texi:17907 @@ -32929,7 +33372,7 @@ msgstr "" #: doc/guix.texi:17912 #, no-wrap msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-ac?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} on-off-boolean wifi-pwr-on-ac?" #. type: deftypevr #: doc/guix.texi:17914 @@ -32940,7 +33383,7 @@ msgstr "" #: doc/guix.texi:17919 #, no-wrap msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-bat?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} on-off-boolean wifi-pwr-on-bat?" #. type: deftypevr #: doc/guix.texi:17921 @@ -32951,7 +33394,7 @@ msgstr "" #: doc/guix.texi:17926 #, no-wrap msgid "{@code{tlp-configuration} parameter} y-n-boolean wol-disable?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} y-n-boolean wol-disable?" #. type: deftypevr #: doc/guix.texi:17928 @@ -32962,7 +33405,7 @@ msgstr "" #: doc/guix.texi:17933 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} non-negative-integer sound-power-save-on-ac" #. type: deftypevr #: doc/guix.texi:17936 @@ -32973,7 +33416,7 @@ msgstr "" #: doc/guix.texi:17941 #, no-wrap msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} non-negative-integer sound-power-save-on-bat" #. type: deftypevr #: doc/guix.texi:17943 @@ -32983,13 +33426,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17945 doc/guix.texi:18460 doc/guix.texi:18604 msgid "Defaults to @samp{1}." -msgstr "" +msgstr "La valeur par défaut est @samp{1}." #. type: deftypevr #: doc/guix.texi:17948 #, no-wrap msgid "{@code{tlp-configuration} parameter} y-n-boolean sound-power-save-controller?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} y-n-boolean sound-power-save-controller?" #. type: deftypevr #: doc/guix.texi:17950 @@ -33000,7 +33443,7 @@ msgstr "" #: doc/guix.texi:17955 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean bay-poweroff-on-bat?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} boolean bay-poweroff-on-bat?" #. type: deftypevr #: doc/guix.texi:17959 @@ -33011,7 +33454,7 @@ msgstr "" #: doc/guix.texi:17964 #, no-wrap msgid "{@code{tlp-configuration} parameter} string bay-device" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string bay-device" #. type: deftypevr #: doc/guix.texi:17966 @@ -33021,13 +33464,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17968 msgid "Defaults to @samp{\"sr0\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"sr0\"}." #. type: deftypevr #: doc/guix.texi:17971 #, no-wrap msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-ac" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string runtime-pm-on-ac" #. type: deftypevr #: doc/guix.texi:17974 @@ -33037,13 +33480,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:17976 msgid "Defaults to @samp{\"on\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"on\"}." #. type: deftypevr #: doc/guix.texi:17979 #, no-wrap msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-bat" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} string runtime-pm-on-bat" #. type: deftypevr #: doc/guix.texi:17981 @@ -33054,7 +33497,7 @@ msgstr "" #: doc/guix.texi:17986 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean runtime-pm-all?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} boolean runtime-pm-all?" #. type: deftypevr #: doc/guix.texi:17989 @@ -33065,7 +33508,7 @@ msgstr "" #: doc/guix.texi:17994 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list runtime-pm-blacklist" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-space-separated-string-list runtime-pm-blacklist" #. type: deftypevr #: doc/guix.texi:17996 @@ -33076,7 +33519,7 @@ msgstr "" #: doc/guix.texi:18001 #, no-wrap msgid "{@code{tlp-configuration} parameter} space-separated-string-list runtime-pm-driver-blacklist" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} space-separated-string-list runtime-pm-driver-blacklist" #. type: deftypevr #: doc/guix.texi:18004 @@ -33087,7 +33530,7 @@ msgstr "" #: doc/guix.texi:18007 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean usb-autosuspend?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} boolean usb-autosuspend?" #. type: deftypevr #: doc/guix.texi:18009 @@ -33098,7 +33541,7 @@ msgstr "" #: doc/guix.texi:18014 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-string usb-blacklist" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-string usb-blacklist" #. type: deftypevr #: doc/guix.texi:18016 @@ -33109,7 +33552,7 @@ msgstr "" #: doc/guix.texi:18021 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean usb-blacklist-wwan?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} boolean usb-blacklist-wwan?" #. type: deftypevr #: doc/guix.texi:18023 @@ -33120,7 +33563,7 @@ msgstr "" #: doc/guix.texi:18028 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-string usb-whitelist" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-string usb-whitelist" #. type: deftypevr #: doc/guix.texi:18031 @@ -33131,7 +33574,7 @@ msgstr "" #: doc/guix.texi:18036 #, no-wrap msgid "{@code{tlp-configuration} parameter} maybe-boolean usb-autosuspend-disable-on-shutdown?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} maybe-boolean usb-autosuspend-disable-on-shutdown?" #. type: deftypevr #: doc/guix.texi:18038 @@ -33142,7 +33585,7 @@ msgstr "" #: doc/guix.texi:18043 #, no-wrap msgid "{@code{tlp-configuration} parameter} boolean restore-device-state-on-startup?" -msgstr "" +msgstr "{paramètre de @code{tlp-configuration}} boolean restore-device-state-on-startup?" #. type: deftypevr #: doc/guix.texi:18046 @@ -33158,7 +33601,7 @@ msgstr "" #: doc/guix.texi:18055 #, no-wrap msgid "{Scheme Variable} thermald-service-type" -msgstr "" +msgstr "{Variable Scheme} thermald-service-type" #. type: defvr #: doc/guix.texi:18060 @@ -33169,7 +33612,7 @@ msgstr "" #: doc/guix.texi:18062 #, no-wrap msgid "{Data Type} thermald-configuration" -msgstr "" +msgstr "{Type de données} thermald-configuration" #. type: deftp #: doc/guix.texi:18064 @@ -33180,7 +33623,7 @@ msgstr "" #: doc/guix.texi:18066 #, no-wrap msgid "@code{ignore-cpuid-check?} (default: @code{#f})" -msgstr "" +msgstr "@code{ignore-cpuid-check?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:18068 @@ -33191,7 +33634,7 @@ msgstr "" #: doc/guix.texi:18069 #, no-wrap msgid "@code{thermald} (default: @var{thermald})" -msgstr "" +msgstr "@code{thermald} (par défaut : @var{thermald})" #. type: table #: doc/guix.texi:18071 @@ -33239,7 +33682,7 @@ msgstr "" #: doc/guix.texi:18098 #, no-wrap msgid "{Scheme Variable} mpd-service-type" -msgstr "" +msgstr "{Variable Scheme} mpd-service-type" #. type: defvr #: doc/guix.texi:18100 @@ -33250,7 +33693,7 @@ msgstr "" #: doc/guix.texi:18102 #, no-wrap msgid "{Data Type} mpd-configuration" -msgstr "" +msgstr "{Type de données} mpd-configuration" #. type: deftp #: doc/guix.texi:18104 @@ -33261,7 +33704,7 @@ msgstr "" #: doc/guix.texi:18106 #, no-wrap msgid "@code{user} (default: @code{\"mpd\"})" -msgstr "" +msgstr "@code{user} (par défaut : @code{\"mpd\"})" #. type: table #: doc/guix.texi:18108 @@ -33272,7 +33715,7 @@ msgstr "" #: doc/guix.texi:18109 #, no-wrap msgid "@code{music-dir} (default: @code{\"~/Music\"})" -msgstr "" +msgstr "@code{music-dir} (par défaut : @code{\"~/Music\"})" #. type: table #: doc/guix.texi:18111 @@ -33283,7 +33726,7 @@ msgstr "" #: doc/guix.texi:18112 #, no-wrap msgid "@code{playlist-dir} (default: @code{\"~/.mpd/playlists\"})" -msgstr "" +msgstr "@code{playlist-dir} (par défaut : @code{\"~/.mpd/playlists\"})" #. type: table #: doc/guix.texi:18114 @@ -33294,7 +33737,7 @@ msgstr "" #: doc/guix.texi:18115 #, no-wrap msgid "@code{port} (default: @code{\"6600\"})" -msgstr "" +msgstr "@code{port} (par défaut : @code{\"6600\"})" #. type: table #: doc/guix.texi:18117 @@ -33305,7 +33748,7 @@ msgstr "" #: doc/guix.texi:18118 #, no-wrap msgid "@code{address} (default: @code{\"any\"})" -msgstr "" +msgstr "@code{address} (par défaut : @code{\"any\"})" #. type: table #: doc/guix.texi:18121 @@ -33338,7 +33781,7 @@ msgstr "" #: doc/guix.texi:18137 #, no-wrap msgid "{Scheme Variable} libvirt-service-type" -msgstr "" +msgstr "{Variable Scheme} libvirt-service-type" #. type: deffn #: doc/guix.texi:18140 @@ -33358,13 +33801,13 @@ msgstr "" #. type: Plain text #: doc/guix.texi:18151 msgid "Available @code{libvirt-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{libvirt-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:18152 #, no-wrap msgid "{@code{libvirt-configuration} parameter} package libvirt" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} package libvirt" #. type: deftypevr #: doc/guix.texi:18154 @@ -33375,7 +33818,7 @@ msgstr "" #: doc/guix.texi:18157 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean listen-tls?" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} boolean listen-tls?" #. type: deftypevr #: doc/guix.texi:18160 @@ -33391,7 +33834,7 @@ msgstr "" #: doc/guix.texi:18168 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean listen-tcp?" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} boolean listen-tcp?" #. type: deftypevr #: doc/guix.texi:18171 @@ -33407,7 +33850,7 @@ msgstr "" #: doc/guix.texi:18180 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string tls-port" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string tls-port" #. type: deftypevr #: doc/guix.texi:18183 @@ -33417,13 +33860,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18185 msgid "Defaults to @samp{\"16514\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"16514\"}." #. type: deftypevr #: doc/guix.texi:18188 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string tcp-port" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string tcp-port" #. type: deftypevr #: doc/guix.texi:18191 @@ -33433,13 +33876,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18193 msgid "Defaults to @samp{\"16509\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"16509\"}." #. type: deftypevr #: doc/guix.texi:18196 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string listen-addr" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string listen-addr" #. type: deftypevr #: doc/guix.texi:18198 @@ -33449,13 +33892,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18200 msgid "Defaults to @samp{\"0.0.0.0\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"0.0.0.0\"}." #. type: deftypevr #: doc/guix.texi:18203 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean mdns-adv?" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} boolean mdns-adv?" #. type: deftypevr #: doc/guix.texi:18205 @@ -33471,7 +33914,7 @@ msgstr "" #: doc/guix.texi:18213 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string mdns-name" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string mdns-name" #. type: deftypevr #: doc/guix.texi:18216 @@ -33481,13 +33924,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18218 msgid "Defaults to @samp{\"Virtualization Host \"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"Virtualization Host \"}." #. type: deftypevr #: doc/guix.texi:18221 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-group" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string unix-sock-group" #. type: deftypevr #: doc/guix.texi:18225 @@ -33497,13 +33940,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18227 msgid "Defaults to @samp{\"root\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"root\"}." #. type: deftypevr #: doc/guix.texi:18230 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-ro-perms" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string unix-sock-ro-perms" #. type: deftypevr #: doc/guix.texi:18233 @@ -33513,13 +33956,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18235 doc/guix.texi:18253 msgid "Defaults to @samp{\"0777\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"0777\"}." #. type: deftypevr #: doc/guix.texi:18238 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-rw-perms" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string unix-sock-rw-perms" #. type: deftypevr #: doc/guix.texi:18242 @@ -33529,13 +33972,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18244 msgid "Defaults to @samp{\"0770\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"0770\"}." #. type: deftypevr #: doc/guix.texi:18247 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-admin-perms" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string unix-sock-admin-perms" #. type: deftypevr #: doc/guix.texi:18251 @@ -33546,7 +33989,7 @@ msgstr "" #: doc/guix.texi:18256 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string unix-sock-dir" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string unix-sock-dir" #. type: deftypevr #: doc/guix.texi:18258 @@ -33556,13 +33999,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18260 msgid "Defaults to @samp{\"/var/run/libvirt\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/var/run/libvirt\"}." #. type: deftypevr #: doc/guix.texi:18263 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string auth-unix-ro" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string auth-unix-ro" #. type: deftypevr #: doc/guix.texi:18266 @@ -33572,13 +34015,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18268 doc/guix.texi:18277 msgid "Defaults to @samp{\"polkit\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"polkit\"}." #. type: deftypevr #: doc/guix.texi:18271 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string auth-unix-rw" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string auth-unix-rw" #. type: deftypevr #: doc/guix.texi:18275 @@ -33589,7 +34032,7 @@ msgstr "" #: doc/guix.texi:18280 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string auth-tcp" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string auth-tcp" #. type: deftypevr #: doc/guix.texi:18284 @@ -33599,13 +34042,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18286 msgid "Defaults to @samp{\"sasl\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"sasl\"}." #. type: deftypevr #: doc/guix.texi:18289 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string auth-tls" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string auth-tls" #. type: deftypevr #: doc/guix.texi:18293 @@ -33620,13 +34063,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18298 msgid "Defaults to @samp{\"none\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"none\"}." #. type: deftypevr #: doc/guix.texi:18301 #, no-wrap msgid "{@code{libvirt-configuration} parameter} optional-list access-drivers" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} optional-list access-drivers" #. type: deftypevr #: doc/guix.texi:18303 @@ -33642,7 +34085,7 @@ msgstr "" #: doc/guix.texi:18311 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string key-file" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string key-file" #. type: deftypevr #: doc/guix.texi:18314 @@ -33653,7 +34096,7 @@ msgstr "" #: doc/guix.texi:18319 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string cert-file" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string cert-file" #. type: deftypevr #: doc/guix.texi:18322 @@ -33664,7 +34107,7 @@ msgstr "" #: doc/guix.texi:18327 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string ca-file" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string ca-file" #. type: deftypevr #: doc/guix.texi:18330 @@ -33675,7 +34118,7 @@ msgstr "" #: doc/guix.texi:18335 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string crl-file" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string crl-file" #. type: deftypevr #: doc/guix.texi:18338 @@ -33686,7 +34129,7 @@ msgstr "" #: doc/guix.texi:18343 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean tls-no-sanity-cert" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} boolean tls-no-sanity-cert" #. type: deftypevr #: doc/guix.texi:18345 @@ -33702,7 +34145,7 @@ msgstr "" #: doc/guix.texi:18353 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean tls-no-verify-cert" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} boolean tls-no-verify-cert" #. type: deftypevr #: doc/guix.texi:18355 @@ -33718,7 +34161,7 @@ msgstr "" #: doc/guix.texi:18364 #, no-wrap msgid "{@code{libvirt-configuration} parameter} optional-list tls-allowed-dn-list" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} optional-list tls-allowed-dn-list" #. type: deftypevr #: doc/guix.texi:18366 @@ -33729,7 +34172,7 @@ msgstr "" #: doc/guix.texi:18371 #, no-wrap msgid "{@code{libvirt-configuration} parameter} optional-list sasl-allowed-usernames" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} optional-list sasl-allowed-usernames" #. type: deftypevr #: doc/guix.texi:18374 @@ -33740,7 +34183,7 @@ msgstr "" #: doc/guix.texi:18379 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string tls-priority" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string tls-priority" #. type: deftypevr #: doc/guix.texi:18383 @@ -33750,13 +34193,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18385 msgid "Defaults to @samp{\"NORMAL\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"NORMAL\"}." #. type: deftypevr #: doc/guix.texi:18388 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-clients" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer max-clients" #. type: deftypevr #: doc/guix.texi:18391 doc/guix.texi:18814 @@ -33766,13 +34209,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18393 msgid "Defaults to @samp{5000}." -msgstr "" +msgstr "La valeur par défaut est @samp{5000}." #. type: deftypevr #: doc/guix.texi:18396 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-queued-clients" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer max-queued-clients" #. type: deftypevr #: doc/guix.texi:18400 @@ -33783,7 +34226,7 @@ msgstr "" #: doc/guix.texi:18405 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-anonymous-clients" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer max-anonymous-clients" #. type: deftypevr #: doc/guix.texi:18408 @@ -33793,13 +34236,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18410 doc/guix.texi:18428 doc/guix.texi:18444 msgid "Defaults to @samp{20}." -msgstr "" +msgstr "La valeur par défaut est @samp{20}." #. type: deftypevr #: doc/guix.texi:18413 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer min-workers" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer min-workers" #. type: deftypevr #: doc/guix.texi:18415 @@ -33810,7 +34253,7 @@ msgstr "" #: doc/guix.texi:18420 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-workers" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer max-workers" #. type: deftypevr #: doc/guix.texi:18422 @@ -33826,7 +34269,7 @@ msgstr "" #: doc/guix.texi:18431 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer prio-workers" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer prio-workers" #. type: deftypevr #: doc/guix.texi:18435 @@ -33837,7 +34280,7 @@ msgstr "" #: doc/guix.texi:18440 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-requests" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer max-requests" #. type: deftypevr #: doc/guix.texi:18442 @@ -33848,7 +34291,7 @@ msgstr "" #: doc/guix.texi:18447 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer max-client-requests" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer max-client-requests" #. type: deftypevr #: doc/guix.texi:18451 @@ -33859,7 +34302,7 @@ msgstr "" #: doc/guix.texi:18456 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-min-workers" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer admin-min-workers" #. type: deftypevr #: doc/guix.texi:18458 @@ -33870,7 +34313,7 @@ msgstr "" #: doc/guix.texi:18463 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-max-workers" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer admin-max-workers" #. type: deftypevr #: doc/guix.texi:18465 @@ -33881,7 +34324,7 @@ msgstr "" #: doc/guix.texi:18470 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-max-clients" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer admin-max-clients" #. type: deftypevr #: doc/guix.texi:18472 @@ -33892,7 +34335,7 @@ msgstr "" #: doc/guix.texi:18477 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-max-queued-clients" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer admin-max-queued-clients" #. type: deftypevr #: doc/guix.texi:18479 @@ -33903,7 +34346,7 @@ msgstr "" #: doc/guix.texi:18484 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-max-client-requests" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer admin-max-client-requests" #. type: deftypevr #: doc/guix.texi:18486 @@ -33914,7 +34357,7 @@ msgstr "" #: doc/guix.texi:18491 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer log-level" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer log-level" #. type: deftypevr #: doc/guix.texi:18493 doc/guix.texi:18716 @@ -33925,7 +34368,7 @@ msgstr "" #: doc/guix.texi:18498 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string log-filters" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string log-filters" #. type: deftypevr #: doc/guix.texi:18500 doc/guix.texi:18723 @@ -33984,13 +34427,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18540 doc/guix.texi:18763 msgid "Defaults to @samp{\"3:remote 4:event\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"3:remote 4:event\"}." #. type: deftypevr #: doc/guix.texi:18543 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string log-outputs" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string log-outputs" #. type: deftypevr #: doc/guix.texi:18545 doc/guix.texi:18768 @@ -34059,13 +34502,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18585 doc/guix.texi:18808 msgid "Defaults to @samp{\"3:stderr\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"3:stderr\"}." #. type: deftypevr #: doc/guix.texi:18588 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer audit-level" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer audit-level" #. type: deftypevr #: doc/guix.texi:18590 @@ -34091,7 +34534,7 @@ msgstr "" #: doc/guix.texi:18607 #, no-wrap msgid "{@code{libvirt-configuration} parameter} boolean audit-logging" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} boolean audit-logging" #. type: deftypevr #: doc/guix.texi:18609 @@ -34102,7 +34545,7 @@ msgstr "" #: doc/guix.texi:18614 #, no-wrap msgid "{@code{libvirt-configuration} parameter} optional-string host-uuid" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} optional-string host-uuid" #. type: deftypevr #: doc/guix.texi:18616 @@ -34113,7 +34556,7 @@ msgstr "" #: doc/guix.texi:18621 #, no-wrap msgid "{@code{libvirt-configuration} parameter} string host-uuid-source" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} string host-uuid-source" #. type: deftypevr #: doc/guix.texi:18623 @@ -34138,13 +34581,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:18637 msgid "Defaults to @samp{\"smbios\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"smbios\"}." #. type: deftypevr #: doc/guix.texi:18640 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer keepalive-interval" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer keepalive-interval" #. type: deftypevr #: doc/guix.texi:18645 @@ -34155,7 +34598,7 @@ msgstr "" #: doc/guix.texi:18650 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer keepalive-count" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer keepalive-count" #. type: deftypevr #: doc/guix.texi:18654 @@ -34171,7 +34614,7 @@ msgstr "" #: doc/guix.texi:18666 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-interval" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer admin-keepalive-interval" #. type: deftypevr #: doc/guix.texi:18668 doc/guix.texi:18675 @@ -34182,13 +34625,13 @@ msgstr "" #: doc/guix.texi:18673 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-count" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer admin-keepalive-count" #. type: deftypevr #: doc/guix.texi:18680 #, no-wrap msgid "{@code{libvirt-configuration} parameter} integer ovs-timeout" -msgstr "" +msgstr "{paramètre de @code{libvirt-configuration}} integer ovs-timeout" #. type: deftypevr #: doc/guix.texi:18682 @@ -34220,7 +34663,7 @@ msgstr "" #: doc/guix.texi:18703 #, no-wrap msgid "{Scheme Variable} virtlog-service-type" -msgstr "" +msgstr "{Variable Scheme} virtlog-service-type" #. type: deffn #: doc/guix.texi:18706 @@ -34240,36 +34683,36 @@ msgstr "" #: doc/guix.texi:18714 #, no-wrap msgid "{@code{virtlog-configuration} parameter} integer log-level" -msgstr "" +msgstr "{paramètre de @code{virtlog-configuration}} integer log-level" #. type: deftypevr #: doc/guix.texi:18721 #, no-wrap msgid "{@code{virtlog-configuration} parameter} string log-filters" -msgstr "" +msgstr "{paramètre de @code{virtlog-configuration}} string log-filters" #. type: deftypevr #: doc/guix.texi:18766 #, no-wrap msgid "{@code{virtlog-configuration} parameter} string log-outputs" -msgstr "" +msgstr "{paramètre de @code{virtlog-configuration}} string log-outputs" #. type: deftypevr #: doc/guix.texi:18811 #, no-wrap msgid "{@code{virtlog-configuration} parameter} integer max-clients" -msgstr "" +msgstr "{paramètre de @code{virtlog-configuration}} integer max-clients" #. type: deftypevr #: doc/guix.texi:18816 msgid "Defaults to @samp{1024}." -msgstr "" +msgstr "La valeur par défaut est @samp{1024}." #. type: deftypevr #: doc/guix.texi:18819 #, no-wrap msgid "{@code{virtlog-configuration} parameter} integer max-size" -msgstr "" +msgstr "{paramètre de @code{virtlog-configuration}} integer max-size" #. type: deftypevr #: doc/guix.texi:18821 @@ -34285,7 +34728,7 @@ msgstr "" #: doc/guix.texi:18826 #, no-wrap msgid "{@code{virtlog-configuration} parameter} integer max-backups" -msgstr "" +msgstr "{paramètre de @code{virtlog-configuration}} integer max-backups" #. type: deftypevr #: doc/guix.texi:18828 @@ -34324,7 +34767,7 @@ msgstr "" #: doc/guix.texi:18843 #, no-wrap msgid "{Scheme Variable} qemu-binfmt-service-type" -msgstr "" +msgstr "{Variable Scheme} qemu-binfmt-service-type" #. type: defvr #: doc/guix.texi:18848 @@ -34349,7 +34792,7 @@ msgstr "" #: doc/guix.texi:18861 #, no-wrap msgid "{Data Type} qemu-binfmt-configuration" -msgstr "" +msgstr "{Type de données} qemu-binfmt-configuration" #. type: deftp #: doc/guix.texi:18863 @@ -34360,7 +34803,7 @@ msgstr "" #: doc/guix.texi:18865 #, no-wrap msgid "@code{platforms} (default: @code{'()})" -msgstr "" +msgstr "@code{platforms} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:18868 @@ -34371,7 +34814,7 @@ msgstr "" #: doc/guix.texi:18869 #, no-wrap msgid "@code{guix-support?} (default: @code{#f})" -msgstr "" +msgstr "@code{guix-support?} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:18875 @@ -34413,18 +34856,18 @@ msgstr "" #: doc/guix.texi:18898 #, no-wrap msgid "@code{qemu} (default: @code{qemu})" -msgstr "" +msgstr "@code{qemu} (par défaut : @code{qemu})" #. type: table #: doc/guix.texi:18900 msgid "The QEMU package to use." -msgstr "" +msgstr "Le paquet QEMU à utiliser." #. type: deffn #: doc/guix.texi:18903 #, no-wrap msgid "{Scheme Procedure} lookup-qemu-platforms @var{platforms}@dots{}" -msgstr "" +msgstr "{Procédure Scheme} lookup-qemu-platforms @var{platforms}@dots{}" #. type: deffn #: doc/guix.texi:18908 @@ -34435,7 +34878,7 @@ msgstr "" #: doc/guix.texi:18910 #, no-wrap msgid "{Scheme Procedure} qemu-platform? @var{obj}" -msgstr "" +msgstr "{Procédure Scheme} qemu-platform? @var{obj}" #. type: deffn #: doc/guix.texi:18912 @@ -34446,7 +34889,7 @@ msgstr "" #: doc/guix.texi:18914 #, no-wrap msgid "{Scheme Procedure} qemu-platform-name @var{platform}" -msgstr "" +msgstr "{Procédure Scheme} qemu-platform-name @var{platform}" #. type: deffn #: doc/guix.texi:18916 @@ -34462,7 +34905,7 @@ msgstr "" #: doc/guix.texi:18929 #, no-wrap msgid "{Scheme Procedure} git-daemon-service [#:config (git-daemon-configuration)]" -msgstr "" +msgstr "{Procédure Scheme} git-daemon-service [#:config (git-daemon-configuration)]" #. type: deffn #: doc/guix.texi:18933 @@ -34478,7 +34921,7 @@ msgstr "" #: doc/guix.texi:18942 #, no-wrap msgid "{Data Type} git-daemon-configuration" -msgstr "" +msgstr "{Type de données} git-daemon-configuration" #. type: deftp #: doc/guix.texi:18944 @@ -34489,7 +34932,7 @@ msgstr "" #: doc/guix.texi:18946 doc/guix.texi:19002 #, no-wrap msgid "@code{package} (default: @var{git})" -msgstr "" +msgstr "@code{package} (par défaut : @var{git})" #. type: table #: doc/guix.texi:18948 doc/guix.texi:19004 @@ -34500,7 +34943,7 @@ msgstr "" #: doc/guix.texi:18949 doc/guix.texi:19008 #, no-wrap msgid "@code{export-all?} (default: @var{#f})" -msgstr "" +msgstr "@code{export-all?} (par défaut : @var{#f})" #. type: table #: doc/guix.texi:18952 @@ -34522,7 +34965,7 @@ msgstr "" #: doc/guix.texi:18959 #, no-wrap msgid "@code{user-path} (default: @var{#f})" -msgstr "" +msgstr "@code{user-path} (par défaut : @var{#f})" #. type: table #: doc/guix.texi:18966 @@ -34533,7 +34976,7 @@ msgstr "" #: doc/guix.texi:18967 #, no-wrap msgid "@code{listen} (default: @var{'()})" -msgstr "" +msgstr "@code{listen} (par défaut : @var{'()})" #. type: table #: doc/guix.texi:18970 @@ -34544,7 +34987,7 @@ msgstr "" #: doc/guix.texi:18971 #, no-wrap msgid "@code{port} (default: @var{#f})" -msgstr "" +msgstr "@code{port} (par défaut : @var{#f})" #. type: table #: doc/guix.texi:18973 @@ -34555,7 +34998,7 @@ msgstr "" #: doc/guix.texi:18974 #, no-wrap msgid "@code{whitelist} (default: @var{'()})" -msgstr "" +msgstr "@code{whitelist} (par défaut : @var{'()})" #. type: table #: doc/guix.texi:18976 @@ -34566,7 +35009,7 @@ msgstr "" #: doc/guix.texi:18977 #, no-wrap msgid "@code{extra-options} (default: @var{'()})" -msgstr "" +msgstr "@code{extra-options} (par défaut : @var{'()})" #. type: table #: doc/guix.texi:18980 @@ -34587,7 +35030,7 @@ msgstr "" #: doc/guix.texi:18998 #, no-wrap msgid "{Data Type} git-http-configuration" -msgstr "" +msgstr "{Type de données} git-http-configuration" #. type: deftp #: doc/guix.texi:19000 @@ -34625,7 +35068,7 @@ msgstr "" #: doc/guix.texi:19018 #, no-wrap msgid "@code{fcgiwrap-socket} (default: @code{127.0.0.1:9000})" -msgstr "" +msgstr "@code{fcgiwrap-socket} (par défaut : @code{127.0.0.1:9000})" #. type: table #: doc/guix.texi:19021 @@ -34641,7 +35084,7 @@ msgstr "" #: doc/guix.texi:19029 #, no-wrap msgid "{Scheme Procedure} git-http-nginx-location-configuration @" -msgstr "" +msgstr "{Procédure Scheme} git-http-nginx-location-configuration @" #. type: deffn #: doc/guix.texi:19034 @@ -34716,13 +35159,13 @@ msgstr "" #. type: Plain text #: doc/guix.texi:19080 msgid "Available @code{cgit-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{cgit-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:19081 #, no-wrap msgid "{@code{cgit-configuration} parameter} package package" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} package package" #. type: deftypevr #: doc/guix.texi:19083 @@ -34733,7 +35176,7 @@ msgstr "" #: doc/guix.texi:19086 #, no-wrap msgid "{@code{cgit-configuration} parameter} nginx-server-configuration-list nginx" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} nginx-server-configuration-list nginx" #. type: deftypevr #: doc/guix.texi:19088 @@ -34744,7 +35187,7 @@ msgstr "" #: doc/guix.texi:19091 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object about-filter" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} file-object about-filter" #. type: deftypevr #: doc/guix.texi:19094 @@ -34755,7 +35198,7 @@ msgstr "" #: doc/guix.texi:19099 #, no-wrap msgid "{@code{cgit-configuration} parameter} string agefile" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string agefile" #. type: deftypevr #: doc/guix.texi:19102 @@ -34766,7 +35209,7 @@ msgstr "" #: doc/guix.texi:19107 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object auth-filter" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} file-object auth-filter" #. type: deftypevr #: doc/guix.texi:19110 @@ -34777,7 +35220,7 @@ msgstr "" #: doc/guix.texi:19115 #, no-wrap msgid "{@code{cgit-configuration} parameter} string branch-sort" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string branch-sort" #. type: deftypevr #: doc/guix.texi:19118 @@ -34787,13 +35230,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19120 msgid "Defaults to @samp{\"name\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"name\"}." #. type: deftypevr #: doc/guix.texi:19123 #, no-wrap msgid "{@code{cgit-configuration} parameter} string cache-root" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string cache-root" #. type: deftypevr #: doc/guix.texi:19125 @@ -34803,13 +35246,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19127 msgid "Defaults to @samp{\"/var/cache/cgit\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/var/cache/cgit\"}." #. type: deftypevr #: doc/guix.texi:19130 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-static-ttl" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer cache-static-ttl" #. type: deftypevr #: doc/guix.texi:19133 @@ -34819,13 +35262,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19135 doc/guix.texi:19578 msgid "Defaults to @samp{-1}." -msgstr "" +msgstr "La valeur par défaut est @samp{-1}." #. type: deftypevr #: doc/guix.texi:19138 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-dynamic-ttl" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer cache-dynamic-ttl" #. type: deftypevr #: doc/guix.texi:19141 @@ -34836,7 +35279,7 @@ msgstr "" #: doc/guix.texi:19146 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-repo-ttl" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer cache-repo-ttl" #. type: deftypevr #: doc/guix.texi:19149 @@ -34847,7 +35290,7 @@ msgstr "" #: doc/guix.texi:19154 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-root-ttl" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer cache-root-ttl" #. type: deftypevr #: doc/guix.texi:19157 @@ -34858,7 +35301,7 @@ msgstr "" #: doc/guix.texi:19162 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-scanrc-ttl" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer cache-scanrc-ttl" #. type: deftypevr #: doc/guix.texi:19165 @@ -34869,7 +35312,7 @@ msgstr "" #: doc/guix.texi:19170 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-about-ttl" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer cache-about-ttl" #. type: deftypevr #: doc/guix.texi:19173 @@ -34880,7 +35323,7 @@ msgstr "" #: doc/guix.texi:19178 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-snapshot-ttl" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer cache-snapshot-ttl" #. type: deftypevr #: doc/guix.texi:19181 @@ -34891,7 +35334,7 @@ msgstr "" #: doc/guix.texi:19186 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer cache-size" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer cache-size" #. type: deftypevr #: doc/guix.texi:19189 @@ -34902,7 +35345,7 @@ msgstr "" #: doc/guix.texi:19194 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean case-sensitive-sort?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean case-sensitive-sort?" #. type: deftypevr #: doc/guix.texi:19196 @@ -34913,7 +35356,7 @@ msgstr "" #: doc/guix.texi:19201 #, no-wrap msgid "{@code{cgit-configuration} parameter} list clone-prefix" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} list clone-prefix" #. type: deftypevr #: doc/guix.texi:19204 @@ -34924,7 +35367,7 @@ msgstr "" #: doc/guix.texi:19209 #, no-wrap msgid "{@code{cgit-configuration} parameter} list clone-url" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} list clone-url" #. type: deftypevr #: doc/guix.texi:19211 @@ -34935,7 +35378,7 @@ msgstr "" #: doc/guix.texi:19216 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object commit-filter" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} file-object commit-filter" #. type: deftypevr #: doc/guix.texi:19218 @@ -34946,7 +35389,7 @@ msgstr "" #: doc/guix.texi:19223 #, no-wrap msgid "{@code{cgit-configuration} parameter} string commit-sort" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string commit-sort" #. type: deftypevr #: doc/guix.texi:19227 doc/guix.texi:19785 @@ -34956,13 +35399,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19229 msgid "Defaults to @samp{\"git log\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"git log\"}." #. type: deftypevr #: doc/guix.texi:19232 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object css" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} file-object css" #. type: deftypevr #: doc/guix.texi:19234 @@ -34972,13 +35415,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19236 msgid "Defaults to @samp{\"/share/cgit/cgit.css\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/share/cgit/cgit.css\"}." #. type: deftypevr #: doc/guix.texi:19239 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object email-filter" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} file-object email-filter" #. type: deftypevr #: doc/guix.texi:19243 @@ -34989,7 +35432,7 @@ msgstr "" #: doc/guix.texi:19248 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean embedded?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean embedded?" #. type: deftypevr #: doc/guix.texi:19251 @@ -35000,7 +35443,7 @@ msgstr "" #: doc/guix.texi:19256 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-commit-graph?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean enable-commit-graph?" #. type: deftypevr #: doc/guix.texi:19260 @@ -35011,7 +35454,7 @@ msgstr "" #: doc/guix.texi:19265 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-filter-overrides?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean enable-filter-overrides?" #. type: deftypevr #: doc/guix.texi:19268 @@ -35022,7 +35465,7 @@ msgstr "" #: doc/guix.texi:19273 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-follow-links?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean enable-follow-links?" #. type: deftypevr #: doc/guix.texi:19276 @@ -35033,7 +35476,7 @@ msgstr "" #: doc/guix.texi:19281 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-http-clone?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean enable-http-clone?" #. type: deftypevr #: doc/guix.texi:19284 @@ -35044,7 +35487,7 @@ msgstr "" #: doc/guix.texi:19289 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-index-links?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean enable-index-links?" #. type: deftypevr #: doc/guix.texi:19292 @@ -35055,7 +35498,7 @@ msgstr "" #: doc/guix.texi:19297 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-index-owner?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean enable-index-owner?" #. type: deftypevr #: doc/guix.texi:19300 @@ -35066,7 +35509,7 @@ msgstr "" #: doc/guix.texi:19305 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-log-filecount?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean enable-log-filecount?" #. type: deftypevr #: doc/guix.texi:19308 @@ -35077,7 +35520,7 @@ msgstr "" #: doc/guix.texi:19313 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-log-linecount?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean enable-log-linecount?" #. type: deftypevr #: doc/guix.texi:19316 @@ -35088,7 +35531,7 @@ msgstr "" #: doc/guix.texi:19321 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-remote-branches?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean enable-remote-branches?" #. type: deftypevr #: doc/guix.texi:19324 doc/guix.texi:19848 @@ -35099,7 +35542,7 @@ msgstr "" #: doc/guix.texi:19329 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-subject-links?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean enable-subject-links?" #. type: deftypevr #: doc/guix.texi:19333 @@ -35110,7 +35553,7 @@ msgstr "" #: doc/guix.texi:19338 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-html-serving?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean enable-html-serving?" #. type: deftypevr #: doc/guix.texi:19342 @@ -35121,7 +35564,7 @@ msgstr "" #: doc/guix.texi:19347 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-tree-linenumbers?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean enable-tree-linenumbers?" #. type: deftypevr #: doc/guix.texi:19350 @@ -35132,7 +35575,7 @@ msgstr "" #: doc/guix.texi:19355 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean enable-git-config?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean enable-git-config?" #. type: deftypevr #: doc/guix.texi:19358 @@ -35143,7 +35586,7 @@ msgstr "" #: doc/guix.texi:19363 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object favicon" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} file-object favicon" #. type: deftypevr #: doc/guix.texi:19365 @@ -35153,13 +35596,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19367 msgid "Defaults to @samp{\"/favicon.ico\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/favicon.ico\"}." #. type: deftypevr #: doc/guix.texi:19370 #, no-wrap msgid "{@code{cgit-configuration} parameter} string footer" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string footer" #. type: deftypevr #: doc/guix.texi:19374 @@ -35170,7 +35613,7 @@ msgstr "" #: doc/guix.texi:19379 #, no-wrap msgid "{@code{cgit-configuration} parameter} string head-include" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string head-include" #. type: deftypevr #: doc/guix.texi:19382 @@ -35181,7 +35624,7 @@ msgstr "" #: doc/guix.texi:19387 #, no-wrap msgid "{@code{cgit-configuration} parameter} string header" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string header" #. type: deftypevr #: doc/guix.texi:19390 @@ -35192,7 +35635,7 @@ msgstr "" #: doc/guix.texi:19395 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object include" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} file-object include" #. type: deftypevr #: doc/guix.texi:19398 @@ -35203,7 +35646,7 @@ msgstr "" #: doc/guix.texi:19403 #, no-wrap msgid "{@code{cgit-configuration} parameter} string index-header" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string index-header" #. type: deftypevr #: doc/guix.texi:19406 @@ -35214,7 +35657,7 @@ msgstr "" #: doc/guix.texi:19411 #, no-wrap msgid "{@code{cgit-configuration} parameter} string index-info" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string index-info" #. type: deftypevr #: doc/guix.texi:19414 @@ -35225,7 +35668,7 @@ msgstr "" #: doc/guix.texi:19419 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean local-time?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean local-time?" #. type: deftypevr #: doc/guix.texi:19422 @@ -35236,7 +35679,7 @@ msgstr "" #: doc/guix.texi:19427 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object logo" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} file-object logo" #. type: deftypevr #: doc/guix.texi:19430 @@ -35246,13 +35689,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19432 msgid "Defaults to @samp{\"/share/cgit/cgit.png\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/share/cgit/cgit.png\"}." #. type: deftypevr #: doc/guix.texi:19435 #, no-wrap msgid "{@code{cgit-configuration} parameter} string logo-link" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string logo-link" #. type: deftypevr #: doc/guix.texi:19437 doc/guix.texi:19894 @@ -35263,7 +35706,7 @@ msgstr "" #: doc/guix.texi:19442 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object owner-filter" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} file-object owner-filter" #. type: deftypevr #: doc/guix.texi:19445 @@ -35274,7 +35717,7 @@ msgstr "" #: doc/guix.texi:19450 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-atom-items" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer max-atom-items" #. type: deftypevr #: doc/guix.texi:19452 @@ -35285,13 +35728,13 @@ msgstr "" #: doc/guix.texi:19454 doc/guix.texi:19689 doc/guix.texi:19697 #: doc/guix.texi:19705 msgid "Defaults to @samp{10}." -msgstr "" +msgstr "La valeur par défaut est @samp{10}." #. type: deftypevr #: doc/guix.texi:19457 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-commit-count" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer max-commit-count" #. type: deftypevr #: doc/guix.texi:19459 @@ -35301,13 +35744,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19461 doc/guix.texi:19476 msgid "Defaults to @samp{50}." -msgstr "" +msgstr "La valeur par défaut est @samp{50}." #. type: deftypevr #: doc/guix.texi:19464 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-message-length" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer max-message-length" #. type: deftypevr #: doc/guix.texi:19466 @@ -35317,13 +35760,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19468 doc/guix.texi:19484 msgid "Defaults to @samp{80}." -msgstr "" +msgstr "La valeur par défaut est @samp{80}." #. type: deftypevr #: doc/guix.texi:19471 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-repo-count" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer max-repo-count" #. type: deftypevr #: doc/guix.texi:19474 @@ -35334,7 +35777,7 @@ msgstr "" #: doc/guix.texi:19479 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-repodesc-length" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer max-repodesc-length" #. type: deftypevr #: doc/guix.texi:19482 @@ -35345,7 +35788,7 @@ msgstr "" #: doc/guix.texi:19487 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer max-blob-size" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer max-blob-size" #. type: deftypevr #: doc/guix.texi:19489 @@ -35356,7 +35799,7 @@ msgstr "" #: doc/guix.texi:19494 #, no-wrap msgid "{@code{cgit-configuration} parameter} string max-stats" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string max-stats" #. type: deftypevr #: doc/guix.texi:19497 @@ -35367,7 +35810,7 @@ msgstr "" #: doc/guix.texi:19502 #, no-wrap msgid "{@code{cgit-configuration} parameter} mimetype-alist mimetype" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} mimetype-alist mimetype" #. type: deftypevr #: doc/guix.texi:19504 @@ -35377,13 +35820,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19508 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 "" +msgstr "La valeur par défaut est @samp{((gif \"image/gif\") (html \"text/html\") (jpg \"image/jpeg\") (jpeg \"image/jpeg\") (pdf \"application/pdf\") (png \"image/png\") (svg \"image/svg+xml\"))}." #. type: deftypevr #: doc/guix.texi:19511 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object mimetype-file" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} file-object mimetype-file" #. type: deftypevr #: doc/guix.texi:19513 @@ -35394,7 +35837,7 @@ msgstr "" #: doc/guix.texi:19518 #, no-wrap msgid "{@code{cgit-configuration} parameter} string module-link" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string module-link" #. type: deftypevr #: doc/guix.texi:19521 @@ -35405,7 +35848,7 @@ msgstr "" #: doc/guix.texi:19526 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean nocache?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean nocache?" #. type: deftypevr #: doc/guix.texi:19528 @@ -35416,7 +35859,7 @@ msgstr "" #: doc/guix.texi:19533 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean noplainemail?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean noplainemail?" #. type: deftypevr #: doc/guix.texi:19536 @@ -35427,7 +35870,7 @@ msgstr "" #: doc/guix.texi:19541 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean noheader?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean noheader?" #. type: deftypevr #: doc/guix.texi:19544 @@ -35438,7 +35881,7 @@ msgstr "" #: doc/guix.texi:19549 #, no-wrap msgid "{@code{cgit-configuration} parameter} project-list project-list" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} project-list project-list" #. type: deftypevr #: doc/guix.texi:19553 @@ -35449,7 +35892,7 @@ msgstr "" #: doc/guix.texi:19558 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object readme" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} file-object readme" #. type: deftypevr #: doc/guix.texi:19560 @@ -35460,7 +35903,7 @@ msgstr "" #: doc/guix.texi:19565 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean remove-suffix?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean remove-suffix?" #. type: deftypevr #: doc/guix.texi:19569 @@ -35471,7 +35914,7 @@ msgstr "" #: doc/guix.texi:19574 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer renamelimit" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer renamelimit" #. type: deftypevr #: doc/guix.texi:19576 @@ -35482,7 +35925,7 @@ msgstr "" #: doc/guix.texi:19581 #, no-wrap msgid "{@code{cgit-configuration} parameter} string repository-sort" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string repository-sort" #. type: deftypevr #: doc/guix.texi:19583 @@ -35493,7 +35936,7 @@ msgstr "" #: doc/guix.texi:19588 #, no-wrap msgid "{@code{cgit-configuration} parameter} robots-list robots" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} robots-list robots" #. type: deftypevr #: doc/guix.texi:19590 @@ -35503,13 +35946,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19592 msgid "Defaults to @samp{(\"noindex\" \"nofollow\")}." -msgstr "" +msgstr "La valeur par défaut est @samp{(\"noindex\" \"nofollow\")}." #. type: deftypevr #: doc/guix.texi:19595 #, no-wrap msgid "{@code{cgit-configuration} parameter} string root-desc" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string root-desc" #. type: deftypevr #: doc/guix.texi:19597 @@ -35519,13 +35962,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19599 msgid "Defaults to @samp{\"a fast webinterface for the git dscm\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"a fast webinterface for the git dscm\"}." #. type: deftypevr #: doc/guix.texi:19602 #, no-wrap msgid "{@code{cgit-configuration} parameter} string root-readme" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string root-readme" #. type: deftypevr #: doc/guix.texi:19605 @@ -35536,7 +35979,7 @@ msgstr "" #: doc/guix.texi:19610 #, no-wrap msgid "{@code{cgit-configuration} parameter} string root-title" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string root-title" #. type: deftypevr #: doc/guix.texi:19612 @@ -35547,7 +35990,7 @@ msgstr "" #: doc/guix.texi:19617 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean scan-hidden-path" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean scan-hidden-path" #. type: deftypevr #: doc/guix.texi:19623 @@ -35558,7 +36001,7 @@ msgstr "" #: doc/guix.texi:19628 #, no-wrap msgid "{@code{cgit-configuration} parameter} list snapshots" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} list snapshots" #. type: deftypevr #: doc/guix.texi:19631 @@ -35569,7 +36012,7 @@ msgstr "" #: doc/guix.texi:19636 #, no-wrap msgid "{@code{cgit-configuration} parameter} repository-directory repository-directory" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} repository-directory repository-directory" #. type: deftypevr #: doc/guix.texi:19639 @@ -35579,13 +36022,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19641 msgid "Defaults to @samp{\"/srv/git\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/srv/git\"}." #. type: deftypevr #: doc/guix.texi:19644 #, no-wrap msgid "{@code{cgit-configuration} parameter} string section" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string section" #. type: deftypevr #: doc/guix.texi:19647 doc/guix.texi:19963 @@ -35596,7 +36039,7 @@ msgstr "" #: doc/guix.texi:19652 #, no-wrap msgid "{@code{cgit-configuration} parameter} string section-sort" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string section-sort" #. type: deftypevr #: doc/guix.texi:19655 @@ -35607,7 +36050,7 @@ msgstr "" #: doc/guix.texi:19660 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer section-from-path" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer section-from-path" #. type: deftypevr #: doc/guix.texi:19663 @@ -35618,7 +36061,7 @@ msgstr "" #: doc/guix.texi:19668 #, no-wrap msgid "{@code{cgit-configuration} parameter} boolean side-by-side-diffs?" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} boolean side-by-side-diffs?" #. type: deftypevr #: doc/guix.texi:19671 @@ -35629,7 +36072,7 @@ msgstr "" #: doc/guix.texi:19676 #, no-wrap msgid "{@code{cgit-configuration} parameter} file-object source-filter" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} file-object source-filter" #. type: deftypevr #: doc/guix.texi:19679 @@ -35640,7 +36083,7 @@ msgstr "" #: doc/guix.texi:19684 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer summary-branches" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer summary-branches" #. type: deftypevr #: doc/guix.texi:19687 @@ -35651,7 +36094,7 @@ msgstr "" #: doc/guix.texi:19692 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer summary-log" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer summary-log" #. type: deftypevr #: doc/guix.texi:19695 @@ -35662,7 +36105,7 @@ msgstr "" #: doc/guix.texi:19700 #, no-wrap msgid "{@code{cgit-configuration} parameter} integer summary-tags" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} integer summary-tags" #. type: deftypevr #: doc/guix.texi:19703 @@ -35673,7 +36116,7 @@ msgstr "" #: doc/guix.texi:19708 #, no-wrap msgid "{@code{cgit-configuration} parameter} string strict-export" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string strict-export" #. type: deftypevr #: doc/guix.texi:19711 @@ -35684,7 +36127,7 @@ msgstr "" #: doc/guix.texi:19716 #, no-wrap msgid "{@code{cgit-configuration} parameter} string virtual-root" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} string virtual-root" #. type: deftypevr #: doc/guix.texi:19718 @@ -35694,13 +36137,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19720 msgid "Defaults to @samp{\"/\"}." -msgstr "" +msgstr "La valeur par défaut est @samp{\"/\"}." #. type: deftypevr #: doc/guix.texi:19723 #, no-wrap msgid "{@code{cgit-configuration} parameter} repository-cgit-configuration-list repositories" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} repository-cgit-configuration-list repositories" #. type: deftypevr #: doc/guix.texi:19725 @@ -35710,13 +36153,13 @@ msgstr "" #. type: deftypevr #: doc/guix.texi:19729 msgid "Available @code{repository-cgit-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{repository-cgit-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:19730 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-list snapshots" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-list snapshots" #. type: deftypevr #: doc/guix.texi:19733 @@ -35727,7 +36170,7 @@ msgstr "" #: doc/guix.texi:19738 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object source-filter" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-file-object source-filter" #. type: deftypevr #: doc/guix.texi:19740 @@ -35738,7 +36181,7 @@ msgstr "" #: doc/guix.texi:19745 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string url" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string url" #. type: deftypevr #: doc/guix.texi:19747 @@ -35749,7 +36192,7 @@ msgstr "" #: doc/guix.texi:19752 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object about-filter" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-file-object about-filter" #. type: deftypevr #: doc/guix.texi:19754 @@ -35760,7 +36203,7 @@ msgstr "" #: doc/guix.texi:19759 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string branch-sort" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string branch-sort" #. type: deftypevr #: doc/guix.texi:19762 @@ -35771,7 +36214,7 @@ msgstr "" #: doc/guix.texi:19767 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-list clone-url" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-list clone-url" #. type: deftypevr #: doc/guix.texi:19769 @@ -35782,7 +36225,7 @@ msgstr "" #: doc/guix.texi:19774 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object commit-filter" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-file-object commit-filter" #. type: deftypevr #: doc/guix.texi:19776 @@ -35793,13 +36236,13 @@ msgstr "" #: doc/guix.texi:19781 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string commit-sort" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string commit-sort" #. type: deftypevr #: doc/guix.texi:19790 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string defbranch" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string defbranch" #. type: deftypevr #: doc/guix.texi:19795 @@ -35810,7 +36253,7 @@ msgstr "" #: doc/guix.texi:19800 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string desc" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string desc" #. type: deftypevr #: doc/guix.texi:19802 @@ -35821,7 +36264,7 @@ msgstr "" #: doc/guix.texi:19807 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string homepage" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string homepage" #. type: deftypevr #: doc/guix.texi:19809 @@ -35832,7 +36275,7 @@ msgstr "" #: doc/guix.texi:19814 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object email-filter" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-file-object email-filter" #. type: deftypevr #: doc/guix.texi:19816 @@ -35843,7 +36286,7 @@ msgstr "" #: doc/guix.texi:19821 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-commit-graph?" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean enable-commit-graph?" #. type: deftypevr #: doc/guix.texi:19824 @@ -35854,7 +36297,7 @@ msgstr "" #: doc/guix.texi:19829 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-log-filecount?" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean enable-log-filecount?" #. type: deftypevr #: doc/guix.texi:19832 @@ -35865,7 +36308,7 @@ msgstr "" #: doc/guix.texi:19837 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-log-linecount?" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean enable-log-linecount?" #. type: deftypevr #: doc/guix.texi:19840 @@ -35876,13 +36319,13 @@ msgstr "" #: doc/guix.texi:19845 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-remote-branches?" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean enable-remote-branches?" #. type: deftypevr #: doc/guix.texi:19853 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-subject-links?" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean enable-subject-links?" #. type: deftypevr #: doc/guix.texi:19856 @@ -35893,7 +36336,7 @@ msgstr "" #: doc/guix.texi:19861 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-html-serving?" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean enable-html-serving?" #. type: deftypevr #: doc/guix.texi:19864 @@ -35904,7 +36347,7 @@ msgstr "" #: doc/guix.texi:19869 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-boolean hide?" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean hide?" #. type: deftypevr #: doc/guix.texi:19872 @@ -35915,7 +36358,7 @@ msgstr "" #: doc/guix.texi:19877 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-boolean ignore?" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean ignore?" #. type: deftypevr #: doc/guix.texi:19879 @@ -35926,7 +36369,7 @@ msgstr "" #: doc/guix.texi:19884 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object logo" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-file-object logo" #. type: deftypevr #: doc/guix.texi:19887 @@ -35937,13 +36380,13 @@ msgstr "" #: doc/guix.texi:19892 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string logo-link" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string logo-link" #. type: deftypevr #: doc/guix.texi:19899 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-file-object owner-filter" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-file-object owner-filter" #. type: deftypevr #: doc/guix.texi:19901 @@ -35954,7 +36397,7 @@ msgstr "" #: doc/guix.texi:19906 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string module-link" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string module-link" #. type: deftypevr #: doc/guix.texi:19910 @@ -35965,7 +36408,7 @@ msgstr "" #: doc/guix.texi:19915 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} module-link-path module-link-path" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} module-link-path module-link-path" #. type: deftypevr #: doc/guix.texi:19919 @@ -35976,7 +36419,7 @@ msgstr "" #: doc/guix.texi:19924 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string max-stats" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string max-stats" #. type: deftypevr #: doc/guix.texi:19926 @@ -35987,7 +36430,7 @@ msgstr "" #: doc/guix.texi:19931 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string name" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string name" #. type: deftypevr #: doc/guix.texi:19933 @@ -35998,7 +36441,7 @@ msgstr "" #: doc/guix.texi:19938 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string owner" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string owner" #. type: deftypevr #: doc/guix.texi:19940 @@ -36009,7 +36452,7 @@ msgstr "" #: doc/guix.texi:19945 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string path" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string path" #. type: deftypevr #: doc/guix.texi:19947 @@ -36020,7 +36463,7 @@ msgstr "" #: doc/guix.texi:19952 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string readme" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string readme" #. type: deftypevr #: doc/guix.texi:19955 @@ -36031,13 +36474,13 @@ msgstr "" #: doc/guix.texi:19960 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-string section" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string section" #. type: deftypevr #: doc/guix.texi:19968 #, no-wrap msgid "{@code{repository-cgit-configuration} parameter} repo-list extra-options" -msgstr "" +msgstr "{paramètre de @code{repository-cgit-configuration}} repo-list extra-options" #. type: deftypevr #: doc/guix.texi:19970 doc/guix.texi:19979 @@ -36048,7 +36491,7 @@ msgstr "" #: doc/guix.texi:19977 #, no-wrap msgid "{@code{cgit-configuration} parameter} list extra-options" -msgstr "" +msgstr "{paramètre de @code{cgit-configuration}} list extra-options" #. type: Plain text #: doc/guix.texi:19991 @@ -36058,13 +36501,13 @@ msgstr "" #. type: Plain text #: doc/guix.texi:19993 msgid "Available @code{opaque-cgit-configuration} fields are:" -msgstr "" +msgstr "Les champs de @code{opaque-cgit-configuration} disponibles sont :" #. type: deftypevr #: doc/guix.texi:19994 #, no-wrap msgid "{@code{opaque-cgit-configuration} parameter} package cgit" -msgstr "" +msgstr "{paramètre de @code{opaque-cgit-configuration}} package cgit" #. type: deftypevr #: doc/guix.texi:19996 @@ -36075,7 +36518,7 @@ msgstr "" #: doc/guix.texi:19998 #, no-wrap msgid "{@code{opaque-cgit-configuration} parameter} string string" -msgstr "" +msgstr "{paramètre de @code{opaque-cgit-configuration}} string string" #. type: deftypevr #: doc/guix.texi:20000 @@ -36117,7 +36560,7 @@ msgstr "" #: doc/guix.texi:20021 #, no-wrap msgid "{Scheme Variable} wesnothd-service-type" -msgstr "" +msgstr "{Variable Scheme} wesnothd-service-type" #. type: defvar #: doc/guix.texi:20025 @@ -36134,7 +36577,7 @@ msgstr "" #: doc/guix.texi:20031 #, no-wrap msgid "{Data Type} wesnothd-configuration" -msgstr "" +msgstr "{Type de données} wesnothd-configuration" #. type: deftp #: doc/guix.texi:20033 @@ -36145,7 +36588,7 @@ msgstr "" #: doc/guix.texi:20035 #, no-wrap msgid "@code{package} (default: @code{wesnoth-server})" -msgstr "" +msgstr "@code{package} (par défaut : @code{wesnoth-server})" #. type: table #: doc/guix.texi:20037 @@ -36156,7 +36599,7 @@ msgstr "" #: doc/guix.texi:20038 #, no-wrap msgid "@code{port} (default: @code{15000})" -msgstr "" +msgstr "@code{port} (par défaut : @code{15000})" #. type: table #: doc/guix.texi:20040 @@ -36184,7 +36627,7 @@ msgstr "" #: doc/guix.texi:20052 #, no-wrap msgid "{Scheme Variable} sysctl-service-type" -msgstr "" +msgstr "{Variable Scheme} sysctl-service-type" #. type: defvr #: doc/guix.texi:20056 @@ -36204,7 +36647,7 @@ msgstr "" #: doc/guix.texi:20064 #, no-wrap msgid "{Data Type} sysctl-configuration" -msgstr "" +msgstr "{Type de données} sysctl-configuration" #. type: deftp #: doc/guix.texi:20066 @@ -36215,7 +36658,7 @@ msgstr "" #: doc/guix.texi:20068 #, no-wrap msgid "@code{sysctl} (default: @code{(file-append procps \"/sbin/sysctl\"})" -msgstr "" +msgstr "@code{sysctl} (par défaut : @code{(file-append procps \"/sbin/sysctl\"})" #. type: table #: doc/guix.texi:20070 @@ -36226,7 +36669,7 @@ msgstr "" #: doc/guix.texi:20071 #, no-wrap msgid "@code{settings} (default: @code{'()})" -msgstr "" +msgstr "@code{settings} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:20073 @@ -36254,7 +36697,7 @@ msgstr "" #: doc/guix.texi:20081 #, no-wrap msgid "{Scheme Procedure} lirc-service [#:lirc lirc] @" -msgstr "" +msgstr "{Procédure Scheme} lirc-service [#:lirc lirc] @" #. type: deffn #: doc/guix.texi:20086 @@ -36292,7 +36735,7 @@ msgstr "" #: doc/guix.texi:20100 #, no-wrap msgid "{Scheme Procedure} spice-vdagent-service [#:spice-vdagent]" -msgstr "" +msgstr "{Procédure Scheme} spice-vdagent-service [#:spice-vdagent]" #. type: deffn #: doc/guix.texi:20104 @@ -36320,7 +36763,7 @@ msgstr "" #: doc/guix.texi:20110 #, no-wrap msgid "{Scheme Procedure} dicod-service [#:config (dicod-configuration)]" -msgstr "" +msgstr "{Procédure Scheme} dicod-service [#:config (dicod-configuration)]" #. type: deffn #: doc/guix.texi:20113 @@ -36341,7 +36784,7 @@ msgstr "" #: doc/guix.texi:20123 #, no-wrap msgid "{Data Type} dicod-configuration" -msgstr "" +msgstr "{Type de données} dicod-configuration" #. type: deftp #: doc/guix.texi:20125 @@ -36352,7 +36795,7 @@ msgstr "" #: doc/guix.texi:20127 #, no-wrap msgid "@code{dico} (default: @var{dico})" -msgstr "" +msgstr "@code{dico} (par défaut : @var{dico})" #. type: table #: doc/guix.texi:20129 @@ -36363,7 +36806,7 @@ msgstr "" #: doc/guix.texi:20130 #, no-wrap msgid "@code{interfaces} (default: @var{'(\"localhost\")})" -msgstr "" +msgstr "@code{interfaces} (par défaut : @var{'(\"localhost\")})" #. type: table #: doc/guix.texi:20134 @@ -36374,7 +36817,7 @@ msgstr "" #: doc/guix.texi:20135 #, no-wrap msgid "@code{handlers} (default: @var{'()})" -msgstr "" +msgstr "@code{handlers} (par défaut : @var{'()})" #. type: table #: doc/guix.texi:20137 @@ -36385,7 +36828,7 @@ msgstr "" #: doc/guix.texi:20138 #, no-wrap msgid "@code{databases} (default: @var{(list %dicod-database:gcide)})" -msgstr "" +msgstr "@code{databases} (par défaut : @var{(list %dicod-database:gcide)})" #. type: table #: doc/guix.texi:20140 @@ -36396,7 +36839,7 @@ msgstr "" #: doc/guix.texi:20143 #, no-wrap msgid "{Data Type} dicod-handler" -msgstr "" +msgstr "{Type de données} dicod-handler" #. type: deftp #: doc/guix.texi:20145 @@ -36412,7 +36855,7 @@ msgstr "" #: doc/guix.texi:20150 #, no-wrap msgid "@code{module} (default: @var{#f})" -msgstr "" +msgstr "@code{module} (par défaut : @var{#f})" #. type: table #: doc/guix.texi:20154 @@ -36434,7 +36877,7 @@ msgstr "" #: doc/guix.texi:20160 #, no-wrap msgid "{Data Type} dicod-database" -msgstr "" +msgstr "{Type de données} dicod-database" #. type: deftp #: doc/guix.texi:20162 @@ -36461,7 +36904,7 @@ msgstr "" #: doc/guix.texi:20171 #, no-wrap msgid "@code{complex?} (default: @var{#f})" -msgstr "" +msgstr "@code{complex?} (par défaut : @var{#f})" #. type: table #: doc/guix.texi:20174 @@ -36477,7 +36920,7 @@ msgstr "" #: doc/guix.texi:20181 #, no-wrap msgid "{Scheme Variable} %dicod-database:gcide" -msgstr "" +msgstr "{Variable Scheme} %dicod-database:gcide" #. type: defvr #: doc/guix.texi:20184 @@ -36544,7 +36987,7 @@ msgstr "" #: doc/guix.texi:20238 #, no-wrap msgid "{Scheme Variable} %setuid-programs" -msgstr "" +msgstr "{Variable Scheme} %setuid-programs" #. type: defvr #: doc/guix.texi:20240 @@ -36746,7 +37189,7 @@ msgstr "" #: doc/guix.texi:20380 #, no-wrap msgid "{Scheme Variable} %default-nss" -msgstr "" +msgstr "{Variable Scheme} %default-nss" #. type: defvr #: doc/guix.texi:20383 @@ -36757,7 +37200,7 @@ msgstr "" #: doc/guix.texi:20385 #, no-wrap msgid "{Scheme Variable} %mdns-host-lookup-nss" -msgstr "" +msgstr "{Variable Scheme} %mdns-host-lookup-nss" #. type: defvr #: doc/guix.texi:20388 @@ -36773,7 +37216,7 @@ msgstr "" #: doc/guix.texi:20399 #, no-wrap msgid "{Data Type} name-service-switch" -msgstr "" +msgstr "{Type de données} name-service-switch" #. type: deftp #: doc/guix.texi:20404 @@ -36849,7 +37292,7 @@ msgstr "" #: doc/guix.texi:20424 #, no-wrap msgid "{Data Type} name-service" -msgstr "" +msgstr "{Type de données} name-service" #. type: deftp #: doc/guix.texi:20428 @@ -36908,7 +37351,7 @@ msgstr "" #: doc/guix.texi:20477 #, no-wrap msgid "{Scheme Variable} %base-initrd-modules" -msgstr "" +msgstr "{Variable Scheme} %base-initrd-modules" #. type: defvr #: doc/guix.texi:20479 @@ -37101,7 +37544,7 @@ msgstr "" #: doc/guix.texi:20628 #, no-wrap msgid "{Data Type} bootloader-configuration" -msgstr "" +msgstr "{Type de données} bootloader-configuration" #. type: deftp #: doc/guix.texi:20630 @@ -37145,7 +37588,7 @@ msgstr "" #: doc/guix.texi:20656 #, no-wrap msgid "@code{menu-entries} (default: @code{()})" -msgstr "" +msgstr "@code{menu-entries} (par défaut : @code{()})" #. type: table #: doc/guix.texi:20660 @@ -37156,7 +37599,7 @@ msgstr "" #: doc/guix.texi:20661 #, no-wrap msgid "@code{default-entry} (default: @code{0})" -msgstr "" +msgstr "@code{default-entry} (par défaut : @code{0})" #. type: table #: doc/guix.texi:20664 @@ -37167,7 +37610,7 @@ msgstr "" #: doc/guix.texi:20665 #, no-wrap msgid "@code{timeout} (default: @code{5})" -msgstr "" +msgstr "@code{timeout} (par défaut : @code{5})" #. type: table #: doc/guix.texi:20668 @@ -37178,7 +37621,7 @@ msgstr "" #: doc/guix.texi:20669 #, no-wrap msgid "@code{theme} (default: @var{#f})" -msgstr "" +msgstr "@code{theme} (par défaut : @var{#f})" #. type: table #: doc/guix.texi:20673 @@ -37189,7 +37632,7 @@ msgstr "" #: doc/guix.texi:20674 #, no-wrap msgid "@code{terminal-outputs} (default: @code{'gfxterm})" -msgstr "" +msgstr "@code{terminal-outputs} (par défaut : @code{'gfxterm})" #. type: table #: doc/guix.texi:20681 @@ -37200,7 +37643,7 @@ msgstr "" #: doc/guix.texi:20682 #, no-wrap msgid "@code{terminal-inputs} (default: @code{'()})" -msgstr "" +msgstr "@code{terminal-inputs} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:20690 @@ -37211,7 +37654,7 @@ msgstr "" #: doc/guix.texi:20691 #, no-wrap msgid "@code{serial-unit} (default: @code{#f})" -msgstr "" +msgstr "@code{serial-unit} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:20695 @@ -37222,7 +37665,7 @@ msgstr "" #: doc/guix.texi:20696 #, no-wrap msgid "@code{serial-speed} (default: @code{#f})" -msgstr "" +msgstr "@code{serial-speed} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:20700 @@ -37266,7 +37709,7 @@ msgstr "" #: doc/guix.texi:20722 #, no-wrap msgid "{Data Type} menu-entry" -msgstr "" +msgstr "{Type de données} menu-entry" #. type: deftp #: doc/guix.texi:20724 @@ -37321,7 +37764,7 @@ msgstr "" #: doc/guix.texi:20748 #, no-wrap msgid "@code{linux-arguments} (default: @code{()})" -msgstr "" +msgstr "@code{linux-arguments} (par défaut : @code{()})" #. type: table #: doc/guix.texi:20751 @@ -37337,7 +37780,7 @@ msgstr "" #: doc/guix.texi:20755 #, no-wrap msgid "@code{device} (default: @code{#f})" -msgstr "" +msgstr "@code{device} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:20758 @@ -37368,7 +37811,7 @@ msgstr "" #: doc/guix.texi:20783 #, no-wrap msgid "Invoking @code{guix system}" -msgstr "" +msgstr "Invoquer @code{guix system}" #. type: Plain text #: doc/guix.texi:20788 @@ -37443,7 +37886,7 @@ msgstr "" #: doc/guix.texi:20829 #, no-wrap msgid "@dots{}\n" -msgstr "" +msgstr "@dots{}\n" #. type: table #: doc/guix.texi:20834 @@ -38413,7 +38856,7 @@ msgstr "" #: doc/guix.texi:21533 #, no-wrap msgid "{Scheme Procedure} service @var{type} [@var{value}]" -msgstr "" +msgstr "{Procédure Scheme} service @var{type} [@var{value}]" #. type: deffn #: doc/guix.texi:21537 @@ -38458,7 +38901,7 @@ msgstr "" #: doc/guix.texi:21560 #, no-wrap msgid "{Scheme Procedure} service? @var{obj}" -msgstr "" +msgstr "{Procédure Scheme} service? @var{obj}" #. type: deffn #: doc/guix.texi:21562 @@ -38469,7 +38912,7 @@ msgstr "" #: doc/guix.texi:21564 #, no-wrap msgid "{Scheme Procedure} service-kind @var{service}" -msgstr "" +msgstr "{Procédure Scheme} service-kind @var{service}" #. type: deffn #: doc/guix.texi:21566 @@ -38480,7 +38923,7 @@ msgstr "" #: doc/guix.texi:21568 #, no-wrap msgid "{Scheme Procedure} service-value @var{service}" -msgstr "" +msgstr "{Procédure Scheme} service-value @var{service}" #. type: deffn #: doc/guix.texi:21571 @@ -38574,7 +39017,7 @@ msgstr "" #: doc/guix.texi:21632 #, no-wrap msgid "{Data Type} service-type" -msgstr "" +msgstr "{Type de données} service-type" #. type: cindex #: doc/guix.texi:21633 @@ -38607,7 +39050,7 @@ msgstr "" #: doc/guix.texi:21644 #, no-wrap msgid "@code{compose} (default: @code{#f})" -msgstr "" +msgstr "@code{compose} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:21648 @@ -38623,7 +39066,7 @@ msgstr "" #: doc/guix.texi:21653 #, no-wrap msgid "@code{extend} (default: @code{#f})" -msgstr "" +msgstr "@code{extend} (par défaut : @code{#f})" #. type: table #: doc/guix.texi:21655 @@ -38644,7 +39087,7 @@ msgstr "" #: doc/guix.texi:21666 #, no-wrap msgid "{Scheme Procedure} service-extension @var{target-type} @" -msgstr "" +msgstr "{Procédure Scheme} service-extension @var{target-type} @" #. type: deffn #: doc/guix.texi:21672 @@ -38655,7 +39098,7 @@ msgstr "" #: doc/guix.texi:21674 #, no-wrap msgid "{Scheme Procedure} service-extension? @var{obj}" -msgstr "" +msgstr "{Procédure Scheme} service-extension? @var{obj}" #. type: deffn #: doc/guix.texi:21676 @@ -38671,7 +39114,7 @@ msgstr "" #: doc/guix.texi:21683 #, no-wrap msgid "{Scheme Procedure} simple-service @var{name} @var{target} @var{value}" -msgstr "" +msgstr "{Procédure Scheme} simple-service @var{name} @var{target} @var{value}" #. type: deffn #: doc/guix.texi:21687 @@ -38700,7 +39143,7 @@ msgstr "" #: doc/guix.texi:21705 #, no-wrap msgid "{Scheme Procedure} fold-services @var{services} @" -msgstr "" +msgstr "{Procédure Scheme} fold-services @var{services} @" #. type: deffn #: doc/guix.texi:21709 @@ -38716,7 +39159,7 @@ msgstr "" #: doc/guix.texi:21714 #, no-wrap msgid "{Scheme Variable} system-service-type" -msgstr "" +msgstr "{Variable Scheme} system-service-type" #. type: defvr #: doc/guix.texi:21717 @@ -38727,7 +39170,7 @@ msgstr "" #: doc/guix.texi:21719 #, no-wrap msgid "{Scheme Variable} boot-service-type" -msgstr "" +msgstr "{Variable Scheme} boot-service-type" #. type: defvr #: doc/guix.texi:21722 @@ -38738,7 +39181,7 @@ msgstr "" #: doc/guix.texi:21724 #, no-wrap msgid "{Scheme Variable} etc-service-type" -msgstr "" +msgstr "{Variable Scheme} etc-service-type" #. type: defvr #: doc/guix.texi:21728 @@ -38760,7 +39203,7 @@ msgstr "" #: doc/guix.texi:21737 #, no-wrap msgid "{Scheme Variable} setuid-program-service-type" -msgstr "" +msgstr "{Variable Scheme} setuid-program-service-type" #. type: defvr #: doc/guix.texi:21741 @@ -38771,7 +39214,7 @@ msgstr "" #: doc/guix.texi:21743 #, no-wrap msgid "{Scheme Variable} profile-service-type" -msgstr "" +msgstr "{Variable Scheme} profile-service-type" #. type: defvr #: doc/guix.texi:21747 @@ -38825,7 +39268,7 @@ msgstr "" #: doc/guix.texi:21778 #, no-wrap msgid "{Data Type} shepherd-service" -msgstr "" +msgstr "{Type de données} shepherd-service" #. type: deftp #: doc/guix.texi:21780 @@ -38852,7 +39295,7 @@ msgstr "" #: doc/guix.texi:21790 #, no-wrap msgid "@code{requirements} (default: @code{'()})" -msgstr "" +msgstr "@code{requirements} (par défaut : @code{'()})" #. type: table #: doc/guix.texi:21792 @@ -38863,7 +39306,7 @@ msgstr "" #: doc/guix.texi:21793 #, no-wrap msgid "@code{respawn?} (default: @code{#t})" -msgstr "" +msgstr "@code{respawn?} (par défaut : @code{#t})" #. type: table #: doc/guix.texi:21796 @@ -38880,7 +39323,7 @@ msgstr "" #: doc/guix.texi:21798 #, no-wrap msgid "@code{stop} (default: @code{#~(const #f)})" -msgstr "" +msgstr "@code{stop} (par défaut : @code{#~(const #f)})" #. type: table #: doc/guix.texi:21804 @@ -38907,7 +39350,7 @@ msgstr "" #: doc/guix.texi:21815 #, no-wrap msgid "@code{modules} (default: @var{%default-modules})" -msgstr "" +msgstr "@code{modules} (par défaut : @var{%default-modules})" #. type: table #: doc/guix.texi:21818 @@ -38918,7 +39361,7 @@ msgstr "" #: doc/guix.texi:21822 #, no-wrap msgid "{Scheme Variable} shepherd-root-service-type" -msgstr "" +msgstr "{Variable Scheme} shepherd-root-service-type" #. type: defvr #: doc/guix.texi:21824 @@ -38934,7 +39377,7 @@ msgstr "" #: doc/guix.texi:21830 #, no-wrap msgid "{Scheme Variable} %shepherd-root-service" -msgstr "" +msgstr "{Variable Scheme} %shepherd-root-service" #. type: defvr #: doc/guix.texi:21832 @@ -39139,7 +39582,7 @@ msgstr "Guix suit une discipline de gestion de paquets fonctionnelle (@pxref{Int #: doc/guix.texi:22002 #, no-wrap msgid "grafts" -msgstr "" +msgstr "greffes" #. type: Plain text #: doc/guix.texi:22010 @@ -39198,7 +39641,7 @@ msgstr "" #: doc/guix.texi:22056 #, no-wrap msgid "guix build bash\n" -msgstr "" +msgstr "guix build bash\n" #. type: Plain text #: doc/guix.texi:22061 @@ -39305,7 +39748,7 @@ msgstr "" #: doc/guix.texi:22173 #, no-wrap msgid "./pre-inst-env guix build gnew --keep-failed\n" -msgstr "" +msgstr "./pre-inst-env guix build gnew --keep-failed\n" #. type: Plain text #: doc/guix.texi:22179 @@ -39422,6 +39865,16 @@ msgid "" " (version \"2.24.20\")\n" " ...))\n" msgstr "" +"(define-public gtk+\n" +" (package\n" +" (name \"gtk+\")\n" +" (version \"3.9.12\")\n" +" ...))\n" +"(define-public gtk+-2\n" +" (package\n" +" (name \"gtk+\")\n" +" (version \"2.24.20\")\n" +" ...))\n" #. type: Plain text #: doc/guix.texi:22300 @@ -39438,6 +39891,11 @@ msgid "" " (version \"3.8.2\")\n" " ...))\n" msgstr "" +"(define-public gtk+-3.8\n" +" (package\n" +" (name \"gtk+\")\n" +" (version \"3.8.2\")\n" +" ...))\n" #. type: cindex #: doc/guix.texi:22310 @@ -39588,7 +40046,7 @@ msgstr "" #: doc/guix.texi:22443 #, no-wrap msgid "python" -msgstr "" +msgstr "python" #. type: Plain text #: doc/guix.texi:22449 @@ -39661,7 +40119,7 @@ msgstr "" #: doc/guix.texi:22518 #, no-wrap msgid "perl" -msgstr "" +msgstr "perl" #. type: Plain text #: doc/guix.texi:22529 @@ -39672,7 +40130,7 @@ msgstr "" #: doc/guix.texi:22534 #, no-wrap msgid "java" -msgstr "" +msgstr "java" #. type: Plain text #: doc/guix.texi:22537 @@ -39825,7 +40283,7 @@ msgstr "" #. type: Plain text #: doc/guix.texi:22701 msgid "@image{images/bootstrap-packages,6in,,Dependency graph of the early packages}" -msgstr "" +msgstr "@image{images/bootstrap-packages,6in,,Graphe de dépendance des premiers paquets}" #. type: Plain text #: doc/guix.texi:22707 @@ -39867,7 +40325,7 @@ msgstr "" #: doc/guix.texi:22740 #, no-wrap msgid "guix build bootstrap-tarballs\n" -msgstr "" +msgstr "guix build bootstrap-tarballs\n" #. type: Plain text #: doc/guix.texi:22745 @@ -39904,7 +40362,7 @@ msgstr "" #: doc/guix.texi:22775 #, no-wrap msgid "Porting to a New Platform" -msgstr "" +msgstr "Porter vers une nouvelle plateforme" #. type: Plain text #: doc/guix.texi:22784 @@ -39920,7 +40378,7 @@ msgstr "" #: doc/guix.texi:22792 #, no-wrap msgid "guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs\n" -msgstr "" +msgstr "guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs\n" #. type: Plain text #: doc/guix.texi:22799 diff --git a/po/guix/fr.po b/po/guix/fr.po index c14dbf20d8..19f50127ed 100644 --- a/po/guix/fr.po +++ b/po/guix/fr.po @@ -1,14 +1,24 @@ # French translation of guix. # Copyright (C) 2013-2018 the authors of Guix (msgids) # This file is distributed under the same license as the guix package. -# Julien Lepiller , 2018. +# Rémy Chevalier , 2013, 2014. +# Frédéric Marchal , 2017. +# Julien Lepiller , 2017, 2018. +# +# Note de Frédéric Marchal: Le nom « shepherd » est le nom d'un démon (voir +# https://www.gnu.org/software/shepherd/). Je ne l'ai pas traduit dans les +# messages. Je l'ai traité comme le nom d'un logiciel. +# +# Note de Julien Lepiller : Le nom « shepherd » est bien le nom d'un logiciel, +# mais il est traité un peu différemment : on dit « le shepherd » (« the +# shepherd » en anglais) avec l'article. # msgid "" msgstr "" -"Project-Id-Version: guix-manual 0.15.0\n" +"Project-Id-Version: guix 0.15.0\n" "Report-Msgid-Bugs-To: ludo@gnu.org\n" -"POT-Creation-Date: 2018-06-22 14:12+0200\n" -"PO-Revision-Date: 2018-08-18 19:08+0200\n" +"POT-Creation-Date: 2018-06-22 14:08+0200\n" +"PO-Revision-Date: 2018-07-04 20:49+0200\n" "Last-Translator: Julien Lepiller \n" "Language-Team: French \n" "Language: fr\n" @@ -19,40199 +29,3789 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Offlate 0.1\n" -#. #-#-#-#-# contributing.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: chapter -#. #-#-#-#-# guix.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: menuentry -#: doc/contributing.texi:1 doc/contributing.texi:2 doc/guix.texi:107 -#: doc/guix.texi:278 -#, no-wrap -msgid "Contributing" -msgstr "Contribuer" - -#. type: Plain text -#: doc/contributing.texi:9 -msgid "This project is a cooperative effort, and we need your help to make it grow! Please get in touch with us on @email{guix-devel@@gnu.org} and @code{#guix} on the Freenode IRC network. We welcome ideas, bug reports, patches, and anything that may be helpful to the project. We particularly welcome help on packaging (@pxref{Packaging Guidelines})." -msgstr "Ce projet est un effort coopératif et nous avons besoin de votre aide pour le faire grandir ! Contactez-nous sur @email{guix-devel@@gnu.org} et @code{#guix} sur le réseau IRC Freenode. Nous accueillons les idées, les rapports de bogues, les correctifs et tout ce qui pourrait aider le projet. Nous apprécions particulièrement toute aide sur la création de paquets (@pxref{Consignes d'empaquetage})." - -#. type: cindex -#: doc/contributing.texi:10 -#, no-wrap -msgid "code of conduct, of contributors" -msgstr "code de conduite, des contributeurs" - -#. type: cindex -#: doc/contributing.texi:11 -#, no-wrap -msgid "contributor covenant" -msgstr "convention de contribution" - -#. 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." -msgstr "Nous souhaitons fournir un environnement chaleureux, amical et sans harcèlement pour que tout le monde puisse contribuer au mieux de ses capacités. Pour cela notre projet a une « Convention de contribution » adaptée de @url{http://contributor-covenant.org/}. Vous pouvez trouver une version locale dans le fichier @file{CODE-OF-CONDUCT} dans l'arborescence des sources." - -#. type: Plain text -#: doc/contributing.texi:21 -msgid "Contributors are not required to use their legal name in patches and on-line communication; they can use any name or pseudonym of their choice." -msgstr "Les contributeurs n'ont pas besoin d'utiliser leur nom légal dans leurs correctifs et leurs communications en ligne ; ils peuvent utiliser n'importe quel nom ou pseudonyme de leur choix." - -#. #-#-#-#-# contributing.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: section -#. #-#-#-#-# guix.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: menuentry -#: doc/contributing.texi:28 doc/contributing.texi:30 doc/contributing.texi:31 -#: doc/guix.texi:284 -#, no-wrap -msgid "Building from Git" -msgstr "Construire depuis Git" - -#. type: menuentry -#: doc/contributing.texi:28 doc/guix.texi:284 -msgid "The latest and greatest." -msgstr "toujours le plus récent." - -#. #-#-#-#-# contributing.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: section -#. #-#-#-#-# guix.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: menuentry -#: doc/contributing.texi:28 doc/contributing.texi:102 -#: doc/contributing.texi:103 doc/guix.texi:284 -#, no-wrap -msgid "Running Guix Before It Is Installed" -msgstr "Lancer Guix avant qu'il ne soit installé" - -#. type: menuentry -#: doc/contributing.texi:28 doc/guix.texi:284 -msgid "Hacker tricks." -msgstr "Astuces pour les hackers." - -#. #-#-#-#-# contributing.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: section -#. #-#-#-#-# guix.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: menuentry -#: doc/contributing.texi:28 doc/contributing.texi:163 -#: doc/contributing.texi:164 doc/guix.texi:284 -#, no-wrap -msgid "The Perfect Setup" -msgstr "La configuration parfaite" - -#. type: menuentry -#: doc/contributing.texi:28 doc/guix.texi:284 -msgid "The right tools." -msgstr "Les bons outils." - -#. #-#-#-#-# contributing.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: section -#. #-#-#-#-# guix.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: menuentry -#: doc/contributing.texi:28 doc/contributing.texi:222 -#: doc/contributing.texi:223 doc/guix.texi:284 doc/guix.texi:286 -#, no-wrap -msgid "Coding Style" -msgstr "Style de code" - -#. type: menuentry -#: doc/contributing.texi:28 doc/guix.texi:284 -msgid "Hygiene of the contributor." -msgstr "Hygiène du contributeur." - -#. #-#-#-#-# contributing.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: section -#. #-#-#-#-# guix.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: menuentry -#: doc/contributing.texi:28 doc/contributing.texi:320 -#: doc/contributing.texi:321 doc/guix.texi:284 -#, no-wrap -msgid "Submitting Patches" -msgstr "Envoyer des correctifs" - -#. type: menuentry -#: doc/contributing.texi:28 doc/guix.texi:284 -msgid "Share your work." -msgstr "Partager votre travail." - -#. type: Plain text -#: doc/contributing.texi:35 -msgid "If you want to hack Guix itself, it is recommended to use the latest version from the Git repository:" -msgstr "Si vous souhaitez travailler sur Guix lui-même, il est recommandé d'utiliser la dernière version du dépôt Git :" - -#. type: example -#: doc/contributing.texi:38 -#, no-wrap -msgid "git clone https://git.savannah.gnu.org/git/guix.git\n" -msgstr "git clone https://git.savannah.gnu.org/git/guix.git\n" - -#. type: Plain text -#: doc/contributing.texi:43 -msgid "When building Guix from a checkout, the following packages are required in addition to those mentioned in the installation instructions (@pxref{Requirements})." -msgstr "Lors de la construction de Guix depuis un extrait, les paquets suivants sont requis en plus de ceux mentionnés dans les instructions d'installation (@pxref{Prérequis})." - -#. type: item -#: doc/contributing.texi:45 -#, no-wrap -msgid "@url{http://gnu.org/software/autoconf/, GNU Autoconf};" -msgstr "@url{http://gnu.org/software/autoconf/, GNU Autoconf};" - -#. type: item -#: doc/contributing.texi:46 -#, no-wrap -msgid "@url{http://gnu.org/software/automake/, GNU Automake};" -msgstr "@url{http://gnu.org/software/automake/, GNU Automake};" - -#. type: item -#: doc/contributing.texi:47 -#, no-wrap -msgid "@url{http://gnu.org/software/gettext/, GNU Gettext};" -msgstr "@url{http://gnu.org/software/gettext/, GNU Gettext};" - -#. type: item -#: doc/contributing.texi:48 -#, no-wrap -msgid "@url{http://gnu.org/software/texinfo/, GNU Texinfo};" -msgstr "@url{http://gnu.org/software/texinfo/, GNU Texinfo};" - -#. type: item -#: doc/contributing.texi:49 -#, no-wrap -msgid "@url{http://www.graphviz.org/, Graphviz};" -msgstr "@url{http://www.graphviz.org/, Graphviz};" - -#. type: item -#: doc/contributing.texi:50 -#, no-wrap -msgid "@url{http://www.gnu.org/software/help2man/, GNU Help2man (optional)}." -msgstr "@url{http://www.gnu.org/software/help2man/, GNU Help2man (facultatif)}." - -#. type: Plain text -#: doc/contributing.texi:57 -msgid "The easiest way to set up a development environment for Guix is, of course, by using Guix! The following command starts a new shell where all the dependencies and appropriate environment variables are set up to hack on Guix:" -msgstr "La manière la plus simple de configurer un environnement de développement pour Guix est, bien sûr, d'utiliser Guix ! La commande suivante démarre un nouveau shell où toutes les dépendances et les variables d'environnements appropriées sont configurés pour travailler sur Guix :" - -#. type: example -#: doc/contributing.texi:60 -#, no-wrap -msgid "guix environment guix\n" -msgstr "guix environment guix\n" - -#. type: Plain text -#: doc/contributing.texi:64 -msgid "@xref{Invoking guix environment}, for more information on that command. Extra dependencies can be added with @option{--ad-hoc}:" -msgstr "@xref{Invoquer guix environment}, pour plus d'information sur cette commande. On peut ajouter des dépendances supplémentaires avec @option{--ad-hoc} :" - -#. type: example -#: doc/contributing.texi:67 -#, no-wrap -msgid "guix environment guix --ad-hoc help2man git strace\n" -msgstr "guix environment guix --ad-hoc help2man git strace\n" - -#. type: Plain text -#: doc/contributing.texi:71 -msgid "Run @command{./bootstrap} to generate the build system infrastructure using Autoconf and Automake. If you get an error like this one:" -msgstr "Lancez @command{./bootstrap} pour générer l'infrastructure du système de construction avec Autoconf et Automake. Si vous avez une erreur comme :" - -#. type: example -#: doc/contributing.texi:74 -#, no-wrap -msgid "configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES\n" -msgstr "configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES\n" - -#. type: Plain text -#: doc/contributing.texi:83 -msgid "it probably means that Autoconf couldn’t find @file{pkg.m4}, which is provided by pkg-config. Make sure that @file{pkg.m4} is available. The same holds for the @file{guile.m4} set of macros provided by Guile. For instance, if you installed Automake in @file{/usr/local}, it wouldn’t look for @file{.m4} files in @file{/usr/share}. In that case, you have to invoke the following command:" -msgstr "cela signifie probablement qu'Autoconf n'a pas pu trouver @file{pkg.m4} qui est fournit par pkg-config. Assurez-vous que @file{pkg.m4} est disponible. C'est aussi vrai pour l'ensemble de macros de @file{guile.m4} fournies par Guile. Par exemple, si vous avez installé Automake dans @file{/usr/local}, il ne cherchera pas les fichiers @file{.m4} dans @file{/usr/share}. Dans ce case vous devez invoquer la commande suivante :" - -#. type: example -#: doc/contributing.texi:86 -#, no-wrap -msgid "export ACLOCAL_PATH=/usr/share/aclocal\n" -msgstr "export ACLOCAL_PATH=/usr/share/aclocal\n" - -#. type: Plain text -#: doc/contributing.texi:90 -msgid "@xref{Macro Search Path,,, automake, The GNU Automake Manual}, for more information." -msgstr "@xref{Macro Search Path,,, automake, The GNU Automake Manual}, pour plus d'information." - -#. type: Plain text -#: doc/contributing.texi:95 -msgid "Then, run @command{./configure} as usual. Make sure to pass @code{--localstatedir=@var{directory}} where @var{directory} is the @code{localstatedir} value used by your current installation (@pxref{The Store}, for information about this)." -msgstr "Ensuite, lancez @command{./configure} comme d'habitude. Assurez-vous de passer @code{--localstatedir=@var{directory}} où @var{directory} est la valeur @code{localstatedir} utilisée par votre installation actuelle (@pxref{Le dépôt} pour plus d'informations à ce propos)." - -#. type: Plain text -#: doc/contributing.texi:100 -msgid "Finally, you have to invoke @code{make check} to run tests (@pxref{Running the Test Suite}). If anything fails, take a look at installation instructions (@pxref{Installation}) or send a message to the @email{guix-devel@@gnu.org, mailing list}." -msgstr "Finalement, vous devez invoquer @code{make check} pour lancer les tests (@pxref{Lancer la suite de tests}). Si quelque chose échoue, jetez un œil aux instructions d'installation (@pxref{Installation}) ou envoyez un message à la list @email{guix-devel@@gnu.org}." - -#. type: Plain text -#: doc/contributing.texi:109 -msgid "In order to keep a sane working environment, you will find it useful to test the changes made in your local source tree checkout without actually installing them. So that you can distinguish between your ``end-user'' hat and your ``motley'' costume." -msgstr "Pour garder un environnement de travail sain, il est utile de tester les changement localement sans les installer pour de vrai. Pour pouvoir distinguer votre rôle « d'utilisateur final » de celui parfois haut en couleur de « développeur »." - -#. type: Plain text -#: doc/contributing.texi:117 -msgid "To that end, all the command-line tools can be used even if you have not run @code{make install}. To do that, prefix each command with @command{./pre-inst-env} (the @file{pre-inst-env} script lives in the top build tree of Guix), as in@footnote{The @option{-E} flag to @command{sudo} guarantees that @code{GUILE_LOAD_PATH} is correctly set such that @command{guix-daemon} and the tools it uses can find the Guile modules they need.}:" -msgstr "Pour cela, tous les outils en ligne de commande sont utilisables même sans avoir lancé @code{make install}. Vous devez pour cela préfixer chaque commande par @command{./pre-inst-env} (le script @file{pre-inst-env} se trouve dans le répertoire de plus haut niveau de l'arborescence des sources de Guix) comme cela@footnote{L'option @option{-E} de @command{sudo} garantie que @code{GUILE_LOAD_PATH} est bien paramétré pour @command{guix-daemon} et les outils qu'il utilise puissent trouver les modules Guile dont ils ont besoin.} :" - -#. type: example -#: doc/contributing.texi:121 -#, no-wrap -msgid "" -"$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild\n" -"$ ./pre-inst-env guix build hello\n" -msgstr "" -"$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild\n" -"$ ./pre-inst-env guix build hello\n" +#: gnu.scm:82 +#, scheme-format +msgid "module ~a not found" +msgstr "module « ~a » introuvable" + +#: gnu.scm:100 +msgid "" +"You may use @command{guix package --show=foo | grep location} to search\n" +"for the location of package @code{foo}.\n" +"If you get the line @code{location: gnu/packages/bar.scm:174:2},\n" +"add @code{bar} to the @code{use-package-modules} form." +msgstr "" +"Vous pouvez utiliser @command{guix package --show=foo | grep location} pour\n" +"chercher l'emplacement du paquet @code{foo}.\n" +"Si vous voyez la ligne @code{location: gnu/packages/bar.scm:174:2},\n" +"ajoutez @code{bar} dans @code{use-package-modules}." -#. type: Plain text -#: doc/contributing.texi:125 -msgid "Similarly, for a Guile session using the Guix modules:" -msgstr "De même, pour une session Guile qui utilise les modules Guix :" +#: gnu.scm:108 +#, scheme-format +msgid "Try adding @code{(use-package-modules ~a)}." +msgstr "Essayez d'ajouter @code{(use-package-modules ~a)}." -#. type: example -#: doc/contributing.texi:128 -#, no-wrap +#: gnu.scm:123 +#, scheme-format msgid "" -"$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'\n" -"\n" -msgstr "" -"$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'\n" -"\n" - -#. type: example -#: doc/contributing.texi:130 -#, no-wrap -msgid ";;; (\"x86_64-linux\")\n" -msgstr ";;; (\"x86_64-linux\")\n" - -#. type: cindex -#: doc/contributing.texi:133 -#, no-wrap -msgid "REPL" -msgstr "REPL" - -#. type: cindex -#: doc/contributing.texi:134 -#, no-wrap -msgid "read-eval-print loop" -msgstr "read-eval-print loop" - -#. type: Plain text -#: doc/contributing.texi:137 -msgid "@dots{} and for a REPL (@pxref{Using Guile Interactively,,, guile, Guile Reference Manual}):" -msgstr "@dots{} et pour un REPL (@pxref{Using Guile Interactively,,, guile, Guile Reference Manual})" - -#. type: example -#: doc/contributing.texi:152 -#, no-wrap -msgid "" -"$ ./pre-inst-env guile\n" -"scheme@@(guile-user)> ,use(guix)\n" -"scheme@@(guile-user)> ,use(gnu)\n" -"scheme@@(guile-user)> (define snakes\n" -" (fold-packages\n" -" (lambda (package lst)\n" -" (if (string-prefix? \"python\"\n" -" (package-name package))\n" -" (cons package lst)\n" -" lst))\n" -" '()))\n" -"scheme@@(guile-user)> (length snakes)\n" -"$1 = 361\n" +"You may use @command{guix system search ~a} to search for a service\n" +"matching @code{~a}.\n" +"If you get the line @code{location: gnu/services/foo.scm:188:2},\n" +"add @code{foo} to the @code{use-service-modules} form." msgstr "" -"$ ./pre-inst-env guile\n" -"scheme@@(guile-user)> ,use(guix)\n" -"scheme@@(guile-user)> ,use(gnu)\n" -"scheme@@(guile-user)> (define snakes\n" -" (fold-packages\n" -" (lambda (package lst)\n" -" (if (string-prefix? \"python\"\n" -" (package-name package))\n" -" (cons package lst)\n" -" lst))\n" -" '()))\n" -"scheme@@(guile-user)> (length snakes)\n" -"$1 = 361\n" - -#. type: Plain text -#: doc/contributing.texi:156 -msgid "The @command{pre-inst-env} script sets up all the environment variables necessary to support this, including @env{PATH} and @env{GUILE_LOAD_PATH}." -msgstr "Le script @command{pre-inst-env} paramètre toutes les variables d'environnement nécessaires, dont @env{PATH} et @env{GUILE_LOAD_PATH}." - -#. type: Plain text -#: doc/contributing.texi:161 -msgid "Note that @command{./pre-inst-env guix pull} does @emph{not} upgrade the local source tree; it simply updates the @file{~/.config/guix/current} symlink (@pxref{Invoking guix pull}). Run @command{git pull} instead if you want to upgrade your local source tree." -msgstr "Remarquez que @command{./pre-inst-env guix pull} ne met @emph{pas} à jour l'arborescence des sources locale ; cela met seulement à jour le lien symbolique de @file{~/.config/guix/current} (@pxref{Invoking guix pull}). Lancez @command{git pull} à la place si vous voulez mettre à jour votre arborescence des source locale." - -#. type: Plain text -#: doc/contributing.texi:171 -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}." -msgstr "La configuration parfaite pour travailler sur Guix est simplement la configuration parfaite pour travailler en Guile (@pxref{Using Guile in Emacs,,, guile, Guile Reference Manual}). Tout d'abord, vous avez besoin de mieux qu'un éditeur de texte, vous avez besoin de @url{http://www.gnu.org/software/emacs, Emacs}, amélioré par le superbe @url{http://nongnu.org/geiser/, Geiser}." - -#. type: Plain text -#: doc/contributing.texi:179 -msgid "Geiser allows for interactive and incremental development from within Emacs: code compilation and evaluation from within buffers, access to on-line documentation (docstrings), context-sensitive completion, @kbd{M-.} to jump to an object definition, a REPL to try out your code, and more (@pxref{Introduction,,, geiser, Geiser User Manual}). For convenient Guix development, make sure to augment Guile’s load path so that it finds source files from your checkout:" -msgstr "Geiser permet le développement interactif et incrémental depuis Emacs : la compilation du code et son évaluation depuis les buffers, l'accès à la documentation en ligne (docstrings), la complétion sensible au contexte, @kbd{M-.} pour sauter à la définition d'un objet, un REPL pour tester votre code, et bien plus (@pxref{Introduction,,, geiser, Geiser User Manual}). Pour travailler confortablement sur Guix, assurez-vous de modifier le chemin de chargement de Guile pour qu'il trouve les fichiers source de votre dépôt :" - -#. type: lisp -#: doc/contributing.texi:184 -#, no-wrap +"Vous pouvez utiliser @commande{guix system search ~a} pour chercher un\n" +"service qui correspond à @code{~a}.\n" +"Si vous voyez la ligne @code{location: gnu/services/foo.scm:188:2},\n" +"ajoutez @code{foo} dans @code{use-service-modules}." + +#: gnu.scm:132 +#, scheme-format +msgid "Try adding @code{(use-service-modules ~a)}." +msgstr "Essayez d'ajouter @code{(use-service-modules ~a)}." + +#: gnu/packages.scm:92 +#, scheme-format +msgid "~a: patch not found" +msgstr "~a : correctif introuvable" + +#: gnu/packages.scm:108 +#, scheme-format +msgid "could not find bootstrap binary '~a' for system '~a'" +msgstr "impossible de trouver le binaire d'initialisation « ~a » pour le système « ~a »" + +#: gnu/packages.scm:259 +#, scheme-format +msgid "ambiguous package specification `~a'~%" +msgstr "spécification du paquet « ~a » ambiguë~%" + +#: gnu/packages.scm:260 +#, scheme-format +msgid "choosing ~a@~a from ~a~%" +msgstr "choix de ~a@~a parmi ~a~%" + +#: gnu/packages.scm:265 guix/scripts/package.scm:238 +#, scheme-format +msgid "package '~a' has been superseded by '~a'~%" +msgstr "le paquet « ~a » a été remplacé par « ~a »~%" + +#: gnu/packages.scm:272 +#, scheme-format +msgid "~A: package not found for version ~a~%" +msgstr "~A : paquet introuvable pour la version ~a~%" + +#: gnu/packages.scm:273 +#, scheme-format +msgid "~A: unknown package~%" +msgstr "~A : paquet inconnu~%" + +#: gnu/packages.scm:301 +#, scheme-format +msgid "package `~a' lacks output `~a'~%" +msgstr "le paquet « ~a » requiert la sortie « ~a »~%" + +#: gnu/services.scm:238 +#, scheme-format +msgid "~a: no value specified for service of type '~a'" +msgstr "~a : aucune valeur spécifiée pour le service de type « ~a »" + +#: gnu/services.scm:336 msgid "" -";; @r{Assuming the Guix checkout is in ~/src/guix.}\n" -"(with-eval-after-load 'geiser-guile\n" -" (add-to-list 'geiser-guile-load-path \"~/src/guix\"))\n" +"Build the operating system top-level directory, which in\n" +"turn refers to everything the operating system needs: its kernel, initrd,\n" +"system profile, boot script, and so on." msgstr "" -";; @r{Si l'extrait est dans ~/src/guix.}\n" -"(with-eval-after-load 'geiser-guile\n" -" (add-to-list 'geiser-guile-load-path \"~/src/guix\"))\n" - -#. type: Plain text -#: doc/contributing.texi:192 -msgid "To actually edit the code, Emacs already has a neat Scheme mode. But in addition to that, you must not miss @url{http://www.emacswiki.org/emacs/ParEdit, Paredit}. It provides facilities to directly operate on the syntax tree, such as raising an s-expression or wrapping it, swallowing or rejecting the following s-expression, etc." -msgstr "Pour effectivement éditer le code, Emacs a déjà un très bon mode Scheme. Mais en plus de ça, vous ne devez pas rater @url{http://www.emacswiki.org/emacs/ParEdit, Paredit}. Il fournit des fonctionnalités pour opérer directement sur l'arbre de syntaxe, comme relever une s-expression ou l'envelopper, absorber ou rejeter la s-expression suivante, etc." - -#. type: cindex -#: doc/contributing.texi:193 -#, no-wrap -msgid "code snippets" -msgstr "extraits de code" - -#. type: cindex -#: doc/contributing.texi:194 -#, no-wrap -msgid "templates" -msgstr "modèles" - -#. type: cindex -#: doc/contributing.texi:195 -#, no-wrap -msgid "reducing boilerplate" -msgstr "réduire la quantité de code commun" - -#. type: Plain text -#: doc/contributing.texi:202 -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." -msgstr "Nous fournissons aussi des modèles pour les messages de commit git communs et les définitions de paquets dans le répertoire @file{etc/snippets}. Ces modèles s'utilisent avec @url{http://joaotavora.github.io/yasnippet/, YASnippet} pour développer des chaînes courtes de déclenchement en extraits de texte interactifs. Vous pouvez ajouter le répertoire des modèles dans la variables @var{yas-snippet-dirs} d'Emacs." - -#. type: lisp -#: doc/contributing.texi:207 -#, no-wrap +"Construit le répertoire de plus haut niveau du système d'exploitation,\n" +"qui se réfère à son tour à tout ce que le système d'exploitation a\n" +"besoin : son noyau, l'image de démarrage, le profil du système, le script\n" +"de démarrage, etc." + +#: gnu/services.scm:366 msgid "" -";; @r{Assuming the Guix checkout is in ~/src/guix.}\n" -"(with-eval-after-load 'yasnippet\n" -" (add-to-list 'yas-snippet-dirs \"~/src/guix/etc/snippets\"))\n" -msgstr "" -";; @r{Si l'extrait est dans ~/src/guix.}\n" -"(with-eval-after-load 'yasnippet\n" -" (add-to-list 'yas-snippet-dirs \"~/src/guix/etc/snippets\"))\n" - -#. type: Plain text -#: doc/contributing.texi:214 -msgid "The commit message snippets depend on @url{https://magit.vc/, Magit} to display staged files. When editing a commit message type @code{add} followed by @kbd{TAB} to insert a commit message template for adding a package; type @code{update} followed by @kbd{TAB} to insert a template for updating a package." -msgstr "Les extraits de messages de commit dépendent de @url{https://magit.vc/, Magit} pour afficher les fichiers sélectionnés. Lors de la modification d'un message de commit, tapez @code{add} suivi de @kbd{TAB} pour insérer un modèle de message de commit pour ajouter un paquet ; tapez @code{update} suivi de @kbd{TAB} pour insérer un modèle pour la mise à jour d'un paquet." - -#. type: Plain text -#: doc/contributing.texi:220 -msgid "The main snippet for @code{scheme-mode} is triggered by typing @code{package...} followed by @kbd{TAB}. This snippet also inserts the trigger string @code{origin...}, which can be expanded further. The @code{origin} snippet in turn may insert other trigger strings ending on @code{...}, which also can be expanded further." -msgstr "L'extrait principal pour @code{scheme-mode} est lancé en tapant @code{package…} suivi par @kbd{TAB}. Cet extrait insère aussi la chaîne de déclenchement @code{origin…}, qui peut aussi être étendue. L'extrait @code{origin} lui-même peut aussi insérer des chaînes de déclenchement qui finissent sur @code{…}, qui peuvent aussi être étendues." - -#. type: Plain text -#: doc/contributing.texi:228 -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 "En général notre code suit le Standard de Code GNU (@pxref{Top,,, standards, GNU Coding Standards}). Cependant, il ne parle pas beaucoup de Scheme, donc voici quelques règles supplémentaires." - -#. #-#-#-#-# contributing.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: subsection -#. #-#-#-#-# guix.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: menuentry -#: doc/contributing.texi:234 doc/contributing.texi:236 -#: doc/contributing.texi:237 doc/guix.texi:291 -#, no-wrap -msgid "Programming Paradigm" -msgstr "Paradigme de programmation" - -#. type: menuentry -#: doc/contributing.texi:234 doc/guix.texi:291 -msgid "How to compose your elements." -msgstr "Comment composer vos éléments." - -#. #-#-#-#-# contributing.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: subsection -#. #-#-#-#-# guix.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: menuentry -#: doc/contributing.texi:234 doc/contributing.texi:243 -#: doc/contributing.texi:244 doc/guix.texi:291 -#, no-wrap -msgid "Modules" -msgstr "Modules" - -#. type: menuentry -#: doc/contributing.texi:234 doc/guix.texi:291 -msgid "Where to store your code?" -msgstr "Où stocker votre code ?" - -#. #-#-#-#-# contributing.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: subsection -#. #-#-#-#-# guix.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: menuentry -#: doc/contributing.texi:234 doc/contributing.texi:254 -#: doc/contributing.texi:255 doc/guix.texi:291 -#, no-wrap -msgid "Data Types and Pattern Matching" -msgstr "Types de données et reconnaissance de motif" - -#. type: menuentry -#: doc/contributing.texi:234 doc/guix.texi:291 -msgid "Implementing data structures." -msgstr "Implémenter des structures de données." - -#. #-#-#-#-# contributing.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: subsection -#. #-#-#-#-# guix.pot (guix 0.14.0.6706-c6386-dirty) #-#-#-#-# -#. type: menuentry -#: doc/contributing.texi:234 doc/contributing.texi:268 -#: doc/contributing.texi:269 doc/guix.texi:291 -#, no-wrap -msgid "Formatting Code" -msgstr "Formatage du code" - -#. type: menuentry -#: doc/contributing.texi:234 doc/guix.texi:291 -msgid "Writing conventions." -msgstr "Conventions d'écriture." - -#. type: Plain text -#: doc/contributing.texi:242 -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 "Le code Scheme dans Guix est écrit dans un style purement fonctionnel. Le code qui s'occupe des entrées-sorties est une exception ainsi que les procédures qui implémentent des concepts bas-niveau comme la procédure @code{memoize}." - -#. type: Plain text -#: doc/contributing.texi:250 -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 "Les modules Guile qui sont sensés être utilisés du côté de la construction doivent se trouver dans l'espace de nom @code{(guix build @dots{})}. Ils ne doivent pas se référer à d'autres modules Guix ou GNU@. Cependant il est correct pour un module « côté hôte » de dépendre d'un module coté construction." - -#. type: Plain text -#: doc/contributing.texi:253 -msgid "Modules that deal with the broader GNU system should be in the @code{(gnu @dots{})} name space rather than @code{(guix @dots{})}." -msgstr "Les modules qui s'occupent du système GNU général devraient se trouver dans l'espace de nom @code{(gnu @dots{})} plutôt que @code{(guix @dots{})}." - -#. type: Plain text -#: doc/contributing.texi:262 -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 "La tendance en Lisp classique est d'utiliser des listes pour tout représenter et de naviguer dedans « à la main ( avec @code{car}, @code{cdr}, @code{cadr} et compagnie. Il y a plusieurs problèmes avec ce style, notamment le fait qu'il soit dur à lire, source d'erreur et un obstacle aux rapports d'erreur bien typés." - -#. type: Plain text -#: doc/contributing.texi:267 -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 "Le code de Guix devrait définir des types de données appropriées (par exemple, avec @code{define-record-type*}) plutôt que d'abuser des listes. En plus, il devrait utiliser la recherche de motifs, via le module Guile @code{(ice-9 match)}, surtout pour rechercher dans des listes." - -#. type: cindex -#: doc/contributing.texi:271 -#, no-wrap -msgid "formatting code" -msgstr "formater le code" - -#. type: cindex -#: doc/contributing.texi:272 -#, no-wrap -msgid "coding style" -msgstr "style de code" - -#. type: Plain text -#: doc/contributing.texi:279 -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." -msgstr "Lorsque nous écrivons du code Scheme, nous suivons la sagesse commune aux programmeurs Scheme. En général, nous suivons les @url{http://mumble.net/~campbell/scheme/style.txt, règles de style de Riastradh}. Ce document décrit aussi les conventions utilisées dans le code de Guile. Il est bien pensé et bien écrit, alors n'hésitez pas à le lire." - -#. type: Plain text -#: doc/contributing.texi:286 -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 "Certaines formes spéciales introduites dans Guix comme la macro @code{substitute*} ont des règles d'indentation spécifiques. Elles sont définies dans le fichier @file{.dir-locals.el} qu'Emacs utilise automatiquement. Remarquez aussi qu'Emacs-Guix fournit le mode @code{guix-devel-mode} qui indente et colore le code Guix correctement (@pxref{Development,,, emacs-guix, The Emacs-Guix Reference Manual})." - -#. type: cindex -#: doc/contributing.texi:287 -#, no-wrap -msgid "indentation, of code" -msgstr "indentation, du code" - -#. type: cindex -#: doc/contributing.texi:288 -#, no-wrap -msgid "formatting, of code" -msgstr "formatage, du code" - -#. type: Plain text -#: doc/contributing.texi:291 -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 "Si vous n'utilisez pas Emacs, assurez-vous que votre éditeur connaisse ces règles. Pour indenter automatiquement une définition de paquet, vous pouvez aussi lancer :" - -#. type: example -#: doc/contributing.texi:294 -#, 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:300 -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 "Cela indente automatiquement la définition de @var{package} dans @file{gnu/packages/@var{file}.scm} en lançant Emacs en mode commande. Pour indenter un fichier complet, n'indiquez pas de second argument :" - -#. type: example -#: doc/contributing.texi:303 -#, 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:305 -#, no-wrap -msgid "Vim, Scheme code editing" -msgstr "Vim, édition de code Scheme" - -#. type: Plain text -#: doc/contributing.texi:311 -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 "Si vous éditez du code avec Vim, nous recommandons de lancer @code{:set autoindent} pour que votre code soit automatiquement indenté au moment où vous l'entrez. En plus, @uref{https://www.vim.org/scripts/script.php?script_id=3998, @code{paredit.vim}} peut vous aider à gérer toutes ces parenthèses." - -#. type: Plain text -#: doc/contributing.texi:315 -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 "Nous demandons que toutes les procédure de premier niveau contiennent une chaîne de documentation. Ce pré-requis peut être relâché pour les procédures privées simples dans l'espace de nom @code{(guix build @dots{})} cependant." - -#. type: Plain text -#: doc/contributing.texi:318 -msgid "Procedures should not have more than four positional parameters. Use keyword parameters for procedures that take more than four parameters." -msgstr "Les procédures ne devraient pas avoir plus de quatre paramètres positionnés. Utilisez des paramètres par mot-clefs pour les procédures qui prennent plus de quatre paramètres." - -#. type: Plain text -#: doc/contributing.texi:327 -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." -msgstr "Le développement se fait avec le système de contrôle de version Git. Ainsi, l'accès au dépôt n'est pas strictement nécessaire. Nous accueillons les contributions sous forme de correctifs produits par @code{git format-patch} envoyés sur la liste de diffusion @email{guix-patches@@gnu.org}." - -#. type: Plain text -#: doc/contributing.texi:334 -msgid "This mailing list is backed by a Debbugs instance accessible at @uref{https://bugs.gnu.org/guix-patches}, which allows us to keep track of submissions. 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 "Cette liste de diffusion est gérée par une instance Debbugs accessible à l'adresse @uref{https://bugs.gnu.org/guix-patches}, qui nous permet de suivre les soumissions. Chaque message envoyé à cette liste se voit attribuer un numéro de suivi ; les gens peuvent ensuite répondre à cette soumission en envoyant un courriel à @code{@var{NNN}@@debbugs.gnu.org}, où @var{NNN} est le numéro de suivi (@pxref{Envoyer une série de correctifs})." - -#. type: Plain text -#: doc/contributing.texi:338 -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 "Veuillez écrire les messages de commit dans le format ChangeLog (@pxref{Change Logs,,, standards, GNU Coding Standards}) ; vous pouvez regarder l'historique des commits pour trouver des exemples." - -#. type: Plain text -#: doc/contributing.texi:341 -msgid "Before submitting a patch that adds or modifies a package definition, please run through this check list:" -msgstr "Avant de soumettre un correctif qui ajoute ou modifie la définition d'un paquet, veuillez vérifier cette check-list :" - -#. type: enumerate -#: doc/contributing.texi:348 -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 "Si les auteurs du paquet logiciel fournissent une signature cryptographique pour l'archive, faîtes un effort pour vérifier l'authenticité de l'archive. Pour un fichier de signature GPG détaché, cela se fait avec la commande @code{gpg --verify}." - -#. type: enumerate -#: doc/contributing.texi:352 -msgid "Take some time to provide an adequate synopsis and description for the package. @xref{Synopses and Descriptions}, for some guidelines." -msgstr "Prenez un peu de temps pour fournir un synopsis et une description adéquats pour le paquet. Voir @xref{Synopsis et descriptions} pour quelques lignes directrices." - -#. type: enumerate -#: doc/contributing.texi:357 -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 "Lancez @code{guix lint @var{paquet}}, où @var{paquet} est le nom du nouveau paquet ou du paquet modifié, et corrigez les erreurs qu'il rapporte (@pxref{Invoquer guix lint})." - -#. type: enumerate -#: doc/contributing.texi:361 -msgid "Make sure the package builds on your platform, using @code{guix build @var{package}}." -msgstr "Assurez-vous que le paquet se construise sur votre plate-forme avec @code{guix build @var{paquet}}." - -#. type: cindex -#: doc/contributing.texi:363 -#, no-wrap -msgid "bundling" -msgstr "construction groupée" - -#. type: enumerate -#: doc/contributing.texi:366 -msgid "Make sure the package does not use bundled copies of software already available as separate packages." -msgstr "Assurez-vous que le paquet n'utilise pas de copie groupée d'un logiciel déjà disponible dans un paquet séparé." - -#. type: enumerate -#: doc/contributing.texi:375 -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 "Parfois, les paquets incluent des copie du code source de leurs dépendances pour le confort de leurs utilisateurs. Cependant, en tant que distribution, nous voulons nous assurer que ces paquets utilisent bien les copient que nous avons déjà dans la distribution si elles existent. Cela améliore l'utilisation des ressources (la dépendance n'est construite et stockée qu'une seule fois) et permet à la distribution de faire des changements transversaux comme appliquer des correctifs de sécurité pour un paquet donné depuis un unique emplacement et qu'ils affectent tout le système, ce qu'empêchent les copies groupées." - -#. type: enumerate -#: doc/contributing.texi:382 -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." -msgstr "Regardez le profile rapporté par @command{guix size} (@pxref{Invoking guix size}). Cela vous permettra de remarquer des références à d'autres paquets qui ont été retenus. Il peut aussi aider à déterminer s'il faut découper le paquet (@pxref{Des paquets avec plusieurs résultats}) et quelle dépendance facultative utiliser." - -#. type: enumerate -#: doc/contributing.texi:387 -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 "Pour les changements important, vérifiez que les paquets qui en dépendent (s'ils existent) ne sont pas affectés par le changement ; @code{guix refresh --list-dependant @var{paquet}} vous aidera (@pxref{Invoquer guix refresh})." - -#. type: cindex -#: doc/contributing.texi:389 -#, no-wrap -msgid "branching strategy" -msgstr "stratégie de branche" - -#. type: cindex -#: doc/contributing.texi:390 -#, no-wrap -msgid "rebuild scheduling strategy" -msgstr "stratégie de planification des reconstructions" - -#. type: enumerate -#: doc/contributing.texi:393 -msgid "Depending on the number of dependent packages and thus the amount of rebuilding induced, commits go to different branches, along these lines:" -msgstr "Suivant le nombre de paquets dépendants et donc le nombre de reconstruction induites, les commits vont vers des branches différentes, suivant ces principes :" - -#. type: item -#: doc/contributing.texi:395 -#, no-wrap -msgid "300 dependent packages or less" -msgstr "300 paquets dépendants ou moins" - -#. type: table -#: doc/contributing.texi:397 -msgid "@code{master} branch (non-disruptive changes)." -msgstr "branche @code{master} (changements non-disruptifs)." - -#. type: item -#: doc/contributing.texi:398 -#, no-wrap -msgid "between 300 and 1,200 dependent packages" -msgstr "entre 300 et 1 200 paquets dépendants" - -#. type: table -#: doc/contributing.texi:403 -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 "branche @code{staging} (changemets non-disruptifs). Cette branche devrait être fusionnées dans @code{master} tous les 3 semaines. Les changements par thèmes (par exemple une mise à jour de la pile GNOME) peuvent aller dans une branche spécifique (disons, @code{gnome-updates})." - -#. type: item -#: doc/contributing.texi:404 -#, no-wrap -msgid "more than 1,200 dependent packages" -msgstr "plus de 1 200 paquets dépendants" - -#. type: table -#: doc/contributing.texi:408 -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 "branche @code{core-updates} (peut inclure des changements majeurs et potentiellement disruptifs). Cette branche devrait être fusionnée dans @code{master} tous les 2,5 mois environ." - -#. type: enumerate -#: doc/contributing.texi:415 -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." -msgstr "Toutes ces branches sont @uref{https://hydra.gnu.org/project/gnu, gérées par notre ferme de construction} et fusionnées dans @code{master} une fois que tout a été construit correctement. Cela nous permet de corriger des problèmes avant qu'ils n'atteignent les utilisateurs et réduit la fenêtre pendant laquelle les binaires pré-construits ne sont pas disponibles." - -#. type: enumerate -#: doc/contributing.texi:422 -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 "Généralement les autres branches que @code{master} sont considérées comme @emph{gelées} s'il y a eu une évaluation récente ou qu'il y a une branche @code{-next} correspondante. Demandez sur la liste de diffusion ou sur IRC si vous n'êtes pas sûr de savoir où pousser votre correctif." - -#. type: cindex -#: doc/contributing.texi:424 -#, no-wrap -msgid "determinism, of build processes" -msgstr "déterminisme, du processus de construction" - -#. type: cindex -#: doc/contributing.texi:425 -#, no-wrap -msgid "reproducible builds, checking" -msgstr "construction reproductibles, vérification" - -#. type: enumerate -#: doc/contributing.texi:429 -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 "Vérifiez si le processus de construction du paquet est déterministe. Cela signifie typiquement vérifier qu'une construction indépendante du paquet renvoie exactement le même résultat que vous avez obtenu, bit à bit." - -#. type: enumerate -#: doc/contributing.texi:432 -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 "Une manière simple de le faire est de reconstruire le paquet plusieurs fois à la suite sur votre machine (@pxref{Invoquer guix build}) :" - -#. type: example -#: doc/contributing.texi:435 -#, no-wrap -msgid "guix build --rounds=2 my-package\n" -msgstr "guix build --rounds=2 mon-paquet\n" - -#. type: enumerate -#: doc/contributing.texi:439 -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 "Cela est suffisant pour trouver une classe de non-déterminisme commune, comme l'horodatage ou des sorties générées aléatoirement dans le résultat de la construction." - -#. type: enumerate -#: doc/contributing.texi:449 -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{hydra.gnu.org} 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 "Une autre option consiste à utiliser @command{guix challenge} (@pxref{Invoquer guix challenge}). Vous pouvez lancer la commande une fois que les paquets ont été commités et construits par @code{hydra.gnu.org} pour vérifier s'il obtient le même résultat que vous. Mieux encore : trouvez une autre machine qui peut le construire et lancez @command{guix publish}. Puis la machine distante est sûrement différente de la vôtre, cela peut trouver des problèmes de non-déterminisme liés au matériel — par exemple utiliser une extension du jeu d'instruction — ou du noyau du système d'exploitation — par exemple se reposer sur @code{uname} ou les fichiers de @file{/proc}." - -#. type: enumerate -#: doc/contributing.texi:455 -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 "Lorsque vous écrivez de la documentation, utilisez une formulation au genre neutre lorsque vous vous référez à des personnes, comme le @uref{https://fr.wikipedia.org/wiki/They_singulier, ``they''@comma{} ``their''@comma{} ``them'' singulier} (en anglais)." - -#. type: enumerate -#: doc/contributing.texi:459 -msgid "Verify that your patch contains only one set of related changes. Bundling unrelated changes together makes reviewing harder and slower." -msgstr "Vérifiez que votre correctif contienne seulement un ensemble de changements liés. Grouper des changements non liés ensemble rend la revue plus difficile et plus lente." - -#. type: enumerate -#: doc/contributing.texi:462 -msgid "Examples of unrelated changes include the addition of several packages, or a package update along with fixes to that package." -msgstr "Ajouter plusieurs paquet ou une mise à jour d'un paquet avec des corrections dans ce paquet sont des exemples de changements sans rapport." - -#. type: enumerate -#: doc/contributing.texi:467 -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 "Suivez nos règles de formatage de code, éventuellement en lançant le script @command{et/indent-code.el} pour le faire automatiquement (@pxref{Formatage du code})." - -#. type: Plain text -#: doc/contributing.texi:477 -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 "Lorsque vous envoyez un correctif à la liste de diffusion, utilisez @samp{[PATCH] @dots{}} comme sujet. Vous pouvez utiliser votre client de courriel ou la commande @command{git send-email} (@pxref{Envoyer une série de correctifs}). Nous préférons recevoir des correctifs en texte brut, soit en ligne, soit en pièce-jointe MIME@. Nous vous conseillons de faire attention si votre client de courriel change par exemple les retours à la ligne ou l'indentation, ce qui peut casser les correctifs." - -#. type: Plain text -#: doc/contributing.texi:480 -msgid "When a bug is resolved, please close the thread by sending an email to @email{@var{NNN}-done@@debbugs.gnu.org}." -msgstr "Lorsqu'un bogue est résolu, veuillez fermer le fil en envoyant un courriel à @email{@var{NNN}-done@@debbugs.gnu.org}." - -#. type: anchor{#1} -#: doc/contributing.texi:481 doc/contributing.texi:483 -#, no-wrap -msgid "Sending a Patch Series" -msgstr "Envoyer une série de correctifs" - -#. type: cindex -#: doc/contributing.texi:483 -#, no-wrap -msgid "patch series" -msgstr "série de correctifs" - -#. type: code{#1} -#: doc/contributing.texi:484 -#, no-wrap -msgid "git send-email" -msgstr "git send-email" - -#. type: code{#1} -#: doc/contributing.texi:485 -#, no-wrap -msgid "git-send-email" -msgstr "git-send-email" - -#. type: Plain text -#: doc/contributing.texi:493 -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." -msgstr "Lorsque vous envoyez une série de correctifs (p.@@:: ex.@: avec @code{git send-email}), envoyez d'abord une premier message à @email{guix-patches@@gnu.org} puis envoyez le reste des correctifs à @email{@var{NNN}@@debbugs.gnu.org} pour vous assurer qu'ils seront groupés ensemble. Voyez @uref{https://debbugs.gnu.org/Advanced.html, la documentation de Debbugs} pour plus d'informations." - -#. type: Plain text -#: doc/guix.texi:7 -msgid "@documentencoding UTF-8" +"Produce the operating system's boot script, which is spawned\n" +"by the initrd once the root file system is mounted." msgstr "" -"@documentencoding UTF-8\n" -"@documentlanguage fr\n" -"@frenchspacing on" - -#. type: title -#: doc/guix.texi:7 doc/guix.texi:78 -#, no-wrap -msgid "GNU Guix Reference Manual" -msgstr "Manuel de référence de GNU Guix" - -#. type: include -#: doc/guix.texi:10 -#, no-wrap -msgid "version.texi" -msgstr "version-fr.texi" - -#. type: copying -#: doc/guix.texi:52 -msgid "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018 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 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 Nils Gillmann@* Copyright @copyright{} 2016, 2017 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018 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" -msgstr "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018 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 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 Nils Gillmann@* Copyright @copyright{} 2016, 2017 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018 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" - -#. type: copying -#: doc/guix.texi:59 -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 "Vous avez la permission de copier, distribuer ou modifier ce document sous les termes de la Licence GNU Free Documentation, version 1.3 ou toute version ultérieure publiée par la Free Software Foundation ; sans section invariante, texte de couverture et sans texte de quatrième de couverture. Une copie de la licence est incluse dans la section intitulée « GNU Free Documentation License »." - -#. type: dircategory -#: doc/guix.texi:61 -#, no-wrap -msgid "System administration" -msgstr "Administration système" - -#. type: menuentry -#: doc/guix.texi:68 -msgid "Guix: (guix)" -msgstr "Guix: (guix.fr)" - -#. type: menuentry -#: doc/guix.texi:68 -msgid "Manage installed software and system configuration." -msgstr "Gérer les logiciels installés et la configuration du système." - -#. type: menuentry -#: doc/guix.texi:68 -msgid "guix package: (guix)Invoking guix package" -msgstr "guix package : (guix.fr)Invoquer guix package" - -#. type: menuentry -#: doc/guix.texi:68 -msgid "Installing, removing, and upgrading packages." -msgstr "Intaller, supprimer et mettre à jour des paquets." - -#. type: menuentry -#: doc/guix.texi:68 -msgid "guix gc: (guix)Invoking guix gc" -msgstr "guix gc : (guix.fr)Invoquer guix gc" - -#. type: menuentry -#: doc/guix.texi:68 -msgid "Reclaiming unused disk space." -msgstr "Récupérer de l'espace disque inutilisé." - -#. type: menuentry -#: doc/guix.texi:68 -msgid "guix pull: (guix)Invoking guix pull" -msgstr "guix pull : (guix.fr)Invoquer guix pull" - -#. type: menuentry -#: doc/guix.texi:68 -msgid "Update the list of available packages." -msgstr "Mettre à jour la liste des paquets disponibles." - -#. type: menuentry -#: doc/guix.texi:68 -msgid "guix system: (guix)Invoking guix system" -msgstr "guix system : (guix.fr)Invoquer guix system" - -#. type: menuentry -#: doc/guix.texi:68 -msgid "Manage the operating system configuration." -msgstr "Gérer la configuration du système d'exploitation." - -#. type: dircategory -#: doc/guix.texi:70 -#, no-wrap -msgid "Software development" -msgstr "Développement logiciel" - -#. type: menuentry -#: doc/guix.texi:75 -msgid "guix environment: (guix)Invoking guix environment" -msgstr "guix environment : (guix.fr)Invoquer guix environment" - -#. type: menuentry -#: doc/guix.texi:75 -msgid "Building development environments with Guix." -msgstr "Construire des environnements de construction avec Guix." - -#. type: menuentry -#: doc/guix.texi:75 -msgid "guix build: (guix)Invoking guix build" -msgstr "guix build : (guix.fr)Invoquer guix build" - -#. type: menuentry -#: doc/guix.texi:75 -msgid "Building packages." -msgstr "Construire des paquets." - -#. type: menuentry -#: doc/guix.texi:75 -msgid "guix pack: (guix)Invoking guix pack" -msgstr "guix pack : (guix.fr) Invoquer guix pack" - -#. type: menuentry -#: doc/guix.texi:75 -msgid "Creating binary bundles." -msgstr "Créer des lots binaires." - -#. type: subtitle -#: doc/guix.texi:79 -#, no-wrap -msgid "Using the GNU Guix Functional Package Manager" -msgstr "Utiliser le gestionnaire de paquet fonctionnel GNU Guix" - -#. type: author -#: doc/guix.texi:80 -#, no-wrap -msgid "The GNU Guix Developers" -msgstr "Les développeurs de GNU Guix" - -#. type: titlepage -#: doc/guix.texi:86 -msgid "Edition @value{EDITION} @* @value{UPDATED} @*" -msgstr "Édition @value{EDITION} @* @value{UPDATED} @*" - -#. type: node -#: doc/guix.texi:93 -#, no-wrap -msgid "Top" -msgstr "Top" - -#. type: top -#: doc/guix.texi:94 -#, no-wrap -msgid "GNU Guix" -msgstr "GNU Guix" - -#. type: Plain text -#: doc/guix.texi:98 -msgid "This document describes GNU Guix version @value{VERSION}, a functional package management tool written for the GNU system." -msgstr "Cette documentation décrit GNU Guix version @value{VERSION}, un outil de gestion de paquets fonctionnel écrit pour le système GNU@." - -#. type: chapter -#: doc/guix.texi:107 doc/guix.texi:296 doc/guix.texi:297 -#, no-wrap -msgid "Introduction" -msgstr "Introduction" - -#. type: menuentry -#: doc/guix.texi:107 -msgid "What is Guix about?" -msgstr "Qu'est-ce que Guix ?" - -#. type: chapter -#: doc/guix.texi:107 doc/guix.texi:117 doc/guix.texi:369 doc/guix.texi:370 -#, no-wrap -msgid "Installation" -msgstr "Installation" - -#. type: menuentry -#: doc/guix.texi:107 -msgid "Installing Guix." -msgstr "Installer Guix." - -#. type: chapter -#: doc/guix.texi:107 doc/guix.texi:132 doc/guix.texi:1657 doc/guix.texi:1658 -#, no-wrap -msgid "Package Management" -msgstr "Gestion de paquets" - -#. type: menuentry -#: doc/guix.texi:107 -msgid "Package installation, upgrade, etc." -msgstr "Installation des paquets, mises à jour, etc." - -#. type: chapter -#: doc/guix.texi:107 doc/guix.texi:152 doc/guix.texi:3225 doc/guix.texi:3226 -#, no-wrap -msgid "Programming Interface" -msgstr "Interface de programmation" - -#. type: menuentry -#: doc/guix.texi:107 -msgid "Using Guix in Scheme." -msgstr "Utiliser Guix en Scheme." - -#. type: chapter -#: doc/guix.texi:107 doc/guix.texi:166 doc/guix.texi:5533 doc/guix.texi:5534 -#, no-wrap -msgid "Utilities" -msgstr "Utilitaires" - -#. type: menuentry -#: doc/guix.texi:107 -msgid "Package management commands." -msgstr "Commandes de gestion de paquets." - -#. type: chapter -#: doc/guix.texi:107 doc/guix.texi:191 doc/guix.texi:8191 doc/guix.texi:8192 -#, no-wrap -msgid "GNU Distribution" -msgstr "Distribution GNU" - -#. type: menuentry -#: doc/guix.texi:107 -msgid "Software for your friendly GNU system." -msgstr "Des logiciels pour un système GNU convivial." - -#. type: menuentry -#: doc/guix.texi:107 -msgid "Your help needed!" -msgstr "Nous avons besoin de votre aide !" - -#. type: chapter -#: doc/guix.texi:112 doc/guix.texi:22822 doc/guix.texi:22823 -#, no-wrap -msgid "Acknowledgments" -msgstr "Remerciements" - -#. type: menuentry -#: doc/guix.texi:112 -msgid "Thanks!" -msgstr "Merci !" - -#. type: appendix -#: doc/guix.texi:112 doc/guix.texi:22844 doc/guix.texi:22845 -#, no-wrap -msgid "GNU Free Documentation License" -msgstr "La licence GNU Free Documentation" - -#. type: menuentry -#: doc/guix.texi:112 -msgid "The license of this manual." -msgstr "La licence de ce manuel." - -#. type: unnumbered -#: doc/guix.texi:112 doc/guix.texi:22850 doc/guix.texi:22851 -#, no-wrap -msgid "Concept Index" -msgstr "Index des concepts" - -#. type: menuentry -#: doc/guix.texi:112 -msgid "Concepts." -msgstr "Les concepts." - -#. type: unnumbered -#: doc/guix.texi:112 doc/guix.texi:22854 doc/guix.texi:22855 -#, no-wrap -msgid "Programming Index" -msgstr "Index de programmation" - -#. type: menuentry -#: doc/guix.texi:112 -msgid "Data types, functions, and variables." -msgstr "Types de données, fonctions et variables." - -#. type: menuentry -#: doc/guix.texi:115 -msgid "--- The Detailed Node Listing ---" -msgstr "--- Liste détaillée des nœuds ---" - -#. type: section -#: doc/guix.texi:124 doc/guix.texi:400 doc/guix.texi:402 doc/guix.texi:403 -#, no-wrap -msgid "Binary Installation" -msgstr "Installation binaire" - -#. type: menuentry -#: doc/guix.texi:124 doc/guix.texi:400 -msgid "Getting Guix running in no time!" -msgstr "Commencer à utiliser Guix en un rien de temps !" - -#. type: section -#: doc/guix.texi:124 doc/guix.texi:400 doc/guix.texi:598 doc/guix.texi:599 -#, no-wrap -msgid "Requirements" -msgstr "Prérequis" - -#. type: menuentry -#: doc/guix.texi:124 doc/guix.texi:400 -msgid "Software needed to build and run Guix." -msgstr "Logiciels requis pour construire et lancer Guix." - -#. type: section -#: doc/guix.texi:124 doc/guix.texi:400 doc/guix.texi:683 doc/guix.texi:684 -#, no-wrap -msgid "Running the Test Suite" -msgstr "Lancer la suite de tests" - -#. type: menuentry -#: doc/guix.texi:124 doc/guix.texi:400 -msgid "Testing Guix." -msgstr "Tester Guix." - -#. type: section -#: doc/guix.texi:124 doc/guix.texi:126 doc/guix.texi:400 doc/guix.texi:748 -#: doc/guix.texi:749 -#, no-wrap -msgid "Setting Up the Daemon" -msgstr "Paramétrer le démon" - -#. type: menuentry -#: doc/guix.texi:124 doc/guix.texi:400 -msgid "Preparing the build daemon's environment." -msgstr "Préparer l'environnement du démon de construction." - -#. type: node -#: doc/guix.texi:124 doc/guix.texi:400 doc/guix.texi:1181 -#, no-wrap -msgid "Invoking guix-daemon" -msgstr "Invoquer guix-daemon" - -#. type: menuentry -#: doc/guix.texi:124 doc/guix.texi:400 -msgid "Running the build daemon." -msgstr "Lancer le démon de construction." - -#. type: section -#: doc/guix.texi:124 doc/guix.texi:400 doc/guix.texi:1446 doc/guix.texi:1447 -#, no-wrap -msgid "Application Setup" -msgstr "Réglages applicatifs" - -#. type: menuentry -#: doc/guix.texi:124 doc/guix.texi:400 -msgid "Application-specific setup." -msgstr "Réglages spécifiques pour les application." - -#. type: subsection -#: doc/guix.texi:130 doc/guix.texi:768 doc/guix.texi:770 doc/guix.texi:771 -#, no-wrap -msgid "Build Environment Setup" -msgstr "Réglages de l'environnement de construction" - -#. type: menuentry -#: doc/guix.texi:130 doc/guix.texi:768 -msgid "Preparing the isolated build environment." -msgstr "Préparer l'environnement de construction isolé." - -#. type: node -#: doc/guix.texi:130 doc/guix.texi:768 doc/guix.texi:887 -#, no-wrap -msgid "Daemon Offload Setup" -msgstr "Réglages du délestage du démon" - -#. type: menuentry -#: doc/guix.texi:130 doc/guix.texi:768 -msgid "Offloading builds to remote machines." -msgstr "Envoyer des constructions à des machines distantes." - -#. type: subsection -#: doc/guix.texi:130 doc/guix.texi:768 doc/guix.texi:1095 doc/guix.texi:1096 -#, no-wrap -msgid "SELinux Support" -msgstr "Support de SELinux" - -#. type: menuentry -#: doc/guix.texi:130 doc/guix.texi:768 -msgid "Using an SELinux policy for the daemon." -msgstr "Utiliser une politique SELinux pour le démon." - -#. type: section -#: doc/guix.texi:141 doc/guix.texi:1687 doc/guix.texi:1689 doc/guix.texi:1690 -#, no-wrap -msgid "Features" -msgstr "Fonctionnalités" - -#. type: menuentry -#: doc/guix.texi:141 doc/guix.texi:1687 -msgid "How Guix will make your life brighter." -msgstr "Comment Guix va rendre votre vie plus heureuse." - -#. type: node -#: doc/guix.texi:141 doc/guix.texi:1687 doc/guix.texi:1766 -#, no-wrap -msgid "Invoking guix package" -msgstr "Invoquer guix package" - -#. type: menuentry -#: doc/guix.texi:141 doc/guix.texi:1687 -msgid "Package installation, removal, etc." -msgstr "Installation, suppression, etc.@: de paquets." - -#. type: section -#: doc/guix.texi:141 doc/guix.texi:143 doc/guix.texi:1687 doc/guix.texi:2250 -#: doc/guix.texi:2251 -#, no-wrap -msgid "Substitutes" -msgstr "Substituts" - -#. type: menuentry -#: doc/guix.texi:141 doc/guix.texi:1687 -msgid "Downloading pre-built binaries." -msgstr "Télécharger des binaire déjà construits." - -#. type: section -#: doc/guix.texi:141 doc/guix.texi:1687 doc/guix.texi:2483 doc/guix.texi:2484 -#, no-wrap -msgid "Packages with Multiple Outputs" -msgstr "Des paquets avec plusieurs résultats" - -#. type: menuentry -#: doc/guix.texi:141 doc/guix.texi:1687 -msgid "Single source package, multiple outputs." -msgstr "Un seul paquet source, plusieurs résultats." - -#. type: node -#: doc/guix.texi:141 doc/guix.texi:1687 doc/guix.texi:2537 -#, no-wrap -msgid "Invoking guix gc" -msgstr "Invoquer guix gc" - -#. type: menuentry -#: doc/guix.texi:141 doc/guix.texi:1687 -msgid "Running the garbage collector." -msgstr "Lancer le ramasse-miettes." - -#. type: node -#: doc/guix.texi:141 doc/guix.texi:1687 doc/guix.texi:2725 -#, no-wrap -msgid "Invoking guix pull" -msgstr "Invoquer guix pull" - -#. type: menuentry -#: doc/guix.texi:141 doc/guix.texi:1687 -msgid "Fetching the latest Guix and distribution." -msgstr "Récupérer la dernière version de Guix et de la distribution." - -#. type: node -#: doc/guix.texi:141 doc/guix.texi:1687 doc/guix.texi:2836 -#, no-wrap -msgid "Invoking guix pack" -msgstr "Invoquer guix pack" - -#. type: menuentry -#: doc/guix.texi:141 doc/guix.texi:1687 -msgid "Creating software bundles." -msgstr "Créer des lots de logiciels." - -#. type: node -#: doc/guix.texi:141 doc/guix.texi:1687 doc/guix.texi:3060 -#, no-wrap -msgid "Invoking guix archive" -msgstr "Invoquer guix archive" - -#. type: menuentry -#: doc/guix.texi:141 doc/guix.texi:1687 -msgid "Exporting and importing store files." -msgstr "Exporter et importer des fichiers du dépôt." - -#. type: subsection -#: doc/guix.texi:150 doc/guix.texi:2273 doc/guix.texi:2275 doc/guix.texi:2276 -#, no-wrap -msgid "Official Substitute Server" -msgstr "Serveur de substituts officiel" - -#. type: menuentry -#: doc/guix.texi:150 doc/guix.texi:2273 -msgid "One particular source of substitutes." -msgstr "Une source particulière de substituts." - -#. type: subsection -#: doc/guix.texi:150 doc/guix.texi:2273 doc/guix.texi:2305 doc/guix.texi:2306 -#, no-wrap -msgid "Substitute Server Authorization" -msgstr "Autoriser un serveur de substituts" - -#. type: menuentry -#: doc/guix.texi:150 doc/guix.texi:2273 -msgid "How to enable or disable substitutes." -msgstr "Comment activer ou désactiver les substituts." - -#. type: subsection -#: doc/guix.texi:150 doc/guix.texi:2273 doc/guix.texi:2378 doc/guix.texi:2379 -#, no-wrap -msgid "Substitute Authentication" -msgstr "Authentification des substituts" - -#. type: menuentry -#: doc/guix.texi:150 doc/guix.texi:2273 -msgid "How Guix verifies substitutes." -msgstr "Coment Guix vérifie les substituts." - -#. type: subsection -#: doc/guix.texi:150 doc/guix.texi:2273 doc/guix.texi:2413 doc/guix.texi:2414 -#, no-wrap -msgid "Proxy Settings" -msgstr "Paramètres de serveur mandataire" - -#. type: menuentry -#: doc/guix.texi:150 doc/guix.texi:2273 -msgid "How to get substitutes via proxy." -msgstr "Comment récupérer des substituts à travers un serveur mandataire." - -#. type: subsection -#: doc/guix.texi:150 doc/guix.texi:2273 doc/guix.texi:2425 doc/guix.texi:2426 -#, no-wrap -msgid "Substitution Failure" -msgstr "Échec de substitution" - -#. type: menuentry -#: doc/guix.texi:150 doc/guix.texi:2273 -msgid "What happens when substitution fails." -msgstr "Qu'arrive-t-il quand la substitution échoue." - -#. type: subsection -#: doc/guix.texi:150 doc/guix.texi:2273 doc/guix.texi:2453 doc/guix.texi:2454 -#, no-wrap -msgid "On Trusting Binaries" -msgstr "De la confiance en des binaires" - -#. type: menuentry -#: doc/guix.texi:150 doc/guix.texi:2273 -msgid "How can you trust that binary blob?" -msgstr "Comment pouvez-vous avoir confiance en un paquet binaire ?" - -#. type: section -#: doc/guix.texi:159 doc/guix.texi:161 doc/guix.texi:3260 doc/guix.texi:3262 -#: doc/guix.texi:3263 -#, no-wrap -msgid "Defining Packages" -msgstr "Définition des paquets" - -#. type: menuentry -#: doc/guix.texi:159 doc/guix.texi:3260 -msgid "Defining new packages." -msgstr "Définir de nouveaux paquets." - -#. type: section -#: doc/guix.texi:159 doc/guix.texi:3260 doc/guix.texi:3726 doc/guix.texi:3727 -#, no-wrap -msgid "Build Systems" -msgstr "Systèmes de construction" - -#. type: menuentry -#: doc/guix.texi:159 doc/guix.texi:3260 -msgid "Specifying how packages are built." -msgstr "Spécifier comment construire les paquets." - -#. type: section -#: doc/guix.texi:159 doc/guix.texi:3260 doc/guix.texi:4321 doc/guix.texi:4322 -#, no-wrap -msgid "The Store" -msgstr "Le dépôt" - -#. type: menuentry -#: doc/guix.texi:159 doc/guix.texi:3260 -msgid "Manipulating the package store." -msgstr "Manipuler le dépôt de paquets." - -#. type: section -#: doc/guix.texi:159 doc/guix.texi:3260 doc/guix.texi:4471 doc/guix.texi:4472 -#, no-wrap -msgid "Derivations" -msgstr "Dérivations" - -#. type: menuentry -#: doc/guix.texi:159 doc/guix.texi:3260 -msgid "Low-level interface to package derivations." -msgstr "Interface de bas-niveau avec les dérivations de paquets." - -#. type: section -#: doc/guix.texi:159 doc/guix.texi:3260 doc/guix.texi:4649 doc/guix.texi:4650 -#, no-wrap -msgid "The Store Monad" -msgstr "La monad du dépôt" - -#. type: menuentry -#: doc/guix.texi:159 doc/guix.texi:3260 -msgid "Purely functional interface to the store." -msgstr "Interface purement fonctionnelle avec le dépôt." - -#. type: section -#: doc/guix.texi:159 doc/guix.texi:3260 doc/guix.texi:4958 doc/guix.texi:4959 -#, no-wrap -msgid "G-Expressions" -msgstr "G-Expressions" - -#. type: menuentry -#: doc/guix.texi:159 doc/guix.texi:3260 -msgid "Manipulating build expressions." -msgstr "Manipuler les expressions de construction." - -#. type: node -#: doc/guix.texi:164 doc/guix.texi:3508 doc/guix.texi:3511 -#, no-wrap -msgid "package Reference" -msgstr "Référence de paquet" - -#. type: menuentry -#: doc/guix.texi:164 doc/guix.texi:3508 -msgid "The package data type." -msgstr "Le type de donnée des paquets." - -#. type: node -#: doc/guix.texi:164 doc/guix.texi:3508 doc/guix.texi:3638 -#, no-wrap -msgid "origin Reference" -msgstr "Référence d'origine" - -#. type: menuentry -#: doc/guix.texi:164 doc/guix.texi:3508 -msgid "The origin data type." -msgstr "Le type de données d'origine." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:5559 -#, no-wrap -msgid "Invoking guix build" -msgstr "Invoquer guix build" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Building packages from the command line." -msgstr "Construire des paquets depuis la ligne de commande." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:6146 -#, no-wrap -msgid "Invoking guix edit" -msgstr "Invoquer guix edit" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Editing package definitions." -msgstr "Modifier les définitions de paquets." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:6172 -#, no-wrap -msgid "Invoking guix download" -msgstr "Invoquer guix download" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Downloading a file and printing its hash." -msgstr "Télécharger un fichier et afficher son hash." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:6225 -#, no-wrap -msgid "Invoking guix hash" -msgstr "Invoquer guix hash" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Computing the cryptographic hash of a file." -msgstr "Calculer le hash cryptographique d'un fichier." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:6287 -#, no-wrap -msgid "Invoking guix import" -msgstr "Invoquer guix import" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Importing package definitions." -msgstr "Importer des définitions de paquets." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:6660 -#, no-wrap -msgid "Invoking guix refresh" -msgstr "Invoquer guix refresh" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Updating package definitions." -msgstr "Mettre à jour les définitions de paquets." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:6907 -#, no-wrap -msgid "Invoking guix lint" -msgstr "Invoquer guix lint" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Finding errors in package definitions." -msgstr "Trouver des erreurs dans les définitions de paquets." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:7016 -#, no-wrap -msgid "Invoking guix size" -msgstr "Invoquer guix size" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Profiling disk usage." -msgstr "Profiler l'utilisation du disque." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:7140 -#, no-wrap -msgid "Invoking guix graph" -msgstr "Invoquer guix graph" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Visualizing the graph of packages." -msgstr "Visualiser le graphe des paquets." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:7319 -#, no-wrap -msgid "Invoking guix environment" -msgstr "Invoquer guix environment" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Setting up development environments." -msgstr "Mettre en place des environnements de développement." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:7638 -#, no-wrap -msgid "Invoking guix publish" -msgstr "Invoquer guix publish" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Sharing substitutes." -msgstr "Partager des substituts." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:7855 -#, no-wrap -msgid "Invoking guix challenge" -msgstr "Invoquer guix challenge" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Challenging substitute servers." -msgstr "Défier les serveurs de substituts." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:7994 -#, no-wrap -msgid "Invoking guix copy" -msgstr "Invoquer guix copy" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Copying to and from a remote store." -msgstr "Copier vers et depuis un dépôt distant." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:8057 -#, no-wrap -msgid "Invoking guix container" -msgstr "Invoquer guix container" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Process isolation." -msgstr "Isolation de processus." - -#. type: node -#: doc/guix.texi:182 doc/guix.texi:5557 doc/guix.texi:8111 -#, no-wrap -msgid "Invoking guix weather" -msgstr "Invoquer guix weather" - -#. type: menuentry -#: doc/guix.texi:182 doc/guix.texi:5557 -msgid "Assessing substitute availability." -msgstr "Mesurer la disponibilité des substituts." - -#. type: section -#: doc/guix.texi:184 doc/guix.texi:5560 -#, no-wrap -msgid "Invoking @command{guix build}" -msgstr "Invoquer @command{guix build}" - -#. type: subsection -#: doc/guix.texi:189 doc/guix.texi:5611 doc/guix.texi:5613 doc/guix.texi:5614 -#, no-wrap -msgid "Common Build Options" -msgstr "Options de construction communes" - -#. type: menuentry -#: doc/guix.texi:189 doc/guix.texi:5611 -msgid "Build options for most commands." -msgstr "Options de construction pour la plupart des commandes." - -#. type: subsection -#: doc/guix.texi:189 doc/guix.texi:5611 doc/guix.texi:5755 doc/guix.texi:5756 -#, no-wrap -msgid "Package Transformation Options" -msgstr "Options de transformation de paquets" - -#. type: menuentry -#: doc/guix.texi:189 doc/guix.texi:5611 -msgid "Creating variants of packages." -msgstr "Créer des variantes de paquets." - -#. type: subsection -#: doc/guix.texi:189 doc/guix.texi:5611 doc/guix.texi:5855 doc/guix.texi:5856 -#, no-wrap -msgid "Additional Build Options" -msgstr "Options de construction supplémentaires" - -#. type: menuentry -#: doc/guix.texi:189 doc/guix.texi:5611 -msgid "Options specific to 'guix build'." -msgstr "Options spécifiques à « guix build »." - -#. type: subsection -#: doc/guix.texi:189 doc/guix.texi:5611 doc/guix.texi:6066 doc/guix.texi:6067 -#, no-wrap -msgid "Debugging Build Failures" -msgstr "Débogage des échecs de construction" - -#. type: menuentry -#: doc/guix.texi:189 doc/guix.texi:5611 -msgid "Real life packaging experience." -msgstr "La vie d'un empaqueteur." - -#. type: section -#: doc/guix.texi:201 doc/guix.texi:203 doc/guix.texi:8263 doc/guix.texi:8268 -#: doc/guix.texi:8269 -#, no-wrap -msgid "System Installation" -msgstr "Installation du système" - -#. type: menuentry -#: doc/guix.texi:201 doc/guix.texi:8263 -msgid "Installing the whole operating system." -msgstr "Installer le système d'exploitation complet." - -#. type: section -#: doc/guix.texi:201 doc/guix.texi:213 doc/guix.texi:8263 doc/guix.texi:8900 -#: doc/guix.texi:8901 -#, no-wrap -msgid "System Configuration" -msgstr "Configuration système" - -#. type: menuentry -#: doc/guix.texi:201 doc/guix.texi:8263 -msgid "Configuring the operating system." -msgstr "Configurer le système d'exploitation." - -#. type: section -#: doc/guix.texi:201 doc/guix.texi:8263 doc/guix.texi:21835 -#: doc/guix.texi:21836 -#, no-wrap -msgid "Documentation" -msgstr "Documentation" - -#. type: menuentry -#: doc/guix.texi:201 doc/guix.texi:8263 -msgid "Browsing software user manuals." -msgstr "Visualiser les manuels d'utilisateur des logiciels." - -#. type: section -#: doc/guix.texi:201 doc/guix.texi:8263 doc/guix.texi:21899 -#: doc/guix.texi:21900 -#, no-wrap -msgid "Installing Debugging Files" -msgstr "Installer les fichiers de débogage" - -#. type: menuentry -#: doc/guix.texi:201 doc/guix.texi:8263 -msgid "Feeding the debugger." -msgstr "Nourrir le débogueur." - -#. type: section -#: doc/guix.texi:201 doc/guix.texi:8263 doc/guix.texi:21965 -#: doc/guix.texi:21966 -#, no-wrap -msgid "Security Updates" -msgstr "Mises à jour de sécurité" - -#. type: menuentry -#: doc/guix.texi:201 doc/guix.texi:8263 -msgid "Deploying security fixes quickly." -msgstr "Déployer des correctifs de sécurité rapidement." - -#. type: section -#: doc/guix.texi:201 doc/guix.texi:8263 doc/guix.texi:22085 -#: doc/guix.texi:22086 -#, no-wrap -msgid "Package Modules" -msgstr "Modules de paquets" - -#. type: menuentry -#: doc/guix.texi:201 doc/guix.texi:8263 -msgid "Packages from the programmer's viewpoint." -msgstr "Les paquets du point de vu du programmeur." - -#. type: section -#: doc/guix.texi:201 doc/guix.texi:267 doc/guix.texi:8263 doc/guix.texi:22139 -#: doc/guix.texi:22140 -#, no-wrap -msgid "Packaging Guidelines" -msgstr "Consignes d'empaquetage" - -#. type: menuentry -#: doc/guix.texi:201 doc/guix.texi:8263 -msgid "Growing the distribution." -msgstr "Faire grandir la distribution." - -#. type: section -#: doc/guix.texi:201 doc/guix.texi:8263 doc/guix.texi:22590 -#: doc/guix.texi:22591 -#, no-wrap -msgid "Bootstrapping" -msgstr "Bootstrapping" - -#. type: menuentry -#: doc/guix.texi:201 doc/guix.texi:8263 -msgid "GNU/Linux built from scratch." -msgstr "GNU/Linux depuis zéro." - -#. type: node -#: doc/guix.texi:201 doc/guix.texi:8263 doc/guix.texi:22774 -#, no-wrap -msgid "Porting" -msgstr "Porter" - -#. type: menuentry -#: doc/guix.texi:201 doc/guix.texi:8263 -msgid "Targeting another platform or kernel." -msgstr "Cibler une autre plateforme ou un autre noyau." - -#. type: subsection -#: doc/guix.texi:211 doc/guix.texi:1131 doc/guix.texi:8300 doc/guix.texi:8302 -#: doc/guix.texi:8303 -#, no-wrap -msgid "Limitations" -msgstr "Limitations" - -#. type: menuentry -#: doc/guix.texi:211 doc/guix.texi:8300 -msgid "What you can expect." -msgstr "Ce à quoi vous attendre." - -#. type: subsection -#: doc/guix.texi:211 doc/guix.texi:8300 doc/guix.texi:8346 doc/guix.texi:8347 -#, no-wrap -msgid "Hardware Considerations" -msgstr "Considérations matérielles" - -#. type: menuentry -#: doc/guix.texi:211 doc/guix.texi:8300 -msgid "Supported hardware." -msgstr "Matériel supporté." - -#. type: subsection -#: doc/guix.texi:211 doc/guix.texi:8300 doc/guix.texi:8381 doc/guix.texi:8382 -#, no-wrap -msgid "USB Stick and DVD Installation" -msgstr "Installation depuis une clef USB ou un DVD" - -#. type: menuentry -#: doc/guix.texi:211 doc/guix.texi:8300 -msgid "Preparing the installation medium." -msgstr "Préparer le média d'installation." - -#. type: subsection -#: doc/guix.texi:211 doc/guix.texi:8300 doc/guix.texi:8479 doc/guix.texi:8480 -#, no-wrap -msgid "Preparing for Installation" -msgstr "Préparer l'installation" - -#. type: menuentry -#: doc/guix.texi:211 doc/guix.texi:8300 -msgid "Networking, partitioning, etc." -msgstr "Réseau, partitionnement, etc." - -#. type: subsection -#: doc/guix.texi:211 doc/guix.texi:8300 doc/guix.texi:8718 doc/guix.texi:8719 -#, no-wrap -msgid "Proceeding with the Installation" -msgstr "Effectuer l'installation" - -#. type: menuentry -#: doc/guix.texi:211 doc/guix.texi:8300 -msgid "The real thing." -msgstr "Pour de vrai." - -#. type: node -#: doc/guix.texi:211 doc/guix.texi:8300 doc/guix.texi:8815 -#, no-wrap -msgid "Installing GuixSD in a VM" -msgstr "Installer GuixSD dans une VM" - -#. type: menuentry -#: doc/guix.texi:211 doc/guix.texi:8300 -msgid "GuixSD playground." -msgstr "Jouer avec GuixSD@." - -#. type: subsection -#: doc/guix.texi:211 doc/guix.texi:8300 doc/guix.texi:8869 doc/guix.texi:8870 -#, no-wrap -msgid "Building the Installation Image" -msgstr "Construire l'image d'installation" - -#. type: menuentry -#: doc/guix.texi:211 doc/guix.texi:8300 -msgid "How this comes to be." -msgstr "D'où vient tout cela." - -#. type: subsection -#: doc/guix.texi:229 doc/guix.texi:8941 doc/guix.texi:8943 doc/guix.texi:8944 -#, no-wrap -msgid "Using the Configuration System" -msgstr "Utiliser le système de configuration" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "Customizing your GNU system." -msgstr "Personnaliser votre système GNU@." - -#. type: node -#: doc/guix.texi:229 doc/guix.texi:8941 doc/guix.texi:9159 -#, no-wrap -msgid "operating-system Reference" -msgstr "Référence de système d'exploitation" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "Detail of operating-system declarations." -msgstr "Détail sur la déclaration de système d'exploitation." - -#. type: subsection -#: doc/guix.texi:229 doc/guix.texi:8941 doc/guix.texi:9313 doc/guix.texi:9314 -#, no-wrap -msgid "File Systems" -msgstr "Systèmes de fichiers" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "Configuring file system mounts." -msgstr "Configurer les montages de systèmes de fichiers." - -#. type: subsection -#: doc/guix.texi:229 doc/guix.texi:8941 doc/guix.texi:9478 doc/guix.texi:9479 -#, no-wrap -msgid "Mapped Devices" -msgstr "Périphériques mappés" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "Block device extra processing." -msgstr "Gestion des périphériques de bloc." - -#. type: subsection -#: doc/guix.texi:229 doc/guix.texi:8941 doc/guix.texi:9599 doc/guix.texi:9600 -#, no-wrap -msgid "User Accounts" -msgstr "Comptes utilisateurs" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "Specifying user accounts." -msgstr "Spécifier des comptes utilisateurs." - -#. type: subsection -#: doc/guix.texi:229 doc/guix.texi:1454 doc/guix.texi:8941 doc/guix.texi:9734 -#: doc/guix.texi:9735 -#, no-wrap -msgid "Locales" -msgstr "Régionalisation" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "Language and cultural convention settings." -msgstr "Paramétrer la langue et les conventions culturelles." - -#. type: subsection -#: doc/guix.texi:229 doc/guix.texi:231 doc/guix.texi:8941 doc/guix.texi:9874 -#: doc/guix.texi:9875 -#, no-wrap -msgid "Services" -msgstr "Services" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "Specifying system services." -msgstr "Spécifier les services du système." - -#. type: subsection -#: doc/guix.texi:229 doc/guix.texi:8941 doc/guix.texi:20204 -#: doc/guix.texi:20205 -#, no-wrap -msgid "Setuid Programs" -msgstr "Programmes setuid" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "Programs running with root privileges." -msgstr "Programmes tournant avec les privilèges root." - -#. type: subsection -#: doc/guix.texi:229 doc/guix.texi:1599 doc/guix.texi:8941 doc/guix.texi:20250 -#: doc/guix.texi:20251 -#, no-wrap -msgid "X.509 Certificates" -msgstr "Certificats X.509" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "Authenticating HTTPS servers." -msgstr "Authentifier les serveurs HTTPS@." - -#. type: subsection -#: doc/guix.texi:229 doc/guix.texi:1497 doc/guix.texi:8941 doc/guix.texi:20313 -#: doc/guix.texi:20314 -#, no-wrap -msgid "Name Service Switch" -msgstr "Name Service Switch" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "Configuring libc's name service switch." -msgstr "Configurer le « name service switch » de la libc." - -#. type: subsection -#: doc/guix.texi:229 doc/guix.texi:8941 doc/guix.texi:20451 -#: doc/guix.texi:20452 -#, no-wrap -msgid "Initial RAM Disk" -msgstr "Disque de RAM initial" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "Linux-Libre bootstrapping." -msgstr "Démarrage de Linux-Libre." - -#. type: subsection -#: doc/guix.texi:229 doc/guix.texi:8941 doc/guix.texi:20611 -#: doc/guix.texi:20612 -#, no-wrap -msgid "Bootloader Configuration" -msgstr "Configuration du chargeur d'amorçage" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "Configuring the boot loader." -msgstr "Configurer le chargeur d'amorçage." - -#. type: node -#: doc/guix.texi:229 doc/guix.texi:8941 doc/guix.texi:20782 -#, no-wrap -msgid "Invoking guix system" -msgstr "Invoquer guix system" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "Instantiating a system configuration." -msgstr "Instantier une configuration du système." - -#. type: node -#: doc/guix.texi:229 doc/guix.texi:8941 doc/guix.texi:21207 -#, no-wrap -msgid "Running GuixSD in a VM" -msgstr "Lancer GuixSD dans une VM" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "How to run GuixSD in a virtual machine." -msgstr "Comment lancer GuixSD dans une machine virtuelle." - -#. type: subsection -#: doc/guix.texi:229 doc/guix.texi:260 doc/guix.texi:8941 doc/guix.texi:21318 -#: doc/guix.texi:21319 -#, no-wrap -msgid "Defining Services" -msgstr "Définir des services" - -#. type: menuentry -#: doc/guix.texi:229 doc/guix.texi:8941 -msgid "Adding new service definitions." -msgstr "Ajouter de nouvelles définitions de services." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:9949 doc/guix.texi:9950 -#, no-wrap -msgid "Base Services" -msgstr "Services de base" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "Essential system services." -msgstr "Services systèmes essentiels." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:10733 -#: doc/guix.texi:10734 -#, no-wrap -msgid "Scheduled Job Execution" -msgstr "Exécution de tâches planifiées" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "The mcron service." -msgstr "Le service mcron." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:10828 -#: doc/guix.texi:10829 -#, no-wrap -msgid "Log Rotation" -msgstr "Rotation des journaux" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "The rottlog service." -msgstr "Le service rottlog." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:10930 -#: doc/guix.texi:10931 -#, no-wrap -msgid "Networking Services" -msgstr "Services réseau" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "Network setup, SSH daemon, etc." -msgstr "Paramétres réseau, démon SSH, etc." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:11698 -#: doc/guix.texi:11699 -#, no-wrap -msgid "X Window" -msgstr "Système de fenêtrage X" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "Graphical display." -msgstr "Affichage graphique." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:11982 -#: doc/guix.texi:11983 -#, no-wrap -msgid "Printing Services" -msgstr "Services d'impression" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "Local and remote printer support." -msgstr "Support pour les imprimantes locales et distantes." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:12819 -#: doc/guix.texi:12820 -#, no-wrap -msgid "Desktop Services" -msgstr "Services de bureaux" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "D-Bus and desktop services." -msgstr "D-Bus et les services de bureaux." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:13127 -#: doc/guix.texi:13128 -#, no-wrap -msgid "Sound Services" -msgstr "Services de son" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "ALSA and Pulseaudio services." -msgstr "Services ALSA et Pulseaudio." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:13169 -#: doc/guix.texi:13170 -#, no-wrap -msgid "Database Services" -msgstr "Services de bases de données" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "SQL databases, key-value stores, etc." -msgstr "Bases SQL, clefs-valeurs, etc." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:13293 -#: doc/guix.texi:13294 -#, no-wrap -msgid "Mail Services" -msgstr "Services de courriels" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "IMAP, POP3, SMTP, and all that." -msgstr "IMAP, POP3, SMTP, et tout ça." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:14745 -#: doc/guix.texi:14746 -#, no-wrap -msgid "Messaging Services" -msgstr "Services de messagerie" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "Messaging services." -msgstr "Services de messagerie." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:15216 -#: doc/guix.texi:15217 -#, no-wrap -msgid "Telephony Services" -msgstr "Services de téléphonie" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "Telephony services." -msgstr "Services de téléphonie." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:15421 -#: doc/guix.texi:15422 -#, no-wrap -msgid "Monitoring Services" -msgstr "Services de surveillance" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "Monitoring services." -msgstr "Services de surveillance." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:15574 -#: doc/guix.texi:15575 -#, no-wrap -msgid "Kerberos Services" -msgstr "Services Kerberos" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "Kerberos services." -msgstr "Services Kerberos." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:15700 -#: doc/guix.texi:15701 -#, no-wrap -msgid "Web Services" -msgstr "Services web" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "Web servers." -msgstr "Services web." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:16371 -#: doc/guix.texi:16372 -#, no-wrap -msgid "Certificate Services" -msgstr "Services de certificats" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "TLS certificates via Let's Encrypt." -msgstr "Certificats TLS via Let's Encrypt." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:16517 -#: doc/guix.texi:16518 -#, no-wrap -msgid "DNS Services" -msgstr "Services DNS" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "DNS daemons." -msgstr "Démons DNS@." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:16978 -#: doc/guix.texi:16979 -#, no-wrap -msgid "VPN Services" -msgstr "Services VPN" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "VPN daemons." -msgstr "Démons VPN" - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:17336 -#: doc/guix.texi:17337 -#, no-wrap -msgid "Network File System" -msgstr "Système de fichiers en réseau" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "NFS related services." -msgstr "Services liés à NFS@." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:17451 -#: doc/guix.texi:17452 -#, no-wrap -msgid "Continuous Integration" -msgstr "Intégration continue" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "The Cuirass service." -msgstr "Le service Cuirass." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:17547 -#: doc/guix.texi:17548 -#, no-wrap -msgid "Power management Services" -msgstr "Services de gestion de l'énergie" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "The TLP tool." -msgstr "L'outil TLP@." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:18075 -#: doc/guix.texi:18076 -#, no-wrap -msgid "Audio Services" -msgstr "Services audio" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "The MPD." -msgstr "MPD@." - -#. type: node -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:18125 -#, no-wrap -msgid "Virtualization Services" -msgstr "Services de virtualisation" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "Virtualization services." -msgstr "Services de virtualisation." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:18918 -#: doc/guix.texi:18919 -#, no-wrap -msgid "Version Control Services" -msgstr "Services de contrôle de version" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "Providing remote access to Git repositories." -msgstr "Fournit des accès distants à des dépôts Git." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:20012 -#: doc/guix.texi:20013 -#, no-wrap -msgid "Game Services" -msgstr "Services de jeu" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "Game servers." -msgstr "Serveurs de jeu." - -#. type: subsubsection -#: doc/guix.texi:258 doc/guix.texi:9947 doc/guix.texi:20043 -#: doc/guix.texi:20044 -#, no-wrap -msgid "Miscellaneous Services" -msgstr "Services divers" - -#. type: menuentry -#: doc/guix.texi:258 doc/guix.texi:9947 -msgid "Other services." -msgstr "D'autres services." - -#. type: subsubsection -#: doc/guix.texi:265 doc/guix.texi:21330 doc/guix.texi:21332 -#: doc/guix.texi:21333 -#, no-wrap -msgid "Service Composition" -msgstr "Composition de services" - -#. type: menuentry -#: doc/guix.texi:265 doc/guix.texi:21330 -msgid "The model for composing services." -msgstr "Le modèle de composition des services." - -#. type: subsubsection -#: doc/guix.texi:265 doc/guix.texi:21330 doc/guix.texi:21388 -#: doc/guix.texi:21389 -#, no-wrap -msgid "Service Types and Services" -msgstr "Types service et services" - -#. type: menuentry -#: doc/guix.texi:265 doc/guix.texi:21330 -msgid "Types and services." -msgstr "Types et services." - -#. type: subsubsection -#: doc/guix.texi:265 doc/guix.texi:21330 doc/guix.texi:21525 -#: doc/guix.texi:21526 -#, no-wrap -msgid "Service Reference" -msgstr "Référence de service" - -#. type: menuentry -#: doc/guix.texi:265 doc/guix.texi:21330 -msgid "API reference." -msgstr "Référence de l'API@." - -#. type: subsubsection -#: doc/guix.texi:265 doc/guix.texi:21330 doc/guix.texi:21750 -#: doc/guix.texi:21751 -#, no-wrap -msgid "Shepherd Services" -msgstr "Services Shepherd" - -#. type: menuentry -#: doc/guix.texi:265 doc/guix.texi:21330 -msgid "A particular type of service." -msgstr "Un type de service particulier." - -#. type: subsection -#: doc/guix.texi:276 doc/guix.texi:22214 doc/guix.texi:22216 -#: doc/guix.texi:22217 -#, no-wrap -msgid "Software Freedom" -msgstr "Liberté logiciel" - -#. type: menuentry -#: doc/guix.texi:276 doc/guix.texi:22214 -msgid "What may go into the distribution." -msgstr "Ce que la distribution peut contenir." - -#. type: subsection -#: doc/guix.texi:276 doc/guix.texi:22214 doc/guix.texi:22244 -#: doc/guix.texi:22245 -#, no-wrap -msgid "Package Naming" -msgstr "Conventions de nommage" - -#. type: menuentry -#: doc/guix.texi:276 doc/guix.texi:22214 -msgid "What's in a name?" -msgstr "Qu'est-ce qu'un bon nom ?" - -#. type: subsection -#: doc/guix.texi:276 doc/guix.texi:22214 doc/guix.texi:22269 -#: doc/guix.texi:22270 -#, no-wrap -msgid "Version Numbers" -msgstr "Numéros de version" - -#. type: menuentry -#: doc/guix.texi:276 doc/guix.texi:22214 -msgid "When the name is not enough." -msgstr "Lorsque le nom n'est pas suffisant." - -#. type: subsection -#: doc/guix.texi:276 doc/guix.texi:22214 doc/guix.texi:22360 -#: doc/guix.texi:22361 -#, no-wrap -msgid "Synopses and Descriptions" -msgstr "Synopsis et descriptions" - -#. type: menuentry -#: doc/guix.texi:276 doc/guix.texi:22214 -msgid "Helping users find the right package." -msgstr "Aider les utilisateurs à trouver le bon paquet." - -#. type: subsection -#: doc/guix.texi:276 doc/guix.texi:22214 doc/guix.texi:22440 -#: doc/guix.texi:22441 -#, no-wrap -msgid "Python Modules" -msgstr "Modules python" - -#. type: menuentry -#: doc/guix.texi:276 doc/guix.texi:22214 -msgid "A touch of British comedy." -msgstr "Un peu de comédie anglaise." - -#. type: subsection -#: doc/guix.texi:276 doc/guix.texi:22214 doc/guix.texi:22515 -#: doc/guix.texi:22516 -#, no-wrap -msgid "Perl Modules" -msgstr "Modules perl" - -#. type: menuentry -#: doc/guix.texi:276 doc/guix.texi:22214 -msgid "Little pearls." -msgstr "Petites perles." - -#. type: subsection -#: doc/guix.texi:276 doc/guix.texi:22214 doc/guix.texi:22531 -#: doc/guix.texi:22532 -#, no-wrap -msgid "Java Packages" -msgstr "Paquets java" - -#. type: menuentry -#: doc/guix.texi:276 doc/guix.texi:22214 -msgid "Coffee break." -msgstr "Pause café." - -#. type: subsection -#: doc/guix.texi:276 doc/guix.texi:22214 doc/guix.texi:22551 -#: doc/guix.texi:22552 -#, no-wrap -msgid "Fonts" -msgstr "Polices de caractères" - -#. type: menuentry -#: doc/guix.texi:276 doc/guix.texi:22214 -msgid "Fond of fonts." -msgstr "À fond les fontes." - -#. type: cindex -#: doc/guix.texi:299 -#, no-wrap -msgid "purpose" -msgstr "but" - -#. type: Plain text -#: doc/guix.texi:306 -msgid "GNU Guix@footnote{``Guix'' is pronounced like ``geeks'', or ``ɡiːks'' using the international phonetic alphabet (IPA).} is a package management tool for the GNU system. Guix makes it easy for unprivileged users to install, upgrade, or remove 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 » se prononce comme « geeks » (en prononçant le « s »), ou « ɡiːks » dans l'alphabet phonétique international (API).} est un outil de gestion de paquets pour le système GNU@. Guix facilite pour les utilisateurs non privilégiés l'installation, la mise à jour et la suppression de paquets, la restauration à un ensemble de paquets précédent, la construction de paquets depuis les sources et plus généralement aide à la création et à la maintenance d'environnements logiciels." - -#. type: cindex -#: doc/guix.texi:307 -#, no-wrap -msgid "user interfaces" -msgstr "interfaces utilisateurs" - -#. type: Plain text -#: doc/guix.texi:312 -msgid "Guix provides a command-line package management interface (@pxref{Invoking guix package}), a set of command-line utilities (@pxref{Utilities}), as well as Scheme programming interfaces (@pxref{Programming Interface})." -msgstr "Guix fournit une interface de gestion des paquets par la ligne de commande (@pxref{Invoquer guix package}), un ensemble d'utilitaires en ligne de commande (@pxref{Utilitaires}) ainsi que des interfaces de programmation Scheme (@pxref{Interface de programmation})." - -#. type: cindex -#: doc/guix.texi:312 -#, no-wrap -msgid "build daemon" -msgstr "démon de construction" - -#. type: Plain text -#: doc/guix.texi:316 -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 "Son @dfn{démon de construction} est responsable de la construction des paquets pour les utilisateurs (@pxref{Paramétrer le démon}) et du téléchargement des binaires pré-construits depuis les sources autorisées (@pxref{Substituts})." - -#. type: cindex -#: doc/guix.texi:317 -#, no-wrap -msgid "extensibility of the distribution" -msgstr "extensibilité de la distribution" - -#. type: cindex -#: doc/guix.texi:318 doc/guix.texi:22107 -#, no-wrap -msgid "customization, of packages" -msgstr "personnalisation, des paquets" - -#. type: Plain text -#: doc/guix.texi:327 -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 contient de nombreuses définitions de paquet GNU et non-GNU qui respectent tous les @uref{https://www.gnu.org/philosophy/free-sw.fr.html, libertés de l'utilisateur}. Il est @emph{extensible} : les utilisateurs peuvent écrire leurs propres définitions de paquets (@pxref{Defining Packages}) et les rendre disponibles dans des modules de paquets indépendants (@pxref{Package Modules}). Il est aussi @emph{personnalisable} : les utilisateurs peuvent @emph{dériver} des définitions de paquets spécialisées à partir de définitions existantes, même depuis la ligne de commande (@pxref{Package Transformation Options})." - -#. type: cindex -#: doc/guix.texi:328 doc/guix.texi:8194 doc/guix.texi:8272 -#, no-wrap -msgid "Guix System Distribution" -msgstr "Distribution Système Guix" - -#. type: cindex -#: doc/guix.texi:329 doc/guix.texi:8195 -#, no-wrap -msgid "GuixSD" -msgstr "GuixSD" - -#. type: Plain text -#: doc/guix.texi:338 -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 part of the standalone @dfn{Guix System Distribution} or GuixSD (@pxref{GNU Distribution}). With GNU@tie{}GuixSD, 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})." -msgstr "Vous pouvez installer GNU@tie{}Guix sur un système GNU/Linux existant pour compléter les outils disponibles sans interférence (@pxref{Installation}) ou vous pouvez l'utiliser à travers la @dfn{Distribution Système Guix} ou GuixSD (@pxref{Distribution GNU}) distincte. Avec GNU@tie{}GuixSD, vous @emph{déclarez} tous les aspects de la configuration du système d'exploitation et Guix s'occupe de créer la configuration d'une manière transactionnelle, reproductible et sans état (@pxref{Configuration système})." - -#. type: cindex -#: doc/guix.texi:339 -#, no-wrap -msgid "functional package management" -msgstr "gestion de paquet fonctionnelle" - -#. type: Plain text -#: doc/guix.texi:354 -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 "Sous le capot, Guix implémente la discipline de @dfn{gestion de paquet fonctionnel} inventé par Nix (@pxref{Remerciements}). Dans Guix le processus de construction et d'installation des paquets est vu comme une @emph{fonction} dans le sens mathématique du terme. Cette fonction a des entrées (comme des scripts de construction, un compilateur et des bibliothèques) et renvoie un paquet installé. En tant que fonction pure, son résultat ne dépend que de ses entrées. Par exemple, il ne peut pas faire référence à des logiciels ou des scripts qui n'ont pas été explicitement passés en entrée. Une fonction de construction produit toujours le même résultat quand on lui donne le même ensemble d'entrée. Elle ne peut pas modifier l'environnement du système en cours d'exécution d'aucune manière ; par exemple elle ne peut pas créer, modifier ou supprimer des fichiers en dehors de ses répertoires de construction et d'installation. Ce résultat s'obtient en lançant les processus de construction dans des environnements isolés (ou des @dfn{conteneurs}) où seules les entrées explicites sont visibles." - -#. type: cindex -#: doc/guix.texi:355 doc/guix.texi:4324 -#, no-wrap -msgid "store" -msgstr "dépôt" - -#. type: Plain text -#: doc/guix.texi:362 -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 "Le résultat des fonctions de construction de paquets est mis en @dfn{cache} dans le système de fichier, dans répertoire spécial appelé le @dfn{dépôt} (@pxref{The Store}). Chaque paquet est installé dans son répertoire propre dans le dépôt — par défaut dans @file{/gnu/store}. Le nom du répertoire contient un hash de toutes les entrées utilisées pour construire le paquet ; ainsi, changer une entrée donnera un nom de répertoire différent." - -#. type: Plain text -#: doc/guix.texi:366 -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 "Cette approche est le fondement des fonctionnalités les plus importante de Guix : le support des mises à jour des paquets et des retours en arrière transactionnels, l'installation différenciée par utilisateur et le ramassage de miettes pour les paquets (@pxref{Fonctionnalités})." - -#. type: cindex -#: doc/guix.texi:372 -#, no-wrap -msgid "installing Guix" -msgstr "installer Guix" - -#. type: Plain text -#: doc/guix.texi:377 -msgid "GNU Guix is available for download from its website at @url{http://www.gnu.org/software/guix/}. This section describes the software requirements of Guix, as well as how to install it and get ready to use it." -msgstr "GNU Guix est disponible au téléchargement depuis son site web sur @url{http://www.gnu.org/software/guix/}. Cette section décrit les pré-requis logiciels de Guix ainsi que la manière de l'installer et de se préparer à l'utiliser." - -#. type: Plain text -#: doc/guix.texi:382 -msgid "Note that 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}." -msgstr "Remarquez que cette section concerne l'installation du gestionnaire de paquet, ce qui se fait sur un système GNU/Linux en cours d'exécution. Si vous souhaitez plutôt installer le système d'exploitation GNU complet, @pxref{System Installation}." - -#. type: cindex -#: doc/guix.texi:383 doc/guix.texi:1449 -#, no-wrap -msgid "foreign distro" -msgstr "distro extérieure" - -#. type: Plain text -#: doc/guix.texi:389 -msgid "When installed on a running GNU/Linux system---thereafter called a @dfn{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 "Lorsqu'il est installé sur an système GNU/Linux existant — ci-après nommé @dfn{distro extérieure} — GNU@tie{}Guix complète les outils disponibles sans interférence. Ses données se trouvent exclusivement dans deux répertoires, typiquement @file{/gnu/store} et @file{/var/guix} ; les autres fichiers de votre système comme @file{/etc} sont laissés intacts." - -#. type: Plain text -#: doc/guix.texi:392 -msgid "Once installed, Guix can be updated by running @command{guix pull} (@pxref{Invoking guix pull})." -msgstr "Une fois installé, Guix peut être mis à jour en lançant @command{guix pull} (@pxref{Invoking guix pull})." - -#. type: cindex -#: doc/guix.texi:405 -#, no-wrap -msgid "installing Guix from binaries" -msgstr "installer Guix depuis les binaires" - -#. type: Plain text -#: doc/guix.texi:411 -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 "Cette section décrit comment intaller Guix sur un système quelconque depuis un archive autonome qui fournit les binaires pour Guix et toutes ses dépendances. C'est souvent plus rapide que d'installer depuis les sources, ce qui est décrit dans les sections suivantes. Le seul pré-requis est d'avoir GNU@tie{}tar et Xz." - -#. type: Plain text -#: doc/guix.texi:416 -msgid "We provide a @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell installer script}, which automates the download, installation, and initial configuration of Guix. It should be run as the root user." -msgstr "Nous fournissons un script @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, script d'intallation shell} qui automatise le téléchargement, l'installation et la configuration initiale de Guix. Il devrait être lancé en tant qu'utilisateur root." - -#. type: Plain text -#: doc/guix.texi:418 -msgid "Installing goes along these lines:" -msgstr "L'installation se comme ceci :" - -#. type: cindex -#: doc/guix.texi:421 -#, no-wrap -msgid "downloading Guix binary" -msgstr "téléchargement du Guix binaire" - -#. type: enumerate -#: doc/guix.texi:426 -msgid "Download the binary tarball from @indicateurl{ftp://alpha.gnu.org/gnu/guix/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 "Téléchargez l'archive binaire depuis @indicateurl{ftp://alpha.gnu.org/gnu/guix/guix-binary-@value{VERSION}.@var{système}.tar.xz}, où @var{système} est @code{x86_64-linux} pour une machine @code{x86_64} sur laquelle tourne déjà le noyau Linux, etc." - -#. type: enumerate -#: doc/guix.texi:430 -msgid "Make sure to download the associated @file{.sig} file and to verify the authenticity of the tarball against it, along these lines:" -msgstr "Assurez-vous de télécharger le fichier @file{.sig} associé et de vérifier l'authenticité de l'archive avec, comme ceci :" - -#. type: example -#: doc/guix.texi:434 -#, no-wrap +"Produit le script de démarrage du système d'exploitation,\n" +"qui est appelé par l’image de démarrage une fois que le système\n" +"de fichiers racine est monté." + +#: gnu/services.scm:422 msgid "" -"$ wget ftp://alpha.gnu.org/gnu/guix/guix-binary-@value{VERSION}.@var{system}.tar.xz.sig\n" -"$ gpg --verify guix-binary-@value{VERSION}.@var{system}.tar.xz.sig\n" +"Delete files from @file{/tmp}, @file{/var/run}, and other\n" +"temporary locations at boot time." msgstr "" -"$ wget ftp://alpha.gnu.org/gnu/guix/guix-binary-@value{VERSION}.@var{système}.tar.xz.sig\n" -"$ gpg --verify guix-binary-@value{VERSION}.@var{système}.tar.xz.sig\n" - -#. type: Plain text -#: doc/guix.texi:438 doc/guix.texi:8408 -msgid "If that command fails because you do not have the required public key, then run this command to import it:" -msgstr "Si cette commande échoue parce que vous n'avez pas la clef publique requise, lancez cette commande pour l'importer :" - -#. type: example -#: doc/guix.texi:441 doc/guix.texi:8411 -#, no-wrap -msgid "$ gpg --keyserver pgp.mit.edu --recv-keys @value{OPENPGP-SIGNING-KEY-ID}\n" -msgstr "$ gpg --keyserver pgp.mit.edu --recv-keys @value{OPENPGP-SIGNING-KEY-ID}\n" - -#. type: Plain text -#: doc/guix.texi:446 doc/guix.texi:8416 -msgid "and rerun the @code{gpg --verify} command." -msgstr "et relancez la commande @code{gpg --verify}." - -#. type: enumerate -#: doc/guix.texi:450 -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 "Maintenant, vous devez devenir l'utilisateur @code{root}. En fonction de votre distribution, vous devrez lancer @code{su -} ou @code{sudo -i}. En tant que @code{root}, lancez :" - -#. type: example -#: doc/guix.texi:456 -#, no-wrap +"Supprime les fichiers de @file{/tmp}, @file{/var/run} et d'autres\n" +"emplacements temporaires au démarrage." + +#: gnu/services.scm:476 msgid "" -"# cd /tmp\n" -"# tar --warning=no-timestamp -xf \\\n" -" guix-binary-@value{VERSION}.@var{system}.tar.xz\n" -"# mv var/guix /var/ && mv gnu /\n" +"Run @dfn{activation} code at boot time and upon\n" +"@command{guix system reconfigure} completion." msgstr "" -"# cd /tmp\n" -"# tar --warning=no-timestamp -xf \\\n" -" guix-binary-@value{VERSION}.@var{système}.tar.xz\n" -"# mv var/guix /var/ && mv gnu /\n" - -#. type: enumerate -#: doc/guix.texi:461 -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 "Cela crée @file{/gnu/store} (@pxref{The Store}) and @file{/var/guix}. Ce deuxième dossier contient un profil pret à être utilisé pour @code{root} (voir les étapes suivantes)." - -#. type: enumerate -#: doc/guix.texi:464 -msgid "Do @emph{not} unpack the tarball on a working Guix system since that would overwrite its own essential files." -msgstr "Ne décompressez @emph{pas} l'archive sur un système Guix lancé car cela écraserait ses propres fichiers essentiels." - -#. type: enumerate -#: doc/guix.texi:474 -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 "L'option @code{--warning=no-timestamp} s'assure que GNU@tie{}tar ne produise pas d'avertissement disant que « l'horodatage est trop vieux pour être plausible » (ces avertissements étaient produits par GNU@tie{}tar 1.26 et précédents ; les versions récentes n'ont pas ce problème). Cela vient du fait que les fichiers de l'archive ont pour date de modification zéro (ce qui signifie le 1er janvier 1970). C'est fait exprès pour s'assurer que le contenu de l'archive ne dépende pas de la date de création, ce qui la rend reproductible." - -#. type: enumerate -#: doc/guix.texi:477 -msgid "Make @code{root}'s profile available under @file{~root/.guix-profile}:" -msgstr "Rendez le profil de @code{root} disponible sous @file{~root/.guix-profile} :" - -#. type: example -#: doc/guix.texi:481 -#, no-wrap +"Lance le code d’@dfn{activation} au démarrage et à la\n" +"fin de @command{guix system reconfigure}." + +#: gnu/services.scm:527 msgid "" -"# ln -sf /var/guix/profiles/per-user/root/guix-profile \\\n" -" ~root/.guix-profile\n" +"Add special files to the root file system---e.g.,\n" +"@file{/usr/bin/env}." msgstr "" -"# ln -sf /var/guix/profiles/per-user/root/guix-profile \\\n" -" ~root/.guix-profile\n" +"Ajoute des fichiers spéciaux au système de fichiers\n" +"racine — p. ex. @file{/usr/bin/env}." -#. type: enumerate -#: doc/guix.texi:485 -msgid "Source @file{etc/profile} to augment @code{PATH} and other relevant environment variables:" -msgstr "Sourcez @file{etc/profile} pour augmenter @code{PATH} et les autres variables d'environnement nécessaires :" +#: gnu/services.scm:563 +msgid "Populate the @file{/etc} directory." +msgstr "Rempli le répertoire @file{/etc}." -#. type: example -#: doc/guix.texi:489 -#, no-wrap +#: gnu/services.scm:580 msgid "" -"# GUIX_PROFILE=\"`echo ~root`/.guix-profile\" ; \\\n" -" source $GUIX_PROFILE/etc/profile\n" +"Populate @file{/run/setuid-programs} with the specified\n" +"executables, making them setuid-root." msgstr "" -"# GUIX_PROFILE=\"`echo ~root`/.guix-profile\" ; \\\n" -" source $GUIX_PROFILE/etc/profile\n" - -#. type: enumerate -#: doc/guix.texi:494 -msgid "Create the group and user accounts for build users as explained below (@pxref{Build Environment Setup})." -msgstr "Créez le groupe et les comptes utilisateurs pour les utilisateurs de construction comme expliqué plus loin (@pxref{Build Environment Setup})." - -#. type: enumerate -#: doc/guix.texi:497 -msgid "Run the daemon, and set it to automatically start on boot." -msgstr "Lancez le démon et paramétrez-le pour démarrer automatiquement au démarrage." - -#. type: enumerate -#: doc/guix.texi:500 -msgid "If your host distro uses the systemd init system, this can be achieved with these commands:" -msgstr "Si votre distribution hôte utilise le système d'initialisation systemd, cela peut se faire avec ces commandes :" - -#. type: example -#: doc/guix.texi:512 -#, no-wrap +"Rempli @file{/run/setuid-programs} avec les exécutables\n" +"spécifiés, en les rendant setuid-root." + +#: gnu/services.scm:600 msgid "" -"# cp ~root/.guix-profile/lib/systemd/system/guix-daemon.service \\\n" -" /etc/systemd/system/\n" -"# systemctl start guix-daemon && systemctl enable guix-daemon\n" +"This is the @dfn{system profile}, available as\n" +"@file{/run/current-system/profile}. It contains packages that the sysadmin\n" +"wants to be globally available to all the system users." msgstr "" -"# cp ~root/.guix-profile/lib/systemd/system/guix-daemon.service \\\n" -" /etc/systemd/system/\n" -"# systemctl start guix-daemon && systemctl enable guix-daemon\n" - -#. type: itemize -#: doc/guix.texi:515 doc/guix.texi:7845 -msgid "If your host distro uses the Upstart init system:" -msgstr "Si votre distribution hôte utilise le système d'initialisation Upstart :" - -#. type: example -#: doc/guix.texi:520 -#, no-wrap +"C'est le @dfn{profil système}, disponible dans\n" +"@file{/run/current-system/profile}. Il contient des paquets que l'administrateur\n" +"système souhaite rendre disponible à tous les utilisateurs du système." + +#: gnu/services.scm:620 msgid "" -"# initctl reload-configuration\n" -"# cp ~root/.guix-profile/lib/upstart/system/guix-daemon.conf /etc/init/\n" -"# start guix-daemon\n" +"Make ``firmware'' files loadable by the operating system\n" +"kernel. Firmware may then be uploaded to some of the machine's devices, such\n" +"as Wifi cards." msgstr "" -"# initctl reload-configuration\n" -"# cp ~root/.guix-profile/lib/upstart/system/guix-daemon.conf /etc/init/\n" -"# start guix-daemon\n" - -#. type: enumerate -#: doc/guix.texi:523 -msgid "Otherwise, you can still start the daemon manually with:" -msgstr "Sinon, vous pouvez toujours démarrer le démon manuellement avec :" - -#. type: example -#: doc/guix.texi:526 -#, no-wrap -msgid "# ~root/.guix-profile/bin/guix-daemon --build-users-group=guixbuild\n" -msgstr "# ~root/.guix-profile/bin/guix-daemon --build-users-group=guixbuild\n" - -#. type: enumerate -#: doc/guix.texi:531 -msgid "Make the @command{guix} command available to other users on the machine, for instance with:" -msgstr "Rendez la commande @command{guix} disponible pour les autres utilisateurs sur la machine, par exemple avec :" - -#. type: example -#: doc/guix.texi:536 -#, no-wrap +"Rend les fichiers « firmware » chargeables par le noyau du système d'exploitation.\n" +"Les micro-logiciels peuvent ensuite être envoyés à certains périphériques de la\n" +"machine, comme une carte wifi." + +#: gnu/services.scm:651 msgid "" -"# mkdir -p /usr/local/bin\n" -"# cd /usr/local/bin\n" -"# ln -s /var/guix/profiles/per-user/root/guix-profile/bin/guix\n" +"Register garbage-collector roots---i.e., store items that\n" +"will not be reclaimed by the garbage collector." msgstr "" -"# mkdir -p /usr/local/bin\n" -"# cd /usr/local/bin\n" -"# ln -s /var/guix/profiles/per-user/root/guix-profile/bin/guix\n" - -#. type: enumerate -#: doc/guix.texi:540 -msgid "It is also a good idea to make the Info version of this manual available there:" -msgstr "C'est aussi une bonne idée de rendre la version Info de ce manuel disponible ici :" - -#. type: example -#: doc/guix.texi:546 -#, no-wrap +"Enregistre des racines du ramasse-miettes — c.-à-d. des éléments du\n" +"dépôt qui ne seront pas glanés par le ramasse-miettes." + +#: gnu/services.scm:676 +#, scheme-format +msgid "no target of type '~a' for service '~a'" +msgstr "pas de cible de type « ~a » pour le service « ~a »" + +#: gnu/services.scm:702 gnu/services.scm:795 +#, scheme-format +msgid "more than one target service of type '~a'" +msgstr "plus d'un service cible de type « ~a »" + +#: gnu/services.scm:785 +#, scheme-format +msgid "service of type '~a' not found" +msgstr "service de type « ~a » pas trouvé" + +#: gnu/system.scm:320 +#, scheme-format +msgid "unrecognized boot parameters at '~a'~%" +msgstr "paramètres de démarrage non reconnus dans « ~a »~%" + +#: gnu/system.scm:731 +#, scheme-format +msgid "using a string for file '~a' is deprecated; use 'plain-file' instead~%" +msgstr "l'utilisation d'une chaîne pour le fichier « ~a » est obsolète. Utilisez plutôt « plain-file »~%" + +#: gnu/system.scm:747 +#, scheme-format +msgid "using a monadic value for '~a' is deprecated; use 'plain-file' instead~%" +msgstr "l'utilisation d'une valeur monadic pour « ~a » est obsolète. Utilisez plutôt « plain-file »~%" + +#: gnu/system.scm:892 +#, scheme-format +msgid "~a: invalid locale name" +msgstr "~a : nom d'environnement linguistique non valide" + +#: gnu/services/shepherd.scm:175 +#, scheme-format +msgid "service '~a' provided more than once" +msgstr "service « ~a » fourni plus d'une fois" + +#: gnu/services/shepherd.scm:190 +#, scheme-format +msgid "service '~a' requires '~a', which is not provided by any service" +msgstr "le service « ~a » requiert « ~a » qui n'est fourni pas aucun service" + +#: gnu/system/mapped-devices.scm:142 +#, scheme-format +msgid "you may need these modules in the initrd for ~a:~{ ~a~}" +msgstr "vous pourriez avoir besoin de ces modules dans l’image de démarrage pour ~a :~{ ~a~}" + +#: gnu/system/mapped-devices.scm:146 +#, scheme-format msgid "" -"# mkdir -p /usr/local/share/info\n" -"# cd /usr/local/share/info\n" -"# for i in /var/guix/profiles/per-user/root/guix-profile/share/info/* ;\n" -" do ln -s $i ; done\n" +"Try adding them to the\n" +"@code{initrd-modules} field of your @code{operating-system} declaration, along\n" +"these lines:\n" +"\n" +"@example\n" +" (operating-system\n" +" ;; @dots{}\n" +" (initrd-modules (append (list~{ ~s~})\n" +" %base-initrd-modules)))\n" +"@end example\n" msgstr "" -"# mkdir -p /usr/local/share/info\n" -"# cd /usr/local/share/info\n" -"# for i in /var/guix/profiles/per-user/root/guix-profile/share/info/* ;\n" -" do ln -s $i ; done\n" - -#. type: enumerate -#: doc/guix.texi:552 -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 "Comme cela, en supposant que @file{/usr/local/share/info} est dans le chemin de recherche, lancer @command{info guix} ouvrira ce manuel (@pxref{Other Info Directories,,, texinfo, GNU Texinfo}, pour plus de détails sur comment changer le chemin de recherche de Info)." - -#. type: cindex -#: doc/guix.texi:554 doc/guix.texi:2309 doc/guix.texi:10423 -#, no-wrap -msgid "substitutes, authorization thereof" -msgstr "substituts, autorisations" - -#. type: enumerate -#: doc/guix.texi:557 -msgid "To use substitutes from @code{hydra.gnu.org} or one of its mirrors (@pxref{Substitutes}), authorize them:" -msgstr "Pour utiliser les substituts de @code{hydra.gnu.org} ou l'un de ses mirroirs (@pxref{Substituts}), autorisez-les :" - -#. type: example -#: doc/guix.texi:560 -#, no-wrap -msgid "# guix archive --authorize < ~root/.guix-profile/share/guix/hydra.gnu.org.pub\n" -msgstr "# guix archive --authorize < ~root/.guix-profile/share/guix/hydra.gnu.org.pub\n" - -#. type: enumerate -#: doc/guix.texi:565 -msgid "Each user may need to perform a few additional steps to make their Guix environment ready for use, @pxref{Application Setup}." -msgstr "Chaque utilisateur peut avoir besoin d'effectuer des étapes supplémentaires pour que leur environnement Guix soit prêt à être utilisé, @pxref{Application Setup}." - -#. type: Plain text -#: doc/guix.texi:568 -msgid "Voilà, the installation is complete!" -msgstr "Voilà, l'installation est terminée !" - -#. type: Plain text -#: doc/guix.texi:571 -msgid "You can confirm that Guix is working by installing a sample package into the root profile:" -msgstr "Vous pouvez confirmer que Guix fonctionne en installant un paquet d'exemple dans le profil de root :" - -#. type: example -#: doc/guix.texi:574 -#, no-wrap -msgid "# guix package -i hello\n" -msgstr "# guix package -i hello\n" - -#. type: Plain text -#: doc/guix.texi:581 -msgid "The @code{guix} package must remain available in @code{root}'s profile, or it would become subject to garbage collection---in which case you would find yourself badly handicapped by the lack of the @command{guix} command. In other words, do not remove @code{guix} by running @code{guix package -r guix}." -msgstr "Le paquet @code{guix} doit rester disponible dans le profil de @code{root} ou il pourrait être sujet au ramassage de miettes — dans ce cas vous vous retrouveriez gravement handicapé par l'absence de la commande @command{guix}. En d'autres termes, ne supprimez pas @code{guix} en lançant @code{guix package -r guix}." - -#. type: Plain text -#: doc/guix.texi:584 -msgid "The binary installation tarball can be (re)produced and verified simply by running the following command in the Guix source tree:" -msgstr "L'archive d'installation binaire peut être (re)produite et vérifiée simplement en lançaint la commande suivante dans l'arborescence des sources de Guix :" - -#. type: example -#: doc/guix.texi:587 -#, 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:591 -msgid "... which, in turn, runs:" -msgstr "… ce qui à son tour lance :" - -#. type: example -#: doc/guix.texi:594 -#, no-wrap -msgid "guix pack -s @var{system} --localstatedir guix\n" -msgstr "guix pack -s @var{system} --localstatedir guix\n" - -#. type: Plain text -#: doc/guix.texi:597 -msgid "@xref{Invoking guix pack}, for more info on this handy tool." -msgstr "@xref{Invoking guix pack}, pour plus d'info sur cet outil pratique." - -#. type: Plain text -#: doc/guix.texi:605 -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 "Cette section dresse la liste des pré-requis pour la construction de Guix depuis les sources. La procédure de construction pour Guix est la même que pour les autres logiciels GNU, et n'est pas expliquée ici. Regardez les fichiers @file{README} et @file{INSTALL} dans l'arborescence des sources de Guix pour plus de détails." - -#. type: Plain text -#: doc/guix.texi:607 -msgid "GNU Guix depends on the following packages:" -msgstr "GNU Guix dépend des paquets suivants :" - -#. type: item -#: doc/guix.texi:609 -#, no-wrap -msgid "@url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.13 or" -msgstr "@url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.13 ou" - -#. type: itemize -#: doc/guix.texi:611 -msgid "later, including 2.2.x;" -msgstr "ultérieure, dont 2.2.x," - -#. type: item -#: doc/guix.texi:611 -#, no-wrap -msgid "@url{http://gnupg.org/, GNU libgcrypt};" -msgstr "@url{http://gnupg.org/, GNU libgcrypt}," - -#. type: itemize -#: doc/guix.texi:616 -msgid "@uref{http://gnutls.org/, GnuTLS}, specifically its Guile bindings (@pxref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile});" -msgstr "@uref{http://gnutls.org/, GnuTLS}, en particulier ses liaisons Guile (@pxref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile})," - -#. type: itemize -#: doc/guix.texi:619 -msgid "@uref{https://notabug.org/civodul/guile-sqlite3, Guile-SQLite3};" -msgstr "@uref{https://notabug.org/civodul/guile-sqlite3, Guile-SQLite3} ;" - -#. type: itemize -#: doc/guix.texi:623 -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}, d'août 2017 ou ultérieur," - -#. type: item -#: doc/guix.texi:623 -#, no-wrap -msgid "@url{http://zlib.net, zlib};" -msgstr "@url{http://zlib.net, zlib}," - -#. type: item -#: doc/guix.texi:624 -#, no-wrap -msgid "@url{http://www.gnu.org/software/make/, GNU Make}." -msgstr "@url{http://www.gnu.org/software/make/, GNU Make}." - -#. type: Plain text -#: doc/guix.texi:628 -msgid "The following dependencies are optional:" -msgstr "Les dépendances suivantes sont facultatives :" - -#. type: itemize -#: doc/guix.texi:636 -msgid "Installing @url{http://savannah.nongnu.org/projects/guile-json/, Guile-JSON} will allow you to use the @command{guix import pypi} command (@pxref{Invoking guix import}). It is of interest primarily for developers and not for casual users." -msgstr "Installer @url{http://savannah.nongnu.org/projects/guile-json/, Guile-JSON} vous permettra d'utiliser la commande @command{guix import pypi} (@pxref{Invoking guix import}). Il est surtout utile pour les développeurs et pas pour les utilisateurs occasionnels." - -#. type: itemize -#: doc/guix.texi:643 -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." -msgstr "Le support pour la décharge de construction (@pxref{Daemon Offload Setup}) et @command{guix copy} (@pxref{Invoking guix copy}) dépend de @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, version 0.10.2 ou ulltérieure." - -#. type: itemize -#: doc/guix.texi:647 -msgid "When @url{http://www.bzip.org, libbz2} is available, @command{guix-daemon} can use it to compress build logs." -msgstr "Lorsque @url{http://www.bzip.org, libbz2} est disponible, @command{guix-daemon} peut l'utiliser pour compresser les journaux de construction." - -#. type: Plain text -#: doc/guix.texi:651 -msgid "Unless @code{--disable-daemon} was passed to @command{configure}, the following packages are also needed:" -msgstr "À moins que @code{--disable-daemon} ne soit passé à @command{configure}, les paquets suivants sont aussi requis :" - -#. type: item -#: doc/guix.texi:653 -#, no-wrap -msgid "@url{http://sqlite.org, SQLite 3};" -msgstr "@url{http://sqlite.org, SQLite 3}," - -#. type: item -#: doc/guix.texi:654 -#, no-wrap -msgid "@url{http://gcc.gnu.org, GCC's g++}, with support for the" -msgstr "@url{http://gcc.gnu.org, GCC's g++}, avec le support pour le" - -#. type: itemize -#: doc/guix.texi:656 -msgid "C++11 standard." -msgstr "standard C++11." - -#. type: cindex -#: doc/guix.texi:658 -#, no-wrap -msgid "state directory" -msgstr "répertoire d'état" - -#. type: Plain text -#: doc/guix.texi:666 -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}). The @command{configure} script protects against unintended misconfiguration of @var{localstatedir} so you do not inadvertently corrupt your store (@pxref{The Store})." -msgstr "Lorsque vous configurez Guix sur un système qui a déjà une installation de Guix, assurez-vous de spécifier le même répertoire d'état que l'installation existante avec l'option @code{--localstatedir} du script @command{configure} (@pxref{Directory Variables, @code{localstatedir},, standards, GNU Coding Standards}). Le script @command{configure} vous protège des mauvaises configurations involontaires de @var{localstatedir} pour éviter que vous ne corrompiez votre dépôt (@pxref{The Store})." - -#. type: cindex -#: doc/guix.texi:667 -#, no-wrap -msgid "Nix, compatibility" -msgstr "Nix, compatibilité" - -#. type: Plain text -#: doc/guix.texi:672 -msgid "When a working installation of @url{http://nixos.org/nix/, the Nix package manager} is available, you can instead configure Guix with @code{--disable-daemon}. In that case, Nix replaces the three dependencies above." -msgstr "Lorsque vous avez une installation fonctionnelle du @url{http://nixos.org/nix/, gestionnaire de paquets Nix}, vous pouvez configurer Guix avec @code{--disable-daemon}. Dan ce cas, Nix remplace les trois dépendances au dessus." - -#. type: Plain text -#: doc/guix.texi:682 -msgid "Guix is compatible with Nix, so it is possible to share the same store between both. To do so, you must pass @command{configure} not only the same @code{--with-store-dir} value, but also the same @code{--localstatedir} value. The latter is essential because it specifies where the database that stores metadata about the store is located, among other things. The default values for Nix are @code{--with-store-dir=/nix/store} and @code{--localstatedir=/nix/var}. Note that @code{--disable-daemon} is not required if your goal is to share the store with Nix." -msgstr "Guix est compatible avec Nix, donc il est possible de partager le même dépôt entre les deux. Pour cela, vous devez passer à @command{configure} non seulement la même valeur de @code{--with-store-dir} mais aussi la même valeur de @code{--localstatedir}. Cette dernière est nécessaires car elle spécifie l'emplacement de la base de données qui stocke les métadonnées sur le dépôt, entre autres choses. Les valeurs par défaut pour Nix sont @code{--with-store-dir=/nix/store} et @code{--localstatedir=/nix/var}. Remarquez que @code{--disable-daemon} n'est pas requis si votre but est de partager le dépôt avec Nix." - -#. type: cindex -#: doc/guix.texi:686 -#, no-wrap -msgid "test suite" -msgstr "suite de tests" - -#. type: Plain text -#: doc/guix.texi:692 -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 "Après avoir lancé @command{configure} et @code{make} correctement, c'est une bonne idée de lancer la suite de tests. Elle peut aider à trouver des erreurs avec la configuration ou l'environnement, ou des bogues dans Guix lui-même — et vraiment, rapporter des échecs de tests est une bonne manière d'aider à améliorer le logiciel. Pour lancer la suite de tests, tapez :" - -#. type: example -#: doc/guix.texi:695 -#, no-wrap -msgid "make check\n" -msgstr "make check\n" - -#. type: Plain text -#: doc/guix.texi:702 -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 "Les cas de tests peuvent être lancés en parallèle : vous pouvez utiliser l'option @code{-j} de GNU@tie{}make pour accélérer les choses. Le premier lancement peut prendre plusieurs minutes sur une machine récente ; les lancements suivants seront plus rapides car le dépôt créé pour les tests aura déjà plusieurs choses en cache." - -#. type: Plain text -#: doc/guix.texi:705 -msgid "It is also possible to run a subset of the tests by defining the @code{TESTS} makefile variable as in this example:" -msgstr "Il est aussi possible de lancer un sous-ensemble des tests en définissant la variable makefile @code{TESTS} comme dans cet exemple :" - -#. type: example -#: doc/guix.texi:708 -#, 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:713 -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 "Par défaut, les résultats des tests sont affichés au niveau du fichier. Pour voir les détails de chaque cas de test individuel, il est possible de définire la variable makefile @code{SCM_LOG_DRIVER_FLAGS} comme dans cet exemple :" - -#. type: example -#: doc/guix.texi:716 -#, 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:722 -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 "Après un échec, envoyez un courriel à @email{bug-guix@@gnu.org} et attachez le fichier @file{test-suite.log}. Précisez la version de Guix utilisée ainsi que les numéros de version de ses dépendances (@pxref{Requirements}) dans votre message." - -#. type: Plain text -#: doc/guix.texi:726 -msgid "Guix also comes with a whole-system test suite that tests complete GuixSD operating system instances. It can only run on systems where Guix is already installed, using:" -msgstr "Guix possède aussi une suite de tests de systèmes complets qui test des instances complètes du système d'exploitation GuixSD@. Elle ne peut être lancée qui sur un système où Guix est déjà installé, avec :" - -#. type: example -#: doc/guix.texi:729 -#, no-wrap -msgid "make check-system\n" -msgstr "make check-system\n" - -#. type: Plain text -#: doc/guix.texi:733 -msgid "or, again, by defining @code{TESTS} to select a subset of tests to run:" -msgstr "Ou, de nouveau, en définissant @code{TESTS} pour choisir un sous-ensemble des tests à lancer :" - -#. type: example -#: doc/guix.texi:736 -#, no-wrap -msgid "make check-system TESTS=\"basic mcron\"\n" -msgstr "make check-system TESTS=\"basic mcron\"\n" - -#. type: Plain text -#: doc/guix.texi:744 -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 "Ces tests systèmes sont définis dans les modules @code{(gnu tests @dots{})}. Ils fonctionnent en lançant les systèmes d'exploitation sous test avec une instrumentation légère dans une machine virtuelle (VM). Ils peuvent être intenses en terme de calculs ou plutôt rapides en fonction de la disponibilité des substituts de leurs dépendances (@pxref{Substituts}). Certains requièrent beaucoup d'espace disque pour contenir les images des VM@." - -#. type: Plain text -#: doc/guix.texi:747 -msgid "Again in case of test failures, please send @email{bug-guix@@gnu.org} all the details." -msgstr "De nouveau, en cas d'échec, envoyez tous les détails à @email{bug-guix@@gnu.org}." - -#. type: cindex -#: doc/guix.texi:751 -#, no-wrap -msgid "daemon" -msgstr "démon" - -#. type: Plain text -#: doc/guix.texi:759 -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 "Les opérations comme la construction d'un paquet ou le lancement du ramasse-miettes sont toutes effectuées par un processus spécialisé, le @dfn{démon de construction}, pour le compte des clients. Seul le démon peut accéder au dépôt et à sa base de données associée. Ainsi, toute opération manipulant le dépôt passe par le démon. Par exemple, les outils en ligne de commande comme @command{guix package} et @command{guix build} communiquent avec le démon (@i{via} des appels de procédures distantes) pour lui dire quoi faire." - -#. type: Plain text -#: doc/guix.texi:763 -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 "Les sections suivantes expliquent comment préparer l'environnement du démon de construction. Voir aussi @ref{Substituts} pour apprendre comment permettre le téléchargement de binaires pré-construits." - -#. type: cindex -#: doc/guix.texi:773 doc/guix.texi:1198 -#, no-wrap -msgid "build environment" -msgstr "environnement de construction" - -#. type: Plain text -#: doc/guix.texi:781 -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 "Dans une installation standard multi-utilisateurs, Guix et son démon — le programme @command{guix-daemon} — sont installé par l'administrateur système ; @file{/gnu/store} appartient à @code{root} et @command{guix-daemon} est lancé en @code{root}. Les utilisateurs non-privilégiés peuvent utiliser les outils Guix pour construire des paquets ou accéder au dépôt et le démon le fera pour leur compte en s'assurant que le dépôt garde un état cohérent et permet le partage des paquets déjà construits entre les utilisateurs." - -#. type: cindex -#: doc/guix.texi:782 -#, no-wrap -msgid "build users" -msgstr "utilisateurs de construction" - -#. type: Plain text -#: doc/guix.texi:793 -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 "Alors que @command{guix-daemon} tourne en @code{root}, vous n'avez pas forcément envie que les processus de construction de paquets tournent aussi en @code{root}, pour des raisons de sécurité évidentes. Pour éviter cela, vous devriez créer une réserve spéciale d'@dfn{utilisateurs de construction} que les processus de construction démarrés par le démon utiliseront. Ces utilisateurs de construction n'ont pas besoin d'un shell ou d'un répertoire personnel ; ils seront seulement utilisés quand le démon délaissera ses privilèges @code{root} dans les processus de construction. En ayant plusieurs de ces utilisateurs, vous permettez au démon de lancer des processus de construction distincts sous des UID différent, ce qui garanti qu'aucune interférence n'ait lieu entre les uns et les autres — une fonctionnalité essentielle puisque les constructions sont supposées être des fonctions pures (@pxref{Introduction})." - -#. type: Plain text -#: doc/guix.texi:796 -msgid "On a GNU/Linux system, a build user pool may be created like this (using Bash syntax and the @code{shadow} commands):" -msgstr "Sur un système GNU/Linux, on peut créer une réserve d'utilisateurs de construction comme ceci (avec la syntaxe Bash et les commandes @code{shadow}) :" - -#. type: example -#: doc/guix.texi:808 -#, no-wrap +"Essayez de les ajouter dans le champ @code{initrd-modules} de votre déclaration\n" +"@code{operating-system}, comme ceci :\n" +"\n" +"@example\n" +" (operating-system\n" +" ;; @dots{}\n" +" (initrd-modules (append (list~{ ~s~})\n" +" %base-initrd-modules)))\n" +"@end example\n" + +#: gnu/system/mapped-devices.scm:222 +#, scheme-format +msgid "no LUKS partition with UUID '~a'" +msgstr "aucune partition LUKS avec l’UUID « ~a »" + +#: gnu/system/shadow.scm:245 +#, scheme-format +msgid "supplementary group '~a' of user '~a' is undeclared" +msgstr "le groupe supplémentaire « ~a » de l'utilisateur « ~a » n'est pas déclaré" + +#: gnu/system/shadow.scm:255 +#, scheme-format +msgid "primary group '~a' of user '~a' is undeclared" +msgstr "le groupe primaire « ~a » de l'utilisateur « ~a » n'est pas déclaré" + +#: guix/scripts.scm:56 +#, scheme-format +msgid "invalid argument: ~a~%" +msgstr "argument non valide : ~a~%" + +#: guix/scripts.scm:84 guix/scripts/download.scm:135 +#: guix/scripts/import/cran.scm:82 guix/scripts/import/elpa.scm:85 +#: guix/scripts/publish.scm:881 guix/scripts/edit.scm:81 +#, scheme-format +msgid "~A: unrecognized option~%" +msgstr "~A : option non reconnue~%" + +#: guix/scripts.scm:179 +#, scheme-format +msgid "Your Guix installation is ~a day old.\n" +msgid_plural "Your Guix installation is ~a days old.\n" +msgstr[0] "Votre installation Guix est vieille de ~a jour.\n" +msgstr[1] "Votre installation Guix est vieille de ~a jours.\n" + +#: guix/scripts.scm:184 +#, scheme-format msgid "" -"# groupadd --system guixbuild\n" -"# for i in `seq -w 1 10`;\n" -" do\n" -" useradd -g guixbuild -G guixbuild \\\n" -" -d /var/empty -s `which nologin` \\\n" -" -c \"Guix build user $i\" --system \\\n" -" guixbuilder$i;\n" -" done\n" +"Consider running 'guix pull' followed by\n" +"'~a' to get up-to-date packages and security updates.\n" msgstr "" -"# groupadd --system guixbuild\n" -"# for i in `seq -w 1 10`;\n" -" do\n" -" useradd -g guixbuild -G guixbuild \\\n" -" -d /var/empty -s `which nologin` \\\n" -" -c \"Utilisateur de construction Guix $i\" --system \\\n" -" guixbuilder$i;\n" -" done\n" - -#. type: Plain text -#: doc/guix.texi:818 -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 "Le nombre d'utilisateurs de construction détermine le nombre de tâches de constructions qui peuvent tourner en parallèle, tel que spécifié par l'option @option{--max-jobs} (@pxref{Invoking guix-daemon, @option{--max-jobs}}). Pour utiliser @command{guix system vm} et les commandes liées, vous devrez ajouter les utilisateurs de construction au groupe @code{kvm} pour qu'ils puissent accéder à @file{/dev/kvm} avec @code{-G guixbuild,kvm} plutôt que @code{-G guixbuild} (@pxref{Invoking guix system})." - -#. type: Plain text -#: doc/guix.texi:827 -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 "Le programme @code{guix-daemon} peut ensuite être lancé en @code{root} avec la commande suivante@footnote{Si votre machine utilise le système d'initialisation systemd, copiez le fichier @file{@var{prefix}/lib/systemd/system/guix-daemon.service} dans @file{/etc/systemd/system} pour vous assurer que @command{guix-daemon} est démarré automatiquement. De même, si votre machine utilise le système d'initialisation Upstart, copiez le fichier @file{@var{prefix}/lib/upstart/system/guix-daemon.conf} dans @file{/etc/init}.} :" - -#. type: example -#: doc/guix.texi:830 doc/guix.texi:1191 -#, no-wrap -msgid "# guix-daemon --build-users-group=guixbuild\n" -msgstr "# guix-daemon --build-users-group=guixbuild\n" - -#. type: cindex -#: doc/guix.texi:832 doc/guix.texi:1196 -#, no-wrap -msgid "chroot" -msgstr "chroot" - -#. type: Plain text -#: doc/guix.texi:837 -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 "De cette façon, le démon démarre les processus de construction dans un chroot, sous un des utilisateurs @code{guixbuilder}. Sur GNU/Linux par défaut, l'environnement chroot ne contient rien d'autre que :" - -#. type: itemize -#: doc/guix.texi:845 -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 "un répertoire @code{/dev} minimal, créé presque indépendamment du @code{/dev} de l'hôte@footnote{« presque », parce que même si l'ensemble des fichiers qui apparaissent dans le @code{/dev} du chroot sont déterminés à l'avance, la plupart de ces fichiers ne peut pas être créée si l'hôte ne les a pas.} ;" - -#. type: itemize -#: doc/guix.texi:849 -msgid "the @code{/proc} directory; it only shows the processes of the container since a separate PID name space is used;" -msgstr "le répertoire @code{/proc} ; il ne montre que les processus du conteneur car on utilise une espace de nom séparé pour les PID ;" - -#. type: itemize -#: doc/guix.texi:853 -msgid "@file{/etc/passwd} with an entry for the current user and an entry for user @file{nobody};" -msgstr "@file{/etc/passwd} avec une entrée pour l'utilisateur actuel et une entrée pour l'utilisateur @file{nobody} ;" - -#. type: itemize -#: doc/guix.texi:856 -msgid "@file{/etc/group} with an entry for the user's group;" -msgstr "@file{/etc/group} avec une entrée pour le groupe de l'utilisateur ;" - -#. type: itemize -#: doc/guix.texi:860 -msgid "@file{/etc/hosts} with an entry that maps @code{localhost} to @code{127.0.0.1};" -msgstr "@file{/etc/hosts} avec une entrée qui fait correspondre @code{localhost} à @code{127.0.0.1} ;" - -#. type: itemize -#: doc/guix.texi:863 -msgid "a writable @file{/tmp} directory." -msgstr "un répertoire @file{/tmp} inscriptible." - -#. type: Plain text -#: doc/guix.texi:872 -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 "Vous pouvez influencer le répertoire où le démon stocke les arbres de construction @i{via} la variable d'environnement @code{TMPDIR}. Cependant, l'arbre de construction dans le chroot sera toujours appelé @file{/tmp/guix-build-@var{nom}.drv-0}, où @var{nom} est le nom de la dérivation — p.@: ex.@: @code{coreutils-8.24}. De cette façon, la valeur de @code{TMPDIR} ne fuite pas à l'intérieur des environnements de construction, ce qui évite des différences lorsque le processus de construction retient le nom de leur répertoire de construction." - -#. type: vindex -#: doc/guix.texi:873 doc/guix.texi:2416 -#, no-wrap -msgid "http_proxy" -msgstr "http_proxy" - -#. type: Plain text -#: doc/guix.texi:877 -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 "Le démon tient aussi compte de la variable d'environnement @code{http_proxy} pour ses téléchargements HTTP, que ce soit pour les dérivations à sortie fixes (@pxref{Derivations}) ou pour les substituts (@pxref{Substituts})." - -#. type: Plain text -#: doc/guix.texi:885 -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 "Si vous installez Guix en tant qu'utilisateur non-privilégié, il est toujours possible de lancer @command{guix-daemon} si vous passez @code{--disable-chroot}. Cependant, les processus de construction ne seront pas isolés les uns des autres ni du reste du système. Ainsi les processus de construction peuvent interférer les uns avec les autres, et peuvent accéder à des programmes, des bibliothèques et d'autres fichiers présents sur le système — ce qui rend plus difficile de les voir comme des fonctions @emph{pures}." - -#. type: subsection -#: doc/guix.texi:888 -#, no-wrap -msgid "Using the Offload Facility" -msgstr "Utiliser le dispositif de déchargement" - -#. type: cindex -#: doc/guix.texi:890 -#, no-wrap -msgid "offloading" -msgstr "déchargement" - -#. type: cindex -#: doc/guix.texi:891 doc/guix.texi:1252 -#, no-wrap -msgid "build hook" -msgstr "crochet de construction" - -#. type: Plain text -#: doc/guix.texi:905 -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 "Si vous le souhaitez, le démon de construction peut @dfn{décharger} des constructions de dérivations sur d'autres machines Guix avec le @dfn{crochet de construction} @code{offload}@footnote{Cette fonctionnalité n'est disponible que si @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} est présent.}. Lorsque cette fonctionnalité est activée, Guix lit une liste de machines de constructions spécifiée par l'utilisateur dans @file{/etc/guix/machines.scm} ; à chaque fois qu'une construction est demandée, par exemple par @code{guix build}, le démon essaie de la décharger sur une des machines qui satisfont les contraintes de la dérivation, en particulier le type de système, p.@: ex.@: @file{x86_64-linux}. Les prérequis manquants pour la construction sont copiés par SSH sur la machine de construction qui procède ensuite à la construction ; si elle réussi, les sorties de la construction sont copiés vers la machine de départ." - -#. type: Plain text -#: doc/guix.texi:907 -msgid "The @file{/etc/guix/machines.scm} file typically looks like this:" -msgstr "Le fichier @file{/etc/guix/machines.scm} ressemble typiquement à cela :" - -#. type: example -#: doc/guix.texi:915 -#, no-wrap +"Envisagez d'exécuter « guix pull » suivi de\n" +"« ~a » pour obtenir des paquets à jour et des mises à jour de sécurité.\n" + +#: guix/scripts/build.scm:81 +#, scheme-format +msgid "cannot access build log at '~a':~%" +msgstr "aucun journal de compilation sur « ~a »~%" + +#: guix/scripts/build.scm:135 +#, scheme-format +msgid "failed to create GC root `~a': ~a~%" +msgstr "impossible de créer la racine du GC « ~a » : ~a~%" + +#: guix/scripts/build.scm:237 +#, scheme-format +msgid "invalid replacement specification: ~s~%" +msgstr "spécification de remplacement invalide : ~s~%" + +#: guix/scripts/build.scm:294 msgid "" -"(list (build-machine\n" -" (name \"eightysix.example.org\")\n" -" (system \"x86_64-linux\")\n" -" (host-key \"ssh-ed25519 AAAAC3Nza@dots{}\")\n" -" (user \"bob\")\n" -" (speed 2.)) ;incredibly fast!\n" "\n" +" --with-source=SOURCE\n" +" use SOURCE when building the corresponding package" msgstr "" -"(list (build-machine\n" -" (name \"eightysix.example.org\")\n" -" (system \"x86_64-linux\")\n" -" (host-key \"ssh-ed25519 AAAAC3Nza@dots{}\")\n" -" (user \"bob\")\n" -" (speed 2.)) ;très rapide !\n" "\n" +" --with-source=SOURCE\n" +" utiliser la SOURCE donnée pour compiler le paquet correspondant" -#. type: example -#: doc/guix.texi:924 -#, no-wrap +#: guix/scripts/build.scm:297 msgid "" -" (build-machine\n" -" (name \"meeps.example.org\")\n" -" (system \"mips64el-linux\")\n" -" (host-key \"ssh-rsa AAAAB3Nza@dots{}\")\n" -" (user \"alice\")\n" -" (private-key\n" -" (string-append (getenv \"HOME\")\n" -" \"/.ssh/identity-for-guix\"))))\n" +"\n" +" --with-input=PACKAGE=REPLACEMENT\n" +" replace dependency PACKAGE by REPLACEMENT" msgstr "" -" (build-machine\n" -" (name \"meeps.example.org\")\n" -" (system \"mips64el-linux\")\n" -" (host-key \"ssh-rsa AAAAB3Nza@dots{}\")\n" -" (user \"alice\")\n" -" (private-key\n" -" (string-append (getenv \"HOME\")\n" -" \"/.ssh/identity-for-guix\"))))\n" - -#. type: Plain text -#: doc/guix.texi:930 -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 "Dans l'exemple ci-dessus nous spécifions une liste de deux machines de construction, une pour l'architecture @code{x86_64} et une pour l'architecture @code{mips64el}." - -#. type: Plain text -#: doc/guix.texi:939 -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 "En fait, ce fichier est — et ça ne devrait pas vous surprendre ! — un fichier Scheme qui est évalué au démarrage du crochet @code{offload}. Sa valeur de retour doit être une liste d'objets @code{build-machine}. Même si cet exemple montre une liste fixée de machines de construction, on pourrait imaginer par exemple utiliser DNS-SD pour renvoyer une liste de machines de constructions potentielles découvertes sur le réseau local (@pxref{Introduction, Guile-Avahi,, guile-avahi, Using Avahi in Guile Scheme Programs}). Le type de données @code{build-machine} est détaillé plus bas." - -#. type: deftp -#: doc/guix.texi:940 -#, no-wrap -msgid "{Data Type} build-machine" -msgstr "{Type de données} build-machine" - -#. type: deftp -#: doc/guix.texi:943 -msgid "This data type represents build machines to which the daemon may offload builds. The important fields are:" -msgstr "Ce type de données représente les machines de construction sur lesquelles le démon peut décharger des constructions. Les champs importants sont :" - -#. type: code{#1} -#: doc/guix.texi:946 doc/guix.texi:3521 doc/guix.texi:9634 doc/guix.texi:9698 -#: doc/guix.texi:9793 doc/guix.texi:11267 doc/guix.texi:15402 -#: doc/guix.texi:15635 doc/guix.texi:15768 doc/guix.texi:16046 -#: doc/guix.texi:16087 doc/guix.texi:20147 doc/guix.texi:20164 -#: doc/guix.texi:20430 doc/guix.texi:21638 -#, no-wrap -msgid "name" -msgstr "name" - -#. type: table -#: doc/guix.texi:948 -msgid "The host name of the remote machine." -msgstr "Le nom d'hôte de la machine distante." - -#. type: item -#: doc/guix.texi:949 -#, no-wrap -msgid "system" -msgstr "system" - -#. type: table -#: doc/guix.texi:951 -msgid "The system type of the remote machine---e.g., @code{\"x86_64-linux\"}." -msgstr "Le type de système de la machine distante, p.@: ex.@: @code{\"x86_64-linux\"}." - -#. type: code{#1} -#: doc/guix.texi:952 doc/guix.texi:11277 -#, no-wrap -msgid "user" -msgstr "user" - -#. type: table -#: doc/guix.texi:956 -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 "Le compte utilisateur à utiliser lors de la connexion à la machine distante par SSH@. Remarquez que la paire de clef SSH ne doit @emph{pas} être protégée par mot de passe pour permettre des connexions non-interactives." - -#. type: item -#: doc/guix.texi:957 -#, no-wrap -msgid "host-key" -msgstr "host-key" - -#. type: table -#: doc/guix.texi:961 -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 "Cela doit être la @dfn{clef d'hôte SSH publique} de la machine au format OpenSSH@. Elle est utilisée pour authentifier la machine lors de la connexion. C'est une longue chaîne qui ressemble à cela :" - -#. type: example -#: doc/guix.texi:964 -#, 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:969 -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 "Si la machine utilise le démon OpenSSH, @command{sshd}, la clef d'hôte se trouve dans un fichier comme @file{/etc/ssh/ssh_host_ed25519_key.pub}." - -#. type: table -#: doc/guix.texi:974 -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 "Si la machine utilise le démon SSH de GNU@tie{}lsh, la clef d'hôte est dans @file{/etc/lsh/host-key.pub} ou un fichier similaire. Elle peut être convertie au format OpenSSH avec @command{lsh-export-key} (@pxref{Converting keys,,, lsh, LSH Manual}) :" - -#. type: example -#: doc/guix.texi:978 -#, no-wrap +"\n" +" --with-input=PAQUET=REMPLACEMENT\n" +" remplacer le paquet de dépendance PAQUET par REMPLACEMENT" + +#: guix/scripts/build.scm:300 msgid "" -"$ lsh-export-key --openssh < /etc/lsh/host-key.pub \n" -"ssh-rsa AAAAB3NzaC1yc2EAAAAEOp8FoQAAAQEAs1eB46LV@dots{}\n" +"\n" +" --with-graft=PACKAGE=REPLACEMENT\n" +" graft REPLACEMENT on packages that refer to PACKAGE" msgstr "" -"$ lsh-export-key --openssh < /etc/lsh/host-key.pub \n" -"ssh-rsa AAAAB3NzaC1yc2EAAAAEOp8FoQAAAQEAs1eB46LV@dots{}\n" - -#. type: deftp -#: doc/guix.texi:983 -msgid "A number of optional fields may be specified:" -msgstr "Il y a un certain nombre de champs facultatifs que vous pouvez remplir :" - -#. type: item -#: doc/guix.texi:986 -#, no-wrap -msgid "@code{port} (default: @code{22})" -msgstr "@code{port} (par défaut : @code{22})" - -#. type: table -#: doc/guix.texi:988 -msgid "Port number of SSH server on the machine." -msgstr "Numéro de port du serveur SSH sur la machine." - -#. type: item -#: doc/guix.texi:989 -#, no-wrap -msgid "@code{private-key} (default: @file{~root/.ssh/id_rsa})" -msgstr "@code{private-key} (par défaut : @file{~root/.ssh/id_rsa})" - -#. type: table -#: doc/guix.texi:992 -msgid "The SSH private key file to use when connecting to the machine, in OpenSSH format." -msgstr "Le fichier de clef privée à utiliser lors de la connexion à la machine, au format OpenSSH@." - -#. type: table -#: doc/guix.texi:995 -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 "Remarquez que la valeur par défaut est la clef privée @emph{du compte root}. Assurez-vous qu'elle existe si vous utilisez la valeur par défaut." - -#. type: item -#: doc/guix.texi:996 -#, no-wrap -msgid "@code{compression} (default: @code{\"zlib@@openssh.com,zlib\"})" -msgstr "@code{compression} (par défaut : @code{\"zlib@@openssh.com,zlib\"})" - -#. type: item -#: doc/guix.texi:997 doc/guix.texi:10667 -#, no-wrap -msgid "@code{compression-level} (default: @code{3})" -msgstr "@code{compression-level} (par défaut : @code{3})" - -#. type: table -#: doc/guix.texi:999 -msgid "The SSH-level compression methods and compression level requested." -msgstr "Les méthodes de compression au niveau SSH et le niveau de compression demandé." - -#. type: table -#: doc/guix.texi:1002 -msgid "Note that offloading relies on SSH compression to reduce bandwidth usage when transferring files to and from build machines." -msgstr "Remarquez que le déchargement utilise la compression SSH pour réduire la bande passante utilisée lors du transfert vers et depuis les machines de construction." - -#. type: item -#: doc/guix.texi:1003 -#, no-wrap -msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})" -msgstr "@code{daemon-socket} (par défaut : @code{\"/var/guix/daemon-socket/socket\"})" - -#. type: table -#: doc/guix.texi:1006 -msgid "File name of the Unix-domain socket @command{guix-daemon} is listening to on that machine." -msgstr "Le nom de fichier du socket Unix-domain sur lequel @command{guix-daemon} écoute sur cette machine." - -#. type: item -#: doc/guix.texi:1007 -#, no-wrap -msgid "@code{parallel-builds} (default: @code{1})" -msgstr "@code{parallel-builds} (par défaut : @code{1})" - -#. type: table -#: doc/guix.texi:1009 -msgid "The number of builds that may run in parallel on the machine." -msgstr "Le nombre de constructions qui peuvent tourner simultanément sur la machine." - -#. type: item -#: doc/guix.texi:1010 -#, no-wrap -msgid "@code{speed} (default: @code{1.0})" -msgstr "@code{speed} (par défaut : @code{1.0})" - -#. type: table -#: doc/guix.texi:1013 -msgid "A ``relative speed factor''. The offload scheduler will tend to prefer machines with a higher speed factor." -msgstr "Un « facteur de vitesse relatif ». L'ordonnanceur des constructions tendra à préférer les machines avec un plus grand facteur de vitesse." - -#. type: item -#: doc/guix.texi:1014 -#, no-wrap -msgid "@code{features} (default: @code{'()})" -msgstr "@code{features} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:1019 -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 "Une liste de chaînes qui contient les fonctionnalités spécifiques supportées par la machine. Un exemple est @code{\"kvm\"} pour les machines qui ont le module Linux KVM et le support matériel correspondant. Les dérivations peuvent demander des fonctionnalités par leur nom et seront orchestrées sur les machines de construction correspondantes." - -#. type: Plain text -#: doc/guix.texi:1027 -msgid "The @code{guile} command must be in the search path on the build machines. In addition, the Guix modules must be in @code{$GUILE_LOAD_PATH} on the build machine---you can check whether this is the case by running:" -msgstr "La commande @code{guile} doit être dans le chemin de recherche des machines de construction. En plus, les modules Guix doivent se trouver dans @code{$GUILE_LOAD_PATH} sur la machine de construction. Vous pouvez vérifier si c'est le cas en lançant :" - -#. type: example -#: doc/guix.texi:1030 -#, no-wrap -msgid "ssh build-machine guile -c \"'(use-modules (guix config))'\"\n" -msgstr "ssh build-machine guile -c \"'(use-modules (guix config))'\"\n" - -#. type: Plain text -#: doc/guix.texi:1037 -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 "Il reste une dernière chose à faire maintenant que @file{machines.scm} est en place. Comme expliqué ci-dessus, lors du déchargement les fichiers sont transférés entre les dépôts des machines. Pour que cela fonctionne, vous devez d'abord générer une paire de clef sur chaque machine pour permettre au démon d'exporter des archives signées des fichiers de son dépôt (@pxref{Invoking guix archive}) :" - -#. type: example -#: doc/guix.texi:1040 -#, no-wrap -msgid "# guix archive --generate-key\n" -msgstr "# guix archive --generate-key\n" - -#. type: Plain text -#: doc/guix.texi:1045 -msgid "Each build machine must authorize the key of the master machine so that it accepts store items it receives from the master:" -msgstr "Chaque machine de construction doit autoriser la clef de la machine maîtresse pour qu'ils acceptent les éléments de dépôt de celle-ci :" - -#. type: example -#: doc/guix.texi:1048 -#, 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:1052 -msgid "Likewise, the master machine must authorize the key of each build machine." -msgstr "De même, la machine maîtresse doit autoriser les clefs de chaque machine de construction." - -#. type: Plain text -#: doc/guix.texi:1058 -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 "Toute cette histoire de clefs permet d'exprimer la confiance mutuelle deux-à-deux entre le maître et les machines de construction. Concrètement, lorsque le maître reçoit des fichiers d'une machine de construction (et vice-versa), son démon de construction s'assure qu'ils sont authentiques, n'ont pas été modifiés par un tiers et qu'il sont signés par un clef autorisée." - -#. type: cindex -#: doc/guix.texi:1059 -#, no-wrap -msgid "offload test" -msgstr "test du déchargement" - -#. type: Plain text -#: doc/guix.texi:1062 -msgid "To test whether your setup is operational, run this command on the master node:" -msgstr "Pour tester que votre paramétrage fonctionne, lancez cette commande sur le nœud maître :" - -#. type: example -#: doc/guix.texi:1065 -#, no-wrap -msgid "# guix offload test\n" -msgstr "# guix offload test\n" - -#. type: Plain text -#: doc/guix.texi:1071 -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 "Cela essaiera de se connecter à toutes les machines de construction spécifiées dans @file{/etc/guix/machines.scm}, s'assurera que Guile et les modules Guix sont disponibles sur toutes les machines et tentera d'exporter vers la machine et d'importer depuis elle, et rapportera toute erreur survenu pendant le processus." - -#. type: Plain text -#: doc/guix.texi:1074 -msgid "If you want to test a different machine file, just specify it on the command line:" -msgstr "Si vous souhaitez tester un fichier de machines différent, spécifiez-le sur la ligne de commande :" - -#. type: example -#: doc/guix.texi:1077 -#, no-wrap -msgid "# guix offload test machines-qualif.scm\n" -msgstr "# guix offload test machines-qualif.scm\n" - -#. type: Plain text -#: doc/guix.texi:1081 -msgid "Last, you can test the subset of the machines whose name matches a regular expression like this:" -msgstr "Enfin, vous pouvez tester un sous-ensemble de machines dont le nom correspond à une expression rationnelle comme ceci :" - -#. type: example -#: doc/guix.texi:1084 -#, 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:1086 -#, no-wrap -msgid "offload status" -msgstr "statut du déchargement" - -#. type: Plain text -#: doc/guix.texi:1089 -msgid "To display the current load of all build hosts, run this command on the main node:" -msgstr "Pour afficher la charge actuelle de tous les hôtes de construction, lancez cette commande sur le nœud principal :" - -#. type: example -#: doc/guix.texi:1092 -#, no-wrap -msgid "# guix offload status\n" -msgstr "# guix offload status\n" - -#. type: cindex -#: doc/guix.texi:1098 -#, no-wrap -msgid "SELinux, daemon policy" -msgstr "SELinux, politique du démon" - -#. type: cindex -#: doc/guix.texi:1099 -#, no-wrap -msgid "mandatory access control, SELinux" -msgstr "contrôle d'accès obligatoire, SELinux" - -#. type: cindex -#: doc/guix.texi:1100 -#, no-wrap -msgid "security, guix-daemon" -msgstr "sécurité, guix-daemon" - -#. type: Plain text -#: doc/guix.texi:1106 -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 GuixSD does not provide an SELinux base policy, the daemon policy cannot be used on GuixSD." -msgstr "Guix inclus un fichier de politique SELniux dans @file{etc/guix-daemon.cil} qui peut être installé sur un système où SELinux est activé pour que les fichiers Guix soient étiquetés et pour spécifier le comportement attendu du démon. Comme GuixSD ne fournit pas de politique SELniux de base, la politique du démon ne peut pas être utilisée sur GuixSD@." - -#. type: subsubsection -#: doc/guix.texi:1107 -#, no-wrap -msgid "Installing the SELinux policy" -msgstr "Installer la politique SELinux" - -#. type: cindex -#: doc/guix.texi:1108 -#, no-wrap -msgid "SELinux, policy installation" -msgstr "SELinux, installation de la politique" - -#. type: Plain text -#: doc/guix.texi:1110 -msgid "To install the policy run this command as root:" -msgstr "Pour installer la politique, lancez cette commande en root :" - -#. type: example -#: doc/guix.texi:1113 -#, no-wrap -msgid "semodule -i etc/guix-daemon.cil\n" -msgstr "semodule -i etc/guix-daemon.cil\n" - -#. type: Plain text -#: doc/guix.texi:1117 -msgid "Then relabel the file system with @code{restorecon} or by a different mechanism provided by your system." -msgstr "Puis ré-étiquetez le système de fichier avec @code{restorecon} ou par un mécanisme différent fournit par votre système." - -#. type: Plain text -#: doc/guix.texi:1122 -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 "Une fois la politique installée, le système de fichier ré-étiqueté et le démon redémarré, il devrait être lancé dans le contexte @code{guix_daemon_t}. Vous pouvez le confirmer avec la commande suivante :" - -#. type: example -#: doc/guix.texi:1125 -#, no-wrap -msgid "ps -Zax | grep guix-daemon\n" -msgstr "ps -Zax | grep guix-daemon\n" - -#. type: Plain text -#: doc/guix.texi:1130 -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 "Surveillez les fichiers journaux de SELinux pendant que vous lancez une commande comme @code{guix build hello} pour vous convaincre que SELniux permet toutes les opérations nécessaires." - -#. type: cindex -#: doc/guix.texi:1132 -#, no-wrap -msgid "SELinux, limitations" -msgstr "SELinux, limites" - -#. type: Plain text -#: doc/guix.texi:1137 -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 "La politique n'et pas parfaite. Voici une liste de limitations et de bizarreries qui vous devriez prendre en compte avant de déployer la politique SELinux fournie pour le démon Guix." - -#. type: enumerate -#: doc/guix.texi:1144 -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} n'est pas vraiment utilisé. Aucune des opérations sur les sockets n'impliquent de contextes qui ont quoi que ce soit à voir avec @code{guix_daemon_socket_t}. Ça ne fait pas de mal d'avoir une étiquette inutilisée, mais il serait préférable de définir des règles sur les sockets uniquement pour cette étiquette." - -#. type: enumerate -#: doc/guix.texi:1155 -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} ne peut pas accéder à n'importe quel lien vers les profils. Par conception, l'étiquette de fichier de la destination d'un lien symbolique est indépendant de l'étiquette du lien lui-même. Bien que tous les profils sous $localstatedir aient une étiquette, les liens vers ces profils héritent de l'étiquette du répertoire dans lequel ils se trouvent. Pour les liens dans le répertoire personnel cela sera @code{user_home_t}. Mais pour les liens du répertoire personnel de l'utilisateur root, ou @file{/tmp}, ou du répertoire de travail du serveur HTTP, etc, cela ne fonctionnera pas. SELinux empêcherait @code{guix gc} de lire et de suivre ces liens." - -#. type: enumerate -#: doc/guix.texi:1160 -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 "La fonctionnalité du démon d'écouter des connexions TCP pourrait ne plus fonctionner. Cela demande des règles supplémentaires car SELinux traite les sockets réseau différemment des fichiers." - -#. type: enumerate -#: doc/guix.texi:1171 -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 "Actuellement tous les fichiers qui correspondent à l'expression rationnelle @code{/gnu/store/.+-(guix-.+|profile)/bin/guix-daemon} reçoivent l'étiquette @code{guix_daemon_exec_t} ; cela signifie que @emph{tout} fichier avec ce nom dans n'importe quel profil serait autorisé à se lancer dans le domaine @code{guix_daemon_t}. Ce n'est pas idéal. Un attaquant pourrait construire un paquet qui fournit cet exécutable et convaincre un utilisateur de l'installer et de le lancer, ce qui l'élève dans le domaine @code{guix_daemon_t}. À ce moment SELinux ne pourrait pas l'empêcher d'accéder à des fichiers autorisés pour les processus de ce domaine." - -#. type: enumerate -#: doc/guix.texi:1179 -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 "Nous pourrions générer une politique bien plus restrictive à l'installation, pour que seuls les noms de fichiers @emph{exacts} de l'exécutable @code{guix-daemon} actuellement installé soit étiqueté avec @code{guix_daemon_exec_t}, plutôt que d'utiliser une expression rationnelle plus large. L'inconvénient c'est que root devrait installer ou mettre à jour la politique à l'installation à chaque fois que le paquet Guix qui fournit l'exécutable @code{guix-daemon} effectivement exécuté est mis à jour." - -#. type: section -#: doc/guix.texi:1182 -#, no-wrap -msgid "Invoking @command{guix-daemon}" -msgstr "Invoquer @command{guix-daemon}" - -#. type: Plain text -#: doc/guix.texi:1188 -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 "Le programme @command{guix-daemon} implémente toutes les fonctionnalités d'accès au dépôt. Cela inclus le lancement des processus de construction, le lancement du ramasse-miettes, la demande de disponibilité des résultats de construction, etc. Il tourne normalement en @code{root} comme ceci :" - -#. type: Plain text -#: doc/guix.texi:1195 -msgid "For details on how to set it up, @pxref{Setting Up the Daemon}." -msgstr "Pour des détails sur son paramétrage, @pxref{Paramétrer le démon}." - -#. type: cindex -#: doc/guix.texi:1197 -#, no-wrap -msgid "container, build environment" -msgstr "conteneur, environnement de construction" - -#. type: cindex -#: doc/guix.texi:1199 doc/guix.texi:1737 doc/guix.texi:2397 doc/guix.texi:7858 -#, no-wrap -msgid "reproducible builds" -msgstr "constructions reproductibles" - -#. type: Plain text -#: doc/guix.texi:1211 -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 "Par défaut, @command{guix-daemon} lance les processus de construction sous différents UID récupérés depuis le groupe de construction spécifié avec @code{--build-users-group}. En plus, chaque processus de construction est lancé dans un environnement chroot qui ne contient que le sous-ensemble du dépôt dont le processus de construction dépend, tel que spécifié par sa dérivation (@pxref{Interface de programmation, dérivation}), plus un ensemble de répertoires systèmes spécifiques. Par défaut ce dernier contient @file{/dev} et @file{/dev/pts}. De plus, sous GNU/Linux, l'environnement de construction est un @dfn{conteneur} : en plus d'avoir sa propre arborescence du système de fichier, elle a un espace de montage séparé, son propre espace de PID, son espace de réseau, etc. Cela aide à obtenir des constructions reproductibles (@pxref{Fonctionnalités})." - -#. type: Plain text -#: doc/guix.texi:1220 -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. Be aware that using a directory other than @file{/tmp} can affect build results---for example, with a longer directory name, a build process that uses Unix-domain sockets might hit the name length limitation for @code{sun_path}, which it would otherwise not hit." -msgstr "Lorsque le démon effectue une construction pour le compte de l'utilisateur, il crée un répertoire sous @file{/tmp} ou sous le répertoire spécifié par sa variable d'environnement @code{TMPDIR}. Ce répertoire est partagé avec le conteneur pendant la durée de la construction. Soyez conscient qu'utiliser un répertoire différent de @file{/tmp} peut affecter les résultats de la construction — par exemple avec un nom de répertoire plus long, un processus de construction qui utiliserait des socket Unix-domain pourrait atteindre la limite de longueur de nom de fichier pour @code{sun_path}, qu'il n'aurait sinon pas atteinte." - -#. type: Plain text -#: doc/guix.texi:1224 -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 "Le répertoire de construction est automatiquement supprimé à la fin, à moins que la construction n'ait échoué et que le client ait spécifié @option{--keep-failed} (@pxref{Invoking guix build, @option{--keep-failed}})." - -#. type: Plain text -#: doc/guix.texi:1226 -msgid "The following command-line options are supported:" -msgstr "Les options en ligne de commande suivantes sont disponibles :" - -#. type: item -#: doc/guix.texi:1228 -#, no-wrap -msgid "--build-users-group=@var{group}" -msgstr "--build-users-group=@var{groupe}" - -#. type: table -#: doc/guix.texi:1231 -msgid "Take users from @var{group} to run build processes (@pxref{Setting Up the Daemon, build users})." -msgstr "Prendre les utilisateurs de @var{group} pour lancer les processus de construction (@pxref{Paramétrer le démon, utilisateurs de construction})." - -#. type: item -#: doc/guix.texi:1232 doc/guix.texi:5669 -#, no-wrap -msgid "--no-substitutes" -msgstr "--no-substitutes" - -#. type: cindex -#: doc/guix.texi:1233 doc/guix.texi:1749 doc/guix.texi:2253 -#, no-wrap -msgid "substitutes" -msgstr "substituts" - -#. type: table -#: doc/guix.texi:1237 doc/guix.texi:5673 -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 "Ne pas utiliser de substitut pour les résultats de la construction. C'est-à-dire, toujours construire localement plutôt que de permettre le téléchargement de binaires pré-construits (@pxref{Substituts})." - -#. type: table -#: doc/guix.texi:1241 -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 "Lorsque le démon tourne avec @code{--no-substitutes}, les clients peuvent toujours activer explicitement la substitution @i{via} l'appel de procédure distante @code{set-build-options} (@pxref{The Store})." - -#. type: item -#: doc/guix.texi:1242 doc/guix.texi:5656 doc/guix.texi:7107 doc/guix.texi:7983 -#: doc/guix.texi:8171 -#, no-wrap -msgid "--substitute-urls=@var{urls}" -msgstr "--substitute-urls=@var{urls}" - -#. type: anchor{#1} -#: doc/guix.texi:1248 -msgid "daemon-substitute-urls" -msgstr "daemon-substitute-urls" - -#. type: table -#: doc/guix.texi:1248 -msgid "Consider @var{urls} the default whitespace-separated list of substitute source URLs. When this option is omitted, @indicateurl{https://mirror.hydra.gnu.org https://hydra.gnu.org} is used (@code{mirror.hydra.gnu.org} is a mirror of @code{hydra.gnu.org})." -msgstr "Considèrer @var{urls} comme la liste séparée par des espaces des URL des sources de substituts par défaut. Lorsque cette option est omise, @indicateurl{https://mirror.hydra.gnu.org https://hydra.gnu.org} est utilisé (@code{mirror.hydra.gnu.org} est un mirroire de @code{hydra.gnu.org})." - -#. type: table -#: doc/guix.texi:1251 -msgid "This means that substitutes may be downloaded from @var{urls}, as long as they are signed by a trusted signature (@pxref{Substitutes})." -msgstr "Cela signifie que les substituts sont téléchargés depuis les @var{urls}, tant qu'ils sont signés par une signature de confiance (@pxref{Substituts})." - -#. type: item -#: doc/guix.texi:1253 doc/guix.texi:5694 -#, no-wrap -msgid "--no-build-hook" -msgstr "--no-build-hook" - -#. type: table -#: doc/guix.texi:1255 -msgid "Do not use the @dfn{build hook}." -msgstr "Ne pas utiliser le @dfn{crochet de construction}." - -#. type: table -#: doc/guix.texi:1259 -msgid "The build hook is a helper program that the daemon can start and to which it submits build requests. This mechanism is used to offload builds to other machines (@pxref{Daemon Offload Setup})." -msgstr "Le crochet de construction est un programme d'aide qui le démon peut démarrer et auquel soumettre les requêtes de construction. Ce mécanisme est utilisé pour décharger les constructions à d'autres machines (@pxref{Daemon Offload Setup})." - -#. type: item -#: doc/guix.texi:1260 -#, no-wrap -msgid "--cache-failures" -msgstr "--cache-failures" - -#. type: table -#: doc/guix.texi:1262 -msgid "Cache build failures. By default, only successful builds are cached." -msgstr "Mettre les échecs de construction en cache. Par défaut, seules les constructions réussies sont mises en cache." - -#. type: table -#: doc/guix.texi:1267 -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 "Lorsque cette option est utilisée, @command{guix gc --list-failures} peut être utilisé pour demander l'ensemble des éléments du dépôt marqués comme échoués ; @command{guix gc --clear-failures} vide la liste des éléments aillant échoué. @xref{Invoking guix gc}." - -#. type: item -#: doc/guix.texi:1268 doc/guix.texi:5718 -#, no-wrap -msgid "--cores=@var{n}" -msgstr "--cores=@var{n}" - -#. type: itemx -#: doc/guix.texi:1269 doc/guix.texi:5719 -#, no-wrap -msgid "-c @var{n}" -msgstr "-c @var{n}" - -#. type: table -#: doc/guix.texi:1272 -msgid "Use @var{n} CPU cores to build each derivation; @code{0} means as many as available." -msgstr "Utiliser @var{n} cœurs CPU pour construire chaque dérivation ; @code{0} signifie autant que possible." - -#. type: table -#: doc/guix.texi:1276 -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 "La valeur par défaut est @code{0}, mais elle peut être modifiée par les clients comme avec l'option @code{--cores} de @command{guix build} (@pxref{Invoking guix build})." - -#. type: table -#: doc/guix.texi:1280 -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 "L'effet est de définir la variable d'environnement @code{NIX_BUILD_CORES} dans le processus de construction, qui peut ensuite l'utiliser pour exploiter le parallélisme en interne — par exemple en lançant @code{make -j$NIX_BUILD_CORES}." - -#. type: item -#: doc/guix.texi:1281 doc/guix.texi:5723 -#, no-wrap -msgid "--max-jobs=@var{n}" -msgstr "--max-jobs=@var{n}" - -#. type: itemx -#: doc/guix.texi:1282 doc/guix.texi:5724 -#, no-wrap -msgid "-M @var{n}" -msgstr "-M @var{n}" - -#. type: table -#: doc/guix.texi:1287 -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 "Permettre au plus @var{n} travaux de construction en parallèle. La valeur par défaut est @code{1}. La mettre à @code{0} signifie qu'aucune construction ne sera effectuée localement ; à la place, le démon déchargera les constructions (@pxref{Daemon Offload Setup}) ou échouera." - -#. type: item -#: doc/guix.texi:1288 doc/guix.texi:5699 -#, no-wrap -msgid "--max-silent-time=@var{seconds}" -msgstr "--max-silent-time=@var{secondes}" - -#. type: table -#: doc/guix.texi:1291 doc/guix.texi:5702 -msgid "When the build or substitution process remains silent for more than @var{seconds}, terminate it and report a build failure." -msgstr "Lorsque le processus de construction ou de substitution restent silencieux pendant plus de @var{secondes}, le terminer et rapporter une erreur de construction." - -#. type: table -#: doc/guix.texi:1293 doc/guix.texi:1302 -msgid "The default value is @code{0}, which disables the timeout." -msgstr "La valeur par défaut est @code{0}, ce qui désactive le délai." - -#. type: table -#: doc/guix.texi:1296 -msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @code{--max-silent-time}})." -msgstr "La valeur spécifiée ici peut être modifiée par les clients (@pxref{Common Build Options, @code{--max-silent-time}})." - -#. type: item -#: doc/guix.texi:1297 doc/guix.texi:5706 -#, no-wrap -msgid "--timeout=@var{seconds}" -msgstr "--timeout=@var{secondes}" - -#. type: table -#: doc/guix.texi:1300 doc/guix.texi:5709 -msgid "Likewise, when the build or substitution process lasts for more than @var{seconds}, terminate it and report a build failure." -msgstr "De même, lorsque le processus de construction ou de substitution dure plus de @var{secondes}, le terminer et rapporter une erreur de construction." - -#. type: table -#: doc/guix.texi:1305 -msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @code{--timeout}})." -msgstr "La valeur spécifiée ici peut être modifiée par les clients (@pxref{Common Build Options, @code{--timeout}})." - -#. type: item -#: doc/guix.texi:1306 -#, no-wrap -msgid "--rounds=@var{N}" -msgstr "--rounds=@var{N}" - -#. type: table -#: doc/guix.texi:1311 -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 "Construire chaque dérivations @var{N} fois à la suite, et lever une erreur si les résultats de construction consécutifs ne sont pas identiques bit-à-bit. Remarquez que ce paramètre peut être modifié par les clients comme @command{guix build} (@pxref{Invoking guix build})." - -#. type: table -#: doc/guix.texi:1315 doc/guix.texi:6008 -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 "Lorsqu'utilisé avec @option{--keep-failed}, la sourtie différente est gardée dans le dépôt sous @file{/gnu/store/@dots{}-check}. Cela rend plus facile l'étude des différences entre les deux résultats." - -#. type: item -#: doc/guix.texi:1316 -#, no-wrap -msgid "--debug" -msgstr "--debug" - -#. type: table -#: doc/guix.texi:1318 -msgid "Produce debugging output." -msgstr "Produire une sortie de débogage." - -#. type: table -#: doc/guix.texi:1322 -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 "Cela est utile pour déboguer des problèmes de démarrage du démon, mais ensuite elle peut être modifiée par les clients, par exemple par l'option @code{--verbosity} de @command{guix build} (@pxref{Invoking guix build})." - -#. type: item -#: doc/guix.texi:1323 -#, no-wrap -msgid "--chroot-directory=@var{dir}" -msgstr "--chroot-directory=@var{rép}" - -#. type: table -#: doc/guix.texi:1325 -msgid "Add @var{dir} to the build chroot." -msgstr "Ajouter @var{rép} au chroot de construction" - -#. type: table -#: doc/guix.texi:1331 -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 "Cela peut changer le résultat d'un processus de construction — par exemple s'il utilise une dépendance facultative trouvée dans @var{rép} lorsqu'elle est disponible ou pas sinon. Pour cette raison, il n'est pas recommandé d'utiliser cette option. À la place, assurez-vous que chaque dérivation déclare toutes les entrées dont elle a besoin." - -#. type: item -#: doc/guix.texi:1332 -#, no-wrap -msgid "--disable-chroot" -msgstr "--disable-chroot" - -#. type: table -#: doc/guix.texi:1334 -msgid "Disable chroot builds." -msgstr "Désactive les constructions dans un chroot." - -#. type: table -#: doc/guix.texi:1339 -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 "Utiliser cette option n'est pas recommandé car, de nouveau, elle permet aux processus de construction d'accéder à des dépendances non déclarées. Elle est nécessaire cependant lorsque @command{guix-daemon} tourne en tant qu'utilisateur non privilégié." - -#. type: item -#: doc/guix.texi:1340 -#, no-wrap -msgid "--log-compression=@var{type}" -msgstr "--log-compression=@var{type}" - -#. type: table -#: doc/guix.texi:1343 -msgid "Compress build logs according to @var{type}, one of @code{gzip}, @code{bzip2}, or @code{none}." -msgstr "Compresser les journaux de construction suivant le @var{type}, parmi @code{gzip}, @code{bzip2} ou @code{none}." - -#. type: table -#: doc/guix.texi:1347 -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 "À moins que @code{--lose-logs} ne soit utilisé, tous les journaux de construction sont gardés dans @var{localstatedir}. Pour gagner de la place, le démon les compresse automatiquement avec bzip2 par défaut." - -#. type: item -#: doc/guix.texi:1348 -#, no-wrap -msgid "--disable-deduplication" -msgstr "--disable-deduplication" - -#. type: cindex -#: doc/guix.texi:1349 doc/guix.texi:2713 -#, no-wrap -msgid "deduplication" -msgstr "déduplication" - -#. type: table -#: doc/guix.texi:1351 -msgid "Disable automatic file ``deduplication'' in the store." -msgstr "Désactiver la « déduplication » automatique des fichiers dans le dépôt." - -#. type: table -#: doc/guix.texi:1358 -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 "Par défaut, les fichiers ajoutés au dépôt sont automatiquement « dédupliqués » : si un nouveau fichier est identique à un autre fichier trouvé dans le dépôt, le démon en fait un lien en dur vers l'autre fichier. Cela réduit considérablement l'utilisation de l'espace disque au prix d'une charge en entrée/sortie plus grande à la fin d'un processus de construction. Cette option désactive cette optimisation." - -#. type: item -#: doc/guix.texi:1359 -#, no-wrap -msgid "--gc-keep-outputs[=yes|no]" -msgstr "--gc-keep-outputs[=yes|no]" - -#. type: table -#: doc/guix.texi:1362 -msgid "Tell whether the garbage collector (GC) must keep outputs of live derivations." -msgstr "Dire si le ramasse-miettes (GC) doit garder les sorties des dérivations utilisées." - -#. type: cindex -#: doc/guix.texi:1363 doc/guix.texi:2548 -#, no-wrap -msgid "GC roots" -msgstr "racines du GC" - -#. type: cindex -#: doc/guix.texi:1364 doc/guix.texi:2549 -#, no-wrap -msgid "garbage collector roots" -msgstr "racines du ramasse-miettes" - -#. type: table -#: doc/guix.texi:1369 -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 GC roots. @xref{Invoking guix gc}, for more on GC roots." -msgstr "Lorsqu'elle est à « yes », le GC gardera les sorties de toutes les dérivations — les fichiers @code{.drv} — utilisées dans le dépôt. La valeur par défaut est « no », ce qui signifie que les sorties des dérivations ne sont gardées que s'il s'agit de racines du GC@. @xref{Invoking guix gc} pour plus d'informations sur les racines du GC@." - -#. type: item -#: doc/guix.texi:1370 -#, no-wrap -msgid "--gc-keep-derivations[=yes|no]" -msgstr "--gc-keep-derivations[=yes|no]" - -#. type: table -#: doc/guix.texi:1373 -msgid "Tell whether the garbage collector (GC) must keep derivations corresponding to live outputs." -msgstr "Dire si le ramasse-miettes (GC) doit garder les dérivations correspondant à des sorties utilisées." - -#. type: table -#: doc/guix.texi:1378 -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 "Lorsqu'elle est à « yes », comme c'est le cas par défaut, le GC garde les dérivations — c.-à-d.@: les fichiers @file{.drv} — tant qu'au moins une de leurs sorties est utilisée. Cela permet aux utilisateurs de garder une trace de l'origine des éléments du dépôt. Le mettre à « no » préserve un peu d'espace disque." - -#. type: table -#: doc/guix.texi:1385 -msgid "Note that when both @code{--gc-keep-derivations} and @code{--gc-keep-outputs} are used, 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 live. This is convenient for developers since it saves rebuilds or downloads." -msgstr "Remarquez qu'avec @code{--gc-keep-derivations} et @code{--gc-keep-outputs}, le GC gardera tous les prérequis de construction (les sources, le compilateur, les bibliothèques, et les autres outils de construction) des objets utilisés dans le dépôt, indépendamment du fait qu'ils soient ou non utilisés. Cela est pratique pour les développeurs car ça leur fait gagner du temps de reconstruction et de téléchargement." - -#. type: item -#: doc/guix.texi:1386 -#, no-wrap -msgid "--impersonate-linux-2.6" -msgstr "--impersonate-linux-2.6" - -#. type: table -#: doc/guix.texi:1389 -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 "Sur les système basés sur Linux, se faire passer pour Linux 2.6. Cela signifie que l'appel système du noyau @code{uname} rapportera 2.6 comme numéro de version." - -#. type: table -#: doc/guix.texi:1392 -msgid "This might be helpful to build programs that (usually wrongfully) depend on the kernel version number." -msgstr "Cela peut être utile pour construire des programmes qui dépendent (généralement sans fondement) du numéro de version du noyau." - -#. type: item -#: doc/guix.texi:1393 -#, no-wrap -msgid "--lose-logs" -msgstr "--lose-logs" - -#. type: table -#: doc/guix.texi:1396 -msgid "Do not keep build logs. By default they are kept under @code{@var{localstatedir}/guix/log}." -msgstr "Ne pas garder les journaux de construction. Par défaut ils sont gardés dans @code{@var{localstatedir}/guix/log}." - -#. type: item -#: doc/guix.texi:1397 doc/guix.texi:3009 doc/guix.texi:5954 doc/guix.texi:7134 -#: doc/guix.texi:7542 doc/guix.texi:8176 doc/guix.texi:20532 -#: doc/guix.texi:21076 -#, no-wrap -msgid "--system=@var{system}" -msgstr "--system=@var{système}" - -#. type: table -#: doc/guix.texi:1401 -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 "Supposer que @var{système} est le type de système actuel. Par défaut c'est la paire architecture-noyau trouvée à la configuration, comme @code{x86_64-linux}." - -#. type: item -#: doc/guix.texi:1402 -#, no-wrap -msgid "--listen=@var{endpoint}" -msgstr "--listen=@var{extrémité}" - -#. type: table -#: doc/guix.texi:1407 -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 "Écouter les connexions sur @var{extrémité}. @var{extrémité} est interprété comme un nom de fichier d'un socket Unix-domain s'il commence par @code{/} (barre oblique). Sinon, @var{extrémité} est interprété comme un nom de domaine ou d'hôte et un port sur lequel écouter. Voici quelques exemples :" - -#. type: item -#: doc/guix.texi:1409 -#, no-wrap -msgid "--listen=/gnu/var/daemon" -msgstr "--listen=/gnu/var/daemon" - -#. type: table -#: doc/guix.texi:1412 -msgid "Listen for connections on the @file{/gnu/var/daemon} Unix-domain socket, creating it if needed." -msgstr "Écouter les connexions sur le socket Unix-domain @file{/gnu/var/daemon} en le créant si besoin." - -#. type: item -#: doc/guix.texi:1413 -#, no-wrap -msgid "--listen=localhost" -msgstr "--listen=localhost" - -#. type: cindex -#: doc/guix.texi:1414 doc/guix.texi:4373 -#, no-wrap -msgid "daemon, remote access" -msgstr "démon, accès distant" - -#. type: cindex -#: doc/guix.texi:1415 doc/guix.texi:4374 -#, no-wrap -msgid "remote access to the daemon" -msgstr "accès distant au démon" - -#. type: cindex -#: doc/guix.texi:1416 doc/guix.texi:4375 -#, no-wrap -msgid "daemon, cluster setup" -msgstr "démon, paramètres de grappes" - -#. type: cindex -#: doc/guix.texi:1417 doc/guix.texi:4376 -#, no-wrap -msgid "clusters, daemon setup" -msgstr "grappes, paramètres du démon" - -#. type: table -#: doc/guix.texi:1420 -msgid "Listen for TCP connections on the network interface corresponding to @code{localhost}, on port 44146." -msgstr "Écouter les connexions TCP sur l'interface réseau correspondant à @code{localhost} sur le port 44146." - -#. type: item -#: doc/guix.texi:1421 -#, no-wrap -msgid "--listen=128.0.0.42:1234" -msgstr "--listen=128.0.0.42:1234" - -#. type: table -#: doc/guix.texi:1424 -msgid "Listen for TCP connections on the network interface corresponding to @code{128.0.0.42}, on port 1234." -msgstr "Écouter les connexions TCP sur l'interface réseau correspondant à @code{128.0.0.42} sur le port 1234." - -#. type: table -#: doc/guix.texi:1431 -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 "Cette option peut être répétée plusieurs fois, auquel cas @command{guix-daemon} accepte des connexions sur toutes les extrémités spécifiées. Les utilisateurs peuvent dire aux commandes clientes à quelle extrémité se connecter en paramétrant la variable d'environnement @code{GUIX_DAEMON_SOCKET} (@pxref{The Store, @code{GUIX_DAEMON_SOCKET}})." - -#. type: quotation -#: doc/guix.texi:1432 doc/guix.texi:2330 doc/guix.texi:2844 doc/guix.texi:3071 -#: doc/guix.texi:4343 doc/guix.texi:4411 doc/guix.texi:5959 doc/guix.texi:5971 -#: doc/guix.texi:7434 doc/guix.texi:8061 doc/guix.texi:8279 doc/guix.texi:8490 -#: doc/guix.texi:11758 doc/guix.texi:20859 doc/guix.texi:21057 -#: doc/guix.texi:21144 doc/guix.texi:21988 -#, no-wrap -msgid "Note" -msgstr "Remarque" - -#. type: quotation -#: doc/guix.texi:1438 -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 "Le protocole du démon est @emph{non authentifié et non chiffré}. Utiliser @code{--listen=@var{host}} est adapté sur des réseaux locaux, comme pour des grappes de serveurs, où seuls des nœuds de confiance peuvent se connecter au démon de construction. Dans les autres cas où l'accès à distance au démon est requis, nous conseillons d'utiliser un socket Unix-domain avec SSH@." - -#. type: table -#: doc/guix.texi:1443 -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 "Lorsque @code{--listen} est omis, @command{guix-daemon} écoute les connexions sur le socket Unix-domain situé à @file{@var{localstatedir}/guix/daemon-socket/socket}." - -#. type: Plain text -#: doc/guix.texi:1453 -msgid "When using Guix on top of GNU/Linux distribution other than GuixSD---a so-called @dfn{foreign distro}---a few additional steps are needed to get everything in place. Here are some of them." -msgstr "Lorsque vous utilisez Guix par dessus une distribution GNU/Linux différente de GuixSD — ce qu'on appelle une @dfn{distro externe} — quelques étapes supplémentaires sont requises pour que tout soit en place. En voici certaines." - -#. type: anchor{#1} -#: doc/guix.texi:1457 -msgid "locales-and-locpath" -msgstr "locales-and-locpath" - -#. type: cindex -#: doc/guix.texi:1457 -#, no-wrap -msgid "locales, when not on GuixSD" -msgstr "régionalisation, en dehors de GuixSD" - -#. type: vindex -#: doc/guix.texi:1458 doc/guix.texi:9777 -#, no-wrap -msgid "LOCPATH" -msgstr "LOCPATH" - -#. type: vindex -#: doc/guix.texi:1459 -#, no-wrap -msgid "GUIX_LOCPATH" -msgstr "GUIX_LOCPATH" - -#. type: Plain text -#: doc/guix.texi:1464 -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 "Les paquets installés @i{via} Guix n'utiliseront pas les données de régionalisation du système hôte. À la place, vous devrez d'abord installer l'un des paquets linguistiques disponibles dans Guix puis définir la variable d'environnement @code{GUIX_LOCPATH} :" - -#. type: example -#: doc/guix.texi:1468 -#, no-wrap +"\n" +" --with-graft=PAQUET=REMPLACEMENT\n" +" greffer le paquet REMPLACEMENT sur les paquets qui font référence à PAQUET" + +#: guix/scripts/build.scm:325 +#, scheme-format +msgid "transformation '~a' had no effect on ~a~%" +msgstr "la transformation « ~a » n'a pas d'effet sur ~a~%" + +#: guix/scripts/build.scm:343 msgid "" -"$ guix package -i glibc-locales\n" -"$ export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale\n" +"\n" +" -L, --load-path=DIR prepend DIR to the package module search path" msgstr "" -"$ guix package -i glibc-locales\n" -"$ export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale\n" - -#. type: Plain text -#: doc/guix.texi:1474 -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." -msgstr "Remarquez que le paquet @code{glibc-locales} contient les données pour tous les environnement linguistiques supportés par la GNU@tie{}libc et pèse environ 110@tie{}Mo. Autrement, les @code{glibc-utf8-locales} est plus petit mais limité à quelques environnements UTF-8." - -#. type: Plain text -#: doc/guix.texi:1478 -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 "La variable @code{GUIX_LOCPATH} joue un rôle similaire à @code{LOCPATH} (@pxref{Locale Names, @code{LOCPATH},, libc, The GNU C Library Reference Manual}). Il y a deux différences importantes cependant :" - -#. type: enumerate -#: doc/guix.texi:1485 -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} n'est compris que par la libc dans Guix et pas par la libc fournie par les distros externes. Ainsi, utiliser @code{GUIX_LOCPATH} vous permet de vous assurer que les programmes de la distro externe ne chargeront pas de données linguistiques incompatibles." - -#. type: enumerate -#: doc/guix.texi:1492 -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 "La libc ajoute un suffixe @code{/X.Y} à chaque entrée de @code{GUIX_LOCPATH}, où @code{X.Y} est la version de la libc — p.@: ex.@: @code{2.22}. Cela signifie que, si votre profile Guix contient un mélange de programmes liés avec des versions différentes de la libc, chaque version de la libc essaiera de charger les environnements linguistiques dans le bon format." - -#. type: Plain text -#: doc/guix.texi:1496 -msgid "This is important because the locale data format used by different libc versions may be incompatible." -msgstr "Cela est important car le format des données linguistiques utilisés par différentes version de la libc peuvent être incompatibles." - -#. type: cindex -#: doc/guix.texi:1499 -#, no-wrap -msgid "name service switch, glibc" -msgstr "name service switch, glibc" - -#. type: cindex -#: doc/guix.texi:1500 -#, no-wrap -msgid "NSS (name service switch), glibc" -msgstr "NSS (name service switch), glibc" - -#. type: cindex -#: doc/guix.texi:1501 -#, no-wrap -msgid "nscd (name service caching daemon)" -msgstr "nscd (name service caching daemon)" - -#. type: cindex -#: doc/guix.texi:1502 -#, no-wrap -msgid "name service caching daemon (nscd)" -msgstr "name service caching daemon (nscd)" - -#. type: Plain text -#: doc/guix.texi:1509 -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 "Lorsque vous utilisez Guix sur une distro externe, nous @emph{recommandons fortement} que ce système fasse tourner le @dfn{démon de cache de service de noms} de la bibliothèque C de GNU, @command{nscd}, qui devrait écouter sur le socket @file{/var/run/nscd/socket}. Sans cela, les applications installées avec Guix peuvent échouer à résoudre des noms d'hôtes ou d'utilisateurs, ou même planter. Les paragraphes suivants expliquent pourquoi." - -#. type: file{#1} -#: doc/guix.texi:1510 -#, no-wrap -msgid "nsswitch.conf" -msgstr "nsswitch.conf" - -#. type: Plain text -#: doc/guix.texi:1515 -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 "La bibliothèque C de GNU implémente un @dfn{name service switch} (NSS), qui est un mécanisme d'extension pour les « résolutions de noms » en général : résolution de nom d'hôte, de compte utilisateur et plus (@pxref{Name Service Switch,,, libc, The GNU C Library Reference Manual})." - -#. type: cindex -#: doc/guix.texi:1516 -#, no-wrap -msgid "Network information service (NIS)" -msgstr "Network information service (NIS)" - -#. type: cindex -#: doc/guix.texi:1517 -#, no-wrap -msgid "NIS (Network information service)" -msgstr "NIS (Network information service)" - -#. type: Plain text -#: doc/guix.texi:1526 -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 "Comme il est extensible, NSS supporte des @dfn{greffons} qui fournissent une nouvelle implémentation de résolution de nom : par exemple le greffon @code{nss-mdns} permet la résolution de noms d'hôtes en @code{.local}, le greffon @code{nis} permet la résolution de comptes utilisateurs avec le Network Information Service (NIS), etc. Ces « services de recherches » supplémentaires sont configurés au niveau du système dans @file{/etc/nsswitch.conf}, et tous les programmes qui tournent sur ce système honorent ces paramètres (@pxref{NSS Configuration File,,, libc, The GNU C Reference Manual})" - -#. type: Plain text -#: doc/guix.texi:1536 -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 "Lorsqu'ils essayent d'effectuer une résolution de nom — par exemple en appelant la fonction @code{getaddrinfo} en C — les applications essayent d'abord de se connecter au nscd ; en cas de réussite, nscd effectue la résolution de nom pour eux. Si le nscd ne tourne pas, alors ils effectue la résolution eux-même, en changeant les service de résolution dans leur propre espace d'adressage et en le lançant. Ce services de résolution de noms — les fichiers @file{libnns_*.so} — sont @code{dlopen}és mais ils peuvent provenir de la bibliothèque C du système, plutôt que de la bibliothèque C à laquelle l'application est liée (la bibliothèque C de Guix)." - -#. type: Plain text -#: doc/guix.texi:1541 -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 "Et c'est là que se trouve le problème : si votre application est liée à la bibliothèque C de Guix (disons, glibc-2.24) et essaye de charger les greffons NSS d'une autre bibliothèque C (disons, @code{libnss_mdns.so} pour glibc-2.22), il est très probable qu'elle plante ou que sa résolution de nom échoue de manière inattendue." - -#. type: Plain text -#: doc/guix.texi:1546 -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 "Lancer @command{nscd} sur le système, entre autres avantages, élimine ce problème d'incompatibilité binaire car ces fichiers @code{libnss_*.so} sont chargés par le processus @command{nscd}, pas par l'application elle-même." - -#. type: subsection -#: doc/guix.texi:1547 -#, no-wrap -msgid "X11 Fonts" -msgstr "Polices X11" - -#. type: cindex -#: doc/guix.texi:1549 doc/guix.texi:22554 -#, no-wrap -msgid "fonts" -msgstr "polices" - -#. type: Plain text -#: doc/guix.texi:1557 -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 "La majorité des applications graphiques utilisent fontconfig pour trouver et charger les police et effectuer le rendu côté client X11. Le paquet @code{fontconfig} dans Guix cherche les polices dans @file{$HOME/.guix-profile} par défaut. Ainsi, pour permettre aux applications graphiques installées avec Guix d'afficher des polices, vous devez aussi installer des polices avec Guix. Les paquets de polices essentiels sont @code{gs-fonts}, @code{font-dejavu} et @code{font-gnu-freefont-ttf}." - -#. type: Plain text -#: doc/guix.texi:1564 -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 "Pour afficher des textes écrits en chinois, en japonais ou en coréen dans les applications graphiques, installez @code{font-adobe-source-han-sans} ou @code{font-wqy-zenhei}. Le premier a plusieurs sorties, une par famille de langue (@pxref{Packages with Multiple Outputs}). Par exemple, la commande suivante installe les polices pour le chinois :" - -#. type: example -#: doc/guix.texi:1567 -#, no-wrap -msgid "guix package -i font-adobe-source-han-sans:cn\n" -msgstr "guix package -i font-adobe-source-han-sans:cn\n" - -#. type: code{#1} -#: doc/guix.texi:1569 -#, no-wrap -msgid "xterm" -msgstr "xterm" - -#. type: Plain text -#: doc/guix.texi:1573 -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 "Les vieux programmes comme @command{xterm} n'utilisent pas fontconfig et s'appuient sur le rendu du côté du serveur. Ces programmes ont besoin de spécifier le nom complet de la police en utlisant XLFD (X Logical Font Description), comme ceci :" - -#. type: example -#: doc/guix.texi:1576 -#, 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:1580 -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 "Pour pouvoir utiliser ces noms complets avec les polices TrueType installées dans votre profil Guix, vous devez étendre le chemin des polices du serveur X :" - -#. type: example -#: doc/guix.texi:1585 -#, 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:1587 -#, no-wrap -msgid "xlsfonts" -msgstr "xlsfonts" - -#. type: Plain text -#: doc/guix.texi:1590 -msgid "After that, you can run @code{xlsfonts} (from @code{xlsfonts} package) to make sure your TrueType fonts are listed there." -msgstr "Ensuite, vous pouvez lancer @code{xlsfonts} (du paquet @code{xlsfonts}) pour vous assurer que vos polices TrueType y sont listées." - -#. type: code{#1} -#: doc/guix.texi:1591 -#, no-wrap -msgid "fc-cache" -msgstr "fc-cache" - -#. type: cindex -#: doc/guix.texi:1592 -#, no-wrap -msgid "font cache" -msgstr "cache de polices" - -#. type: Plain text -#: doc/guix.texi:1598 -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." -msgstr "Après l'installation des polices vous devrez peut-être rafraîchir le cache des polices pour pouvoir les utiliser dans les applications. Ça s'applique aussi lorsque les applications installées avec Guix n'ont pas l'air de trouver les polices. Pour forcer la reconstruction du cache de polices lancez @code{fc-cache -f}. La commande @code{fc-cache} est fournie par le paquet @code{fontconfig}." - -#. type: code{#1} -#: doc/guix.texi:1601 doc/guix.texi:20271 -#, no-wrap -msgid "nss-certs" -msgstr "nss-certs" - -#. type: Plain text -#: doc/guix.texi:1604 -msgid "The @code{nss-certs} package provides X.509 certificates, which allow programs to authenticate Web servers accessed over HTTPS." -msgstr "Le paquet @code{nss-certs} fournit les certificats X.509 qui permettent aux programmes d'authentifier les serveurs web par HTTPS@." - -#. type: Plain text -#: doc/guix.texi:1609 -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 "Lorsque vous utilisez Guix sur une distribution externe, vous pouvez installer ce paquet et définir les variables d'environnement adéquates pour que les paquets sachent où trouver les certificats. @xref{X.509 Certificates}, pour des informations détaillées." - -#. type: subsection -#: doc/guix.texi:1610 -#, no-wrap -msgid "Emacs Packages" -msgstr "Paquets emacs" - -#. type: code{#1} -#: doc/guix.texi:1612 -#, no-wrap -msgid "emacs" -msgstr "emacs" - -#. type: Plain text -#: doc/guix.texi:1623 -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 "Lorsque vous installez les paquets Emacs avec Guix, les fichiers elisp peuvent être placés soit dans @file{$HOME/.guix-profile/share/emacs/site-lisp/} soit dans des sous-répertoires de @file{$HOME/.guix-profile/share/emacs/site-lisp/guix.d/}. Ce dernier existe car il existe potentiellement des milliers de paquets Emacs et stocker leurs fichiers dans un seul répertoire peut ne pas être fiable (à cause de conflits de noms). Donc on pense qu'utiliser un répertoire séparé est une bonne idée. C'est très similaire à la manière dont le système de paquet d'Emacs organise la structure de fichiers (@pxref{Package Files,,, emacs, The GNU Emacs Manual})." - -#. type: Plain text -#: doc/guix.texi:1629 -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})." -msgstr "Par défaut, Emacs (installé avec Guix) « sait » où ces paquets ce trouvent, donc vous n'avez pas besoin de le configurer. Si, pour quelque raison que ce soit, vous souhaitez éviter de charger automatiquement les paquets Emacs installés avec Guix, vous pouvez le faire en lançaint Emacs avec l'option @code{--no-site-file} (@pxref{Init File,,, emacs, The GNU Emacs Manual})." - -#. type: subsection -#: doc/guix.texi:1630 -#, no-wrap -msgid "The GCC toolchain" -msgstr "La chaîne d'outils GCC" - -#. type: cindex -#: doc/guix.texi:1632 -#, no-wrap -msgid "GCC" -msgstr "GCC" - -#. type: cindex -#: doc/guix.texi:1633 -#, no-wrap -msgid "ld-wrapper" -msgstr "ld-wrapper" - -#. type: Plain text -#: doc/guix.texi:1642 -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 offre des paquets de compilateurs individuels comme @code{gcc} mais si vous avez besoin d'une chaîne de compilation complète pour compiler et lier du code source, vous avez en fait besoin du paquet @code{gcc-toolchain}. Ce paquet fournit une chaîne d'outils GCC pour le développement C/C++, dont GCC lui-même, la bibliothèque C de GNU (les en-têtes et les binaires, plus les symboles de débogage dans la sortie @code{debug}), Binutils et une enveloppe pour l'éditeur de liens." - -#. type: cindex -#: doc/guix.texi:1643 -#, no-wrap -msgid "attempt to use impure library, error message" -msgstr "tentative d'utiliser une bibliothèque impure, message d'erreur" - -#. type: Plain text -#: doc/guix.texi:1653 -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. By default, the linker wrapper refuses to link to libraries outside the store to ensure ``purity''. This can be annoying when using the toolchain to link with local libraries. To allow references to libraries outside the store you need to define the environment variable @code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES}." -msgstr "Le rôle de l'enveloppe est d'inspecter les paramètres @code{-L} et @code{-l} passés à l'éditeur de liens, d'ajouter des arguments @code{-rpath} correspondants et d'invoquer le véritable éditeur de liens avec ce nouvel ensemble d'arguments. Par défaut, l'enveloppe refuse de lier des bibliothèques en dehors du dépôt pour assure la « pureté ». Cela peut être embêtant lorsque vous utilisez la chaîne d'outils pour lier des bibliothèques locales. Pour permettre des références à des bibliothèques en dehors du dépôt, vous devrez définir la variable d'environnement @code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES}." - -#. type: cindex -#: doc/guix.texi:1660 -#, no-wrap -msgid "packages" -msgstr "paquets" - -#. type: Plain text -#: doc/guix.texi:1665 -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 "Le but de GNU Guix est de permettre à ses utilisateurs d'installer, mettre à jour et supprimer facilement des paquets logiciels sans devoir connaître leur procédure de construction ou leurs dépendances. Guix va aussi plus loin que ces fonctionnalités évidentes." - -#. type: Plain text -#: doc/guix.texi:1673 -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 "Ce chapitre décrit les principales fonctionnalités de Guix, ainsi que des outils de gestion des paquets qu'il fournit. En plus de l'interface en ligne de commande décrite en dessous de (@pxref{Invoquer guix package, @code{guix package}}), vous pouvez aussi utiliser l'interface Emacs-Guix (@pxref{Top,,, emacs-guix, Le manuel de référence de emacs-guix}), après avoir installé le paquet @code{emacs-guix} (lancez la commande @kbd{M-x guix-help} pour le démarrer) :" - -#. type: example -#: doc/guix.texi:1676 -#, no-wrap -msgid "guix package -i emacs-guix\n" -msgstr "guix package -i emacs-guix\n" - -#. type: Plain text -#: doc/guix.texi:1695 -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 "Lorsque vous utilisez Guix, chaque paquet arrive dans @dfn{dépôt des paquets}, dans son propre répertoire — quelque chose comme @file{/gnu/store/xxx-paquet-1.2}, où @code{xxx} est une chaîne en base32." - -#. type: Plain text -#: doc/guix.texi:1700 -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 "Plutôt que de se rapporter à ces répertoires, les utilisateurs ont leur propre @dfn{profil} qui pointe vers les paquets qu'ils veulent vraiment utiliser. Ces profils sont stockés dans le répertoire personnel de chaque utilisateur dans @code{$HOME/.guix-profile}." - -#. type: Plain text -#: doc/guix.texi:1708 -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 "Par exemple, @code{alice} installe GCC 4.7.2. Il en résulte que @file{/home/alice/.guix-profile/bin/gcc} pointe vers @file{/gnu/store/@dots{}-gcc-4.7.2/bin/gcc}. Maintenant, sur la même machine, @code{bob} a déjà intallé GCC 4.8.0. Le profil de @code{bob} continue simplement de pointer vers @file{/gnu/store/@dots{}-gcc-4.8.0/bin/gcc} — c.-à-d.@: les deux versions de GCC coexistent surs le même système sans aucune interférence." - -#. type: Plain text -#: doc/guix.texi:1712 -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 "La commande @command{guix package} est l'outil central pour gérer les paquets (@pxref{Invoking guix package}). Il opère sur les profils utilisateurs et peut être utilisé avec les @emph{privilèges utilisateurs normaux}." - -#. type: cindex -#: doc/guix.texi:1713 doc/guix.texi:1782 -#, no-wrap -msgid "transactions" -msgstr "transactions" - -#. type: Plain text -#: doc/guix.texi:1720 -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 "La commande fournit les opérations évidentes d'installation, de suppression et de mise à jour. Chaque invocation est en fait une @emph{transaction} : soit l'opération demandée réussi, soit rien ne se passe. Ainsi, si le processus @command{guix package} est terminé pendant la transaction ou si une panne de courant arrive pendant la transaction, le profil de l'utilisateur reste dans son état précédent et reste utilisable." - -#. type: Plain text -#: doc/guix.texi:1728 -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 GuixSD is subject to transactional upgrades and roll-back (@pxref{Using the Configuration System})." -msgstr "En plus, il est possible @emph{d'annuler} toute transaction sur les paquets. Donc si par exemple un mise à jour installe une nouvelle version d'un paquet qui révèle un bogue sérieux, les utilisateurs peuvent revenir en arrière à l'instance précédente de leur profil qui est connu pour bien fonctionner. De manière similaire, la configuration globale du système dans GuixSD est sujette aux mises à jour transactionnelles et aux annulations (@pxref{Using the Configuration System})." - -#. type: Plain text -#: doc/guix.texi:1735 -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 "Tous les paquets du dépôt des paquets peut être @emph{glané}. Guix peut déterminer quels paquets sont toujours référencés par les profils des utilisateurs et supprimer ceux qui ne sont plus référencés de manière prouvable (@pxref{Invoking guix gc}). Les utilisateurs peuvent toujours explicitement supprimer les anciennes générations de leur profil pour que les paquets auxquels elles faisaient référence puissent être glanés." - -#. type: cindex -#: doc/guix.texi:1736 -#, no-wrap -msgid "reproducibility" -msgstr "reproductibilité" - -#. type: Plain text -#: doc/guix.texi:1748 -msgid "Finally, 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 "Finalement, Guix prend une approche @dfn{purement fonctionnelle} de la gestion de paquets, telle que décrite dans l'introduction (@pxref{Introduction}). Chaque nom de répertoire de paquet dans @file{/gnu/store} contient un hash de toutes les entrées qui ont été utilisées pendant la construction de ce paquet — le compilateur, les bibliothèques, les scripts de construction, etc. Cette correspondance directe permet aux utilisateurs de s'assurer que l'installation d'un paquet donné correspond à l'état actuel de leur distribution. Elle aide aussi à maximiser la @dfn{reproductibilité} : grâce aux environnements de construction utilisés, une construction donnée à de forte chances de donner des fichiers identiques bit-à-bit lorsqu'elle est effectuée sur des machines différents (@pxref{Invoking guix-daemon, container})." - -#. type: Plain text -#: doc/guix.texi:1759 -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 "Ce fondement permet à Guix de supporter le @dfn{déploiement transparent de binaire ou source}. Lorsqu'une binaire pré-construit pour une entrée de @file{/gnu/store} est disponible depuis une source externe (un @dfn{substitut}), Guix le télécharge simplement et le décompresse ; sinon, il construit le paquet depuis les sources localement (@pxref{Substituts}). Comme les résultats des constructions sont généralement reproductibles au bit près, si vous n'avez pas besoin de faire confiance aux serveurs qui fournissent les substituts : vous pouvez forcer une construction locale et @emph{défier} les fournisseurs (@pxref{Invoking guix challenge})." - -#. type: Plain text -#: doc/guix.texi:1765 -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 "Le contrôle de l'environnement de construction est aussi une fonctionnalité utile pour les développeurs. La commande @command{guix environment} permet aux développeurs d'un paquet de mettre en place rapidement le bon environnement de développement pour leur paquet, sans avoir à installer manuellement les dépendances du paquet dans leur profil (@pxref{Invoking guix environment})." - -#. type: section -#: doc/guix.texi:1767 -#, no-wrap -msgid "Invoking @command{guix package}" -msgstr "Invoquer @command{guix package}" - -#. type: cindex -#: doc/guix.texi:1769 -#, no-wrap -msgid "installing packages" -msgstr "installer des paquets" - -#. type: cindex -#: doc/guix.texi:1770 -#, no-wrap -msgid "removing packages" -msgstr "supprimer des paquets" - -#. type: cindex -#: doc/guix.texi:1771 -#, no-wrap -msgid "package installation" -msgstr "installation de paquets" - -#. type: cindex -#: doc/guix.texi:1772 -#, no-wrap -msgid "package removal" -msgstr "suppression de paquets" - -#. type: Plain text -#: doc/guix.texi:1778 -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 "La commande @command{guix package} est l'outil qui permet d'installer, mettre à jour et supprimer les paquets ainsi que de revenir à une configuration précédente. Elle n'opère que dans le profil de l'utilisateur et fonctionne avec les privilèges utilisateurs normaux (@pxref{Fonctionnalités}). Sa syntaxe est :" - -#. type: example -#: doc/guix.texi:1781 -#, no-wrap -msgid "guix package @var{options}\n" -msgstr "guix package @var{options}\n" - -#. type: Plain text -#: doc/guix.texi:1787 -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} spécifie d'abord les opérations à effectuer pendant la transaction. À la fin, une nouvelle génération du profil est créée mais les @dfn{générations} précédentes du profil restent disponibles si l'utilisateur souhaite y revenir." - -#. type: Plain text -#: doc/guix.texi:1790 -msgid "For example, to remove @code{lua} and install @code{guile} and @code{guile-cairo} in a single transaction:" -msgstr "Par exemple, pour supprimer @code{lua} et installer @code{guile} et @code{guile-cairo} en une seule transaction :" - -#. type: example -#: doc/guix.texi:1793 -#, no-wrap -msgid "guix package -r lua -i guile guile-cairo\n" -msgstr "guix package -r lua -i guile guile-cairo\n" - -#. type: Plain text -#: doc/guix.texi:1799 -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} supporte aussi une @dfn{approche déclarative} où l'utilisateur spécifie l'ensemble exact des paquets qui doivent être disponibles le passe @i{via} l'option @option{--manifest} (@pxref{profile-manifest, @option{--manifest}})." - -#. type: cindex -#: doc/guix.texi:1800 -#, no-wrap -msgid "profile" -msgstr "profil" - -#. type: Plain text -#: doc/guix.texi:1806 -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 "Pour chaque utilisateur, un lien symbolique vers le profil par défaut de cet utilisateur est automatiquement créé dans @file{$HOME/.guix-profile}. Ce lien symbolique pointe toujours vers la génération actuelle du profil par défaut de l'utilisateur. Ainsi, les utilisateurs peuvent ajouter @file{$HOME/.guix-profile/bin} à leur variable d'environnement @code{PATH} etc." - -#. type: cindex -#: doc/guix.texi:1806 doc/guix.texi:2003 -#, no-wrap -msgid "search paths" -msgstr "chemins de recherche" - -#. type: Plain text -#: doc/guix.texi:1811 -msgid "If you are not using the Guix System Distribution, 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 "Si vous n'utilisez pas la distribution système Guix, vous devriez ajouter les lignes suivantes à votre @file{~/.bash_profile} (@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}) pour que les shells créés ensuite aient les bonnes définitions des variables d'environnement :" - -#. type: example -#: doc/guix.texi:1815 -#, no-wrap +"\n" +" -L, --load-path=REP préfixer le chemin de recherche par REP" + +#: guix/scripts/build.scm:345 msgid "" -"GUIX_PROFILE=\"$HOME/.guix-profile\" ; \\\n" -"source \"$HOME/.guix-profile/etc/profile\"\n" +"\n" +" -K, --keep-failed keep build tree of failed builds" msgstr "" -"GUIX_PROFILE=\"$HOME/.guix-profile\" ; \\\n" -"source \"$HOME/.guix-profile/etc/profile\"\n" - -#. type: Plain text -#: doc/guix.texi:1826 -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 "Dans un environnement multi-utilisateur, les profils utilisateurs sont stockés comme une @dfn{racine du ramasse-miettes}, vers laquelle pointe @file{$HOME/.guix-profile} (@pxref{Invoking guix gc}). Ce répertoire est normalement @code{@var{localstatedir}/guix/profiles/per-user/@var{utilisateur}}, où @var{localstatedir} est la valeur passée à @code{configure} avec @code{--localstatedir} et @var{utilisateur} le nom d'utilisateur. Le répertoire @file{per-user} est créé lorsque @command{guix-daemon} est démarré et sous-répertoire @var{utilisateur} est créé par @command{guix package}." - -#. type: Plain text -#: doc/guix.texi:1828 -msgid "The @var{options} can be among the following:" -msgstr "Les @var{options} peuvent être les suivante :" - -#. type: item -#: doc/guix.texi:1831 -#, no-wrap -msgid "--install=@var{package} @dots{}" -msgstr "--install=@var{paquet} @dots{}" - -#. type: itemx -#: doc/guix.texi:1832 -#, no-wrap -msgid "-i @var{package} @dots{}" -msgstr "-i @var{paquet} @dots{}" - -#. type: table -#: doc/guix.texi:1834 -msgid "Install the specified @var{package}s." -msgstr "Installer les @var{paquet}s spécifiés." - -#. type: table -#: doc/guix.texi:1839 -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 "Chaque @var{paquet} peut spécifier soit un simple nom de paquet, comme @code{guile} ou un nom de paquet suivi d'un arobase et d'un numéro de version, comme @code{guile@@1.8.8} ou simplement @code{guile@@1.8} (dans ce dernier cas, la version la plus récente commençant par @code{1.8} est utilisée)." - -#. type: table -#: doc/guix.texi:1847 -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 "Si aucun numéro de version n'est spécifié, la version la plus récente disponible est choisie. En plus, @var{paquet} peut contenir un deux-points, suivi du nom d'une des sorties du paquet, comme dans @code{gcc:doc} ou @code{binutils@@2.22:lib} (@pxref{Packages with Multiple Outputs}). Des paquets avec un nom correspondant et (éventuellement une version) sont recherchés dans les modules de la distribution GNU (@pxref{Package Modules})." - -#. type: cindex -#: doc/guix.texi:1848 -#, no-wrap -msgid "propagated inputs" -msgstr "entrées propagées" - -#. type: table -#: doc/guix.texi:1854 -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 "Parfois les paquets ont des @dfn{entrées propagées} : ce sont des dépendances qui sont installées automatiquement avec le paquet demandé (@pxref{package-propagated-inputs, @code{propagated-inputs} in @code{package} objects} pour plus d'informations sur les entrées propagées dans les définitions des paquets)." - -#. type: anchor{#1} -#: doc/guix.texi:1861 -msgid "package-cmd-propagated-inputs" -msgstr "package-cmd-propagated-inputs" - -#. type: table -#: doc/guix.texi:1861 -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 "Un exemple est la bibliothèque MPC de GNU : ses fichiers d'en-tête C se réfèrent à ceux de la bibliothèque MPFR de GNU, qui se réfèrent en retour à ceux de la bibliothèque GMP. Ainsi, lorsqu'on installe MPC, les bibliothèques MPFR et GMP sont aussi installées dans le profil ; supprimer MPC supprimera aussi MPFR et GMP — à moins qu'ils n'aient été aussi installés explicitement par l'utilisateur." - -#. type: table -#: doc/guix.texi:1866 -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 "D'autre part, les paquets dépendent parfois de la définition de variables d'environnement pour leur chemin de recherche (voir les explications sur @code{--search-paths} plus bas). Toute définition de variable d'environnement manquante ou possiblement incorrecte est rapportée ici." - -#. type: item -#: doc/guix.texi:1867 -#, no-wrap -msgid "--install-from-expression=@var{exp}" -msgstr "--install-from-expression=@var{exp}" - -#. type: itemx -#: doc/guix.texi:1868 -#, no-wrap -msgid "-e @var{exp}" -msgstr "-e @var{exp}" - -#. type: table -#: doc/guix.texi:1870 -msgid "Install the package @var{exp} evaluates to." -msgstr "Installer le paquet évalué par @var{exp}" - -#. type: table -#: doc/guix.texi:1875 -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} doit être une expression Scheme qui s'évalue en un objet @code{}. Cette option est notamment utile pour distinguer les variantes d'un paquet avec le même nom, avec des expressions comme @code{(@@ (gnu packages base) guile-final)}." - -#. type: table -#: doc/guix.texi:1879 -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 "Remarquez que cette option installe la première sortie du paquet, ce qui peut être insuffisant lorsque vous avez besoin d'une sortie spécifique d'un paquet à plusieurs sorties." - -#. type: item -#: doc/guix.texi:1880 -#, no-wrap -msgid "--install-from-file=@var{file}" -msgstr "--install-from-file=@var{fichier}" - -#. type: itemx -#: doc/guix.texi:1881 doc/guix.texi:5870 -#, no-wrap -msgid "-f @var{file}" -msgstr "-f @var{fichier}" - -#. type: table -#: doc/guix.texi:1883 -msgid "Install the package that the code within @var{file} evaluates to." -msgstr "Installer le paquet évalué par le code dans le @var{fichier}." - -#. type: table -#: doc/guix.texi:1886 doc/guix.texi:7493 -msgid "As an example, @var{file} might contain a definition like this (@pxref{Defining Packages}):" -msgstr "Par exemple, @var{fichier} peut contenir une définition comme celle-ci (@pxref{Defining Packages}) :" - -#. type: example -#: doc/guix.texi:1889 doc/guix.texi:5880 -#, no-wrap -msgid "@verbatiminclude package-hello.scm\n" -msgstr "@verbatiminclude package-hello.scm\n" - -#. type: table -#: doc/guix.texi:1895 -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 "Les développeurs peuvent trouver utile d'inclure un tel fichier @file{guix.scm} à la racine de l'arborescence des sources de leur projet qui pourrait être utilisé pour tester des versions de développement et créer des environnements de développement reproductibles (@pxref{Invoking guix environment})." - -#. type: item -#: doc/guix.texi:1896 -#, no-wrap -msgid "--remove=@var{package} @dots{}" -msgstr "--remove=@var{paquet} @dots{}" - -#. type: itemx -#: doc/guix.texi:1897 -#, no-wrap -msgid "-r @var{package} @dots{}" -msgstr "-r @var{paquet} @dots{}" - -#. type: table -#: doc/guix.texi:1899 -msgid "Remove the specified @var{package}s." -msgstr "Supprimer les @var{paquet}s spécifiés." - -#. type: table -#: doc/guix.texi:1904 -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 "Comme pour @code{--install}, chaque @var{paquet} peut spécifier un numéro de version ou un nom de sortie en plus du nom du paquet. Par exemple, @code{-r glibc:debug} supprimerait la sortie @code{debug} de @code{glibc}." - -#. type: item -#: doc/guix.texi:1905 -#, no-wrap -msgid "--upgrade[=@var{regexp} @dots{}]" -msgstr "--upgrade[=@var{regexp} @dots{}]" - -#. type: itemx -#: doc/guix.texi:1906 -#, no-wrap -msgid "-u [@var{regexp} @dots{}]" -msgstr "-u [@var{regexp} @dots{}]" - -#. type: cindex -#: doc/guix.texi:1907 -#, no-wrap -msgid "upgrading packages" -msgstr "mettre à jour des paquets" - -#. type: table -#: doc/guix.texi:1911 -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 "Mettre à jour tous les paquets installés. Si une @var{regexp} ou plus est spécifiée, la mise à jour n'installera que les paquets dont le nom correspond à @var{regexp}. Voyez aussi l'option @code{--do-not-upgrade} en dessous." - -#. type: table -#: doc/guix.texi:1916 -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 "Remarquez que cela met à jour vers la dernière version des paquets trouvée dans la distribution actuellement installée. Pour mettre à jour votre distribution, vous devriez lancer régulièrement @command{guix pull} (@pxref{Invoking guix pull})." - -#. type: item -#: doc/guix.texi:1917 -#, no-wrap -msgid "--do-not-upgrade[=@var{regexp} @dots{}]" -msgstr "--do-not-upgrade[=@var{regexp} @dots{}]" - -#. type: table -#: doc/guix.texi:1922 -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 "Lorsqu'elle est utilisée avec l'option @code{--upgrade}, ne @emph{pas} mettre à jour les paquets dont le nom correspond à @var{regexp}. Par exemple, pour mettre à jour tous les paquets du profil actuel à l'exception de ceux qui contiennent la chaîne « emacs » :" - -#. type: example -#: doc/guix.texi:1925 -#, 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:1927 -#, no-wrap -msgid "profile-manifest" -msgstr "profile-manifest" - -#. type: item -#: doc/guix.texi:1927 doc/guix.texi:2996 doc/guix.texi:6761 doc/guix.texi:7498 -#: doc/guix.texi:8182 -#, no-wrap -msgid "--manifest=@var{file}" -msgstr "--manifest=@var{fichier}" - -#. type: itemx -#: doc/guix.texi:1928 doc/guix.texi:2997 doc/guix.texi:6762 doc/guix.texi:7499 -#, no-wrap -msgid "-m @var{file}" -msgstr "-m @var{fichier}" - -#. type: cindex -#: doc/guix.texi:1929 -#, no-wrap -msgid "profile declaration" -msgstr "déclaration de profil" - -#. type: cindex -#: doc/guix.texi:1930 -#, no-wrap -msgid "profile manifest" -msgstr "manifest de profil" - -#. type: table -#: doc/guix.texi:1933 -msgid "Create a new generation of the profile from the manifest object returned by the Scheme code in @var{file}." -msgstr "Créer une nouvelle génération du profil depuis l'objet manifeste renvoyé par le code Scheme dans @var{fichier}." - -#. type: table -#: doc/guix.texi:1939 -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 "Cela vous permet de @emph{déclarer} le contenu du profil plutôt que de le construire avec une série de @code{--install} et de commandes similaires. L'avantage étant que le @var{fichier} peut être placé sous contrôle de version, copié vers d'autres machines pour reproduire le même profil, etc." - -#. type: table -#: doc/guix.texi:1943 -msgid "@var{file} must return a @dfn{manifest} object, which is roughly a list of packages:" -msgstr "@var{fichier} doit retourner un objet @dfn{manifest} qui est en gros une liste de paquets :" - -#. type: findex -#: doc/guix.texi:1944 -#, no-wrap -msgid "packages->manifest" -msgstr "packages->manifest" - -#. type: example -#: doc/guix.texi:1947 -#, no-wrap +"\n" +" -K, --keep-failed garder l'arbre de compilation pour les compilations ayant échoué" + +#: guix/scripts/build.scm:347 msgid "" -"(use-package-modules guile emacs)\n" "\n" +" -k, --keep-going keep going when some of the derivations fail" msgstr "" -"(use-package-modules guile emacs)\n" "\n" +" -k, --keep-going continuer si certaines dérivations échouent" -#. type: example -#: doc/guix.texi:1953 -#, no-wrap +#: guix/scripts/build.scm:349 msgid "" -"(packages->manifest\n" -" (list emacs\n" -" guile-2.0\n" -" ;; Use a specific package output.\n" -" (list guile-2.0 \"debug\")))\n" +"\n" +" -n, --dry-run do not build the derivations" msgstr "" -"(packages->manifest\n" -" (list emacs\n" -" guile-2.0\n" -" ;; Utiliser une sortie spécifique d'un paquet.\n" -" (list guile-2.0 \"debug\")))\n" - -#. type: findex -#: doc/guix.texi:1955 -#, no-wrap -msgid "specifications->manifest" -msgstr "specifications->manifest" - -#. type: table -#: doc/guix.texi:1962 -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 "Dans cet exemple on doit savoir quels modules définissent les variables @code{emacs} et @code{guile-2.0} pour fournir la bonne ligne @code{use-package-modules} ce qui peut être embêtant. On peut à la place fournir des spécifications de paquets normales et laisser @code{specifications->manifest} rechercher les objets de paquets correspondants, comme ceci :" - -#. type: example -#: doc/guix.texi:1966 -#, no-wrap +"\n" +" -n, --dry-run ne pas compiler les dérivations" + +#: guix/scripts/build.scm:351 msgid "" -"(specifications->manifest\n" -" '(\"emacs\" \"guile@@2.2\" \"guile@@2.2:debug\"))\n" +"\n" +" --fallback fall back to building when the substituter fails" msgstr "" -"(specifications->manifest\n" -" '(\"emacs\" \"guile@@2.2\" \"guile@@2.2:debug\"))\n" - -#. type: item -#: doc/guix.texi:1968 -#, no-wrap -msgid "--roll-back" -msgstr "--roll-back" - -#. type: cindex -#: doc/guix.texi:1969 doc/guix.texi:20911 -#, no-wrap -msgid "rolling back" -msgstr "revenir en arrière" - -#. type: cindex -#: doc/guix.texi:1970 -#, no-wrap -msgid "undoing transactions" -msgstr "défaire des transactions" - -#. type: cindex -#: doc/guix.texi:1971 -#, no-wrap -msgid "transactions, undoing" -msgstr "transactions, défaire" - -#. type: table -#: doc/guix.texi:1974 -msgid "Roll back to the previous @dfn{generation} of the profile---i.e., undo the last transaction." -msgstr "Revenir à la @dfn{génération} précédente du profil c.-à-d.@: défaire la dernière transaction." - -#. type: table -#: doc/guix.texi:1977 -msgid "When combined with options such as @code{--install}, roll back occurs before any other actions." -msgstr "Lorsqu'elle est combinée avec des options comme @code{--install}, cette option revient en arrière avant toute autre action." - -#. type: table -#: doc/guix.texi:1981 -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 "Lorsque vous revenez de la première génération qui contient des fichiers, le profil pointera vers la @dfn{zéroième génération} qui ne contient aucun fichier en dehors de ses propres métadonnées." - -#. type: table -#: doc/guix.texi:1985 -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 "Après être revenu en arrière, l'installation, la suppression et la mise à jour de paquets réécrit les futures générations précédentes. Ainsi, l'historique des générations dans un profil est toujours linéaire." - -#. type: item -#: doc/guix.texi:1986 -#, no-wrap -msgid "--switch-generation=@var{pattern}" -msgstr "--switch-generation=@var{motif}" - -#. type: itemx -#: doc/guix.texi:1987 -#, no-wrap -msgid "-S @var{pattern}" -msgstr "-S @var{motif}" - -#. type: cindex -#: doc/guix.texi:1988 doc/guix.texi:2186 doc/guix.texi:20869 -#, no-wrap -msgid "generations" -msgstr "générations" - -#. type: table -#: doc/guix.texi:1990 -msgid "Switch to a particular generation defined by @var{pattern}." -msgstr "Basculer vers une génération particulière définie par le @var{motif}." - -#. type: table -#: doc/guix.texi:1996 -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 "Le @var{motif} peut être soit un numéro de génération soit un nombre précédé de « + » ou « - ». Ce dernier signifie : se déplacer en avant ou en arrière d'un nombre donné de générations. Par exemple, si vous voulez retourner à la dernière génération après @code{--roll-back}, utilisez @code{--switch-generation=+1}." - -#. type: table -#: doc/guix.texi:2001 -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 "La différence entre @code{--roll-back} et @code{--switch-generation=-1} est que @code{--switch-generation} ne vous amènera pas à la zéroième génération, donc si la génération demandée n'existe pas la génération actuelle ne changera pas." - -#. type: item -#: doc/guix.texi:2002 -#, no-wrap -msgid "--search-paths[=@var{kind}]" -msgstr "--search-paths[=@var{genre}]" - -#. type: table -#: doc/guix.texi:2008 -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 "Rapporter les définitions des variables d'environnement dans la syntaxe Bash qui peuvent être requises pour utiliser l'ensemble des paquets installés. Ces variables d'environnement sont utilisées pour spécifier les @dfn{chemins de recherche} de fichiers utilisés par les paquets installés." - -#. type: table -#: doc/guix.texi:2016 -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 "Par exemple, GCC a besoin des variables d'environnement @code{CPATH} et @code{LIBRARY_PATH} pour trouver les en-têtes et les bibliothèques dans le profil de l'utilisateur (@pxref{Environment Variables,,, gcc, Using the GNU Compiler Collection (GCC)}). Si GCC et, disons, la bibliothèque C sont installés dans le profil, alors @code{--search-paths} suggérera d'initialiser ces variables à @code{@var{profil}/include} et @code{@var{profil}/lib}, respectivement." - -#. type: table -#: doc/guix.texi:2019 -msgid "The typical use case is to define these environment variables in the shell:" -msgstr "Le cas d'utilisation typique est de définir ces variables d'environnement dans le shell :" - -#. type: example -#: doc/guix.texi:2022 -#, no-wrap -msgid "$ eval `guix package --search-paths`\n" -msgstr "$ eval `guix package --search-paths`\n" - -#. type: table -#: doc/guix.texi:2028 -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{genre} peut être l'une des valeurs @code{exact}, @code{prefix} ou @code{suffix}, ce qui signifie que les définitions des variables d'environnement retournées seront soit les paramètres exactes, ou placés avant ou après la valeur actuelle de ces paramètres. Lorsqu'il est omis, @var{genre} a pour valeur par défaut @code{exact}." - -#. type: table -#: doc/guix.texi:2031 -msgid "This option can also be used to compute the @emph{combined} search paths of several profiles. Consider this example:" -msgstr "Cette option peut aussi être utilisé pour calculer les chemins de recherche @emph{combinés} de plusieurs profils. Regardez cet exemple :" - -#. type: example -#: doc/guix.texi:2036 -#, no-wrap +"\n" +" --fallback revenir à la compilation quand le substitut échoue" + +#: guix/scripts/build.scm:353 msgid "" -"$ guix package -p foo -i guile\n" -"$ guix package -p bar -i guile-json\n" -"$ guix package -p foo -p bar --search-paths\n" +"\n" +" --no-substitutes build instead of resorting to pre-built substitutes" msgstr "" -"$ guix package -p foo -i guile\n" -"$ guix package -p bar -i guile-json\n" -"$ guix package -p foo -p bar --search-paths\n" - -#. type: table -#: doc/guix.texi:2041 -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 "La dernière commande ci-dessus montre la variable @code{GUILE_LOAD_PATH} bien que, pris individuellement, ni @file{foo} ni @file{bar} n'auraient donné cette recommendation." - -#. type: item -#: doc/guix.texi:2043 -#, no-wrap -msgid "--profile=@var{profile}" -msgstr "--profile=@var{profil}" - -#. type: itemx -#: doc/guix.texi:2044 -#, no-wrap -msgid "-p @var{profile}" -msgstr "-p @var{profil}" - -#. type: table -#: doc/guix.texi:2046 -msgid "Use @var{profile} instead of the user's default profile." -msgstr "Utiliser le @var{profil} à la place du profil par défaut de l'utilisateur." - -#. type: cindex -#: doc/guix.texi:2047 -#, no-wrap -msgid "collisions, in a profile" -msgstr "collisions, dans un profil" - -#. type: cindex -#: doc/guix.texi:2048 -#, no-wrap -msgid "colliding packages in profiles" -msgstr "faire des collisions de paquets dans des profils" - -#. type: cindex -#: doc/guix.texi:2049 -#, no-wrap -msgid "profile collisions" -msgstr "profil, collisions" - -#. type: item -#: doc/guix.texi:2050 -#, no-wrap -msgid "--allow-collisions" -msgstr "--allow-collisions" - -#. type: table -#: doc/guix.texi:2052 -msgid "Allow colliding packages in the new profile. Use at your own risk!" -msgstr "Permettre des collisions de paquets dans le nouveau profil. À utiliser à vos risques et périls !" - -#. type: table -#: doc/guix.texi:2056 -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 "Par défaut, @command{guix package} rapporte les @dfn{collisions} dans le profil comme des erreurs. Les collisions ont lieu quand deux version ou variantes d'un paquet donné se retrouvent dans le profil." - -#. type: item -#: doc/guix.texi:2057 doc/guix.texi:2802 doc/guix.texi:7987 -#, no-wrap -msgid "--verbose" -msgstr "--verbose" - -#. type: table -#: doc/guix.texi:2060 -msgid "Produce verbose output. In particular, emit the build log of the environment on the standard error port." -msgstr "Produire une sortie verbeuse. En particulier, fournir les journaux de construction de l'environnement sur le port d'erreur standard." - -#. type: item -#: doc/guix.texi:2061 doc/guix.texi:2828 doc/guix.texi:3050 -#, no-wrap -msgid "--bootstrap" -msgstr "--bootstrap" - -#. type: table -#: doc/guix.texi:2064 -msgid "Use the bootstrap Guile to build the profile. This option is only useful to distribution developers." -msgstr "Utiliser le programme d'amorçage Guile pour compiler le profil. Cette option n'est utile que pour les développeurs de la distriibution." - -#. type: Plain text -#: doc/guix.texi:2070 -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 "En plus de ces actions, @command{guix package} supporte les options suivantes pour demander l'état actuel d'un profil ou la disponibilité des paquets :" - -#. type: item -#: doc/guix.texi:2073 -#, no-wrap -msgid "--search=@var{regexp}" -msgstr "--search=@var{regexp}" - -#. type: itemx -#: doc/guix.texi:2074 -#, no-wrap -msgid "-s @var{regexp}" -msgstr "-s @var{regexp}" - -#. type: cindex -#: doc/guix.texi:2075 -#, no-wrap -msgid "searching for packages" -msgstr "chercher des paquets" - -#. type: table -#: doc/guix.texi:2080 -msgid "List the available packages whose name, synopsis, or description matches @var{regexp}, sorted by relevance. Print all the metadata of matching packages in @code{recutils} format (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})." -msgstr "Lister les paquets disponibles dont le nom, le synopsis ou la description correspondent à la @var{regexp}, triés par pertinence. Afficher toutes les métadonnées des paquets correspondants au format @code{recutils} (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})." - -#. type: table -#: doc/guix.texi:2083 -msgid "This allows specific fields to be extracted using the @command{recsel} command, for instance:" -msgstr "Cela permet à des champs spécifiques d'être extraits avec la commande @command{recsel}, par exemple :" - -#. type: example -#: doc/guix.texi:2089 -#, no-wrap +"\n" +" --no-substitutes compiler plutôt que recourir à des substituts pré-compilés" + +#: guix/scripts/build.scm:355 guix/scripts/size.scm:232 msgid "" -"$ guix package -s malloc | recsel -p name,version,relevance\n" -"name: jemalloc\n" -"version: 4.5.0\n" -"relevance: 6\n" "\n" +" --substitute-urls=URLS\n" +" fetch substitute from URLS if they are authorized" msgstr "" -"$ guix package -s malloc | recsel -p name,version,relevance\n" -"name: jemalloc\n" -"version: 4.5.0\n" -"relevance: 6\n" "\n" +" --substitute-urls=URLS\n" +" récupérer les substituts depuis les URLS si elles sont autorisées" -#. type: example -#: doc/guix.texi:2093 -#, no-wrap +#: guix/scripts/build.scm:358 msgid "" -"name: glibc\n" -"version: 2.25\n" -"relevance: 1\n" "\n" +" --no-grafts do not graft packages" msgstr "" -"name: glibc\n" -"version: 2.25\n" -"relevance: 1\n" "\n" +" --no-grafts ne pas greffer les paquets" -#. type: example -#: doc/guix.texi:2097 -#, no-wrap +#: guix/scripts/build.scm:360 msgid "" -"name: libgc\n" -"version: 7.6.0\n" -"relevance: 1\n" +"\n" +" --no-build-hook do not attempt to offload builds via the build hook" msgstr "" -"name: libgc\n" -"version: 7.6.0\n" -"relevance: 1\n" - -#. type: table -#: doc/guix.texi:2101 -msgid "Similarly, to show the name of all the packages available under the terms of the GNU@tie{}LGPL version 3:" -msgstr "De manière similaire, pour montrer le nom de tous les paquets disponibles sous license GNU@tie{}LGPL version 3 :" - -#. type: example -#: doc/guix.texi:2105 -#, no-wrap +"\n" +" --no-build-hook ne pas essayer de décharger les compilations via le hook de compilation" + +#: guix/scripts/build.scm:362 msgid "" -"$ guix package -s \"\" | recsel -p name -e 'license ~ \"LGPL 3\"'\n" -"name: elfutils\n" "\n" +" --max-silent-time=SECONDS\n" +" mark the build as failed after SECONDS of silence" msgstr "" -"$ guix package -s \"\" | recsel -p name -e 'license ~ \"LGPL 3\"'\n" -"name: elfutils\n" "\n" +" --max-silent-time=N\n" +" marquer la compilation comme ayant échouée après N secondes de silence" -#. type: example -#: doc/guix.texi:2108 -#, no-wrap +#: guix/scripts/build.scm:365 msgid "" -"name: gmp\n" -"@dots{}\n" +"\n" +" --timeout=SECONDS mark the build as failed after SECONDS of activity" msgstr "" -"name: gmp\n" -"@dots{}\n" - -#. type: table -#: doc/guix.texi:2113 -msgid "It is also possible to refine search results using several @code{-s} flags. For example, the following command returns a list of board games:" -msgstr "Il est aussi possible de raffiner les résultats de la recherche avec plusieurs options @code{-s}. Par exemple, la commande suivante renvoie la liste des jeux de plateau :" +"\n" +" --timeout=N marquer la compilation comme ayant échouée après N secondes d'activité" -#. type: example -#: doc/guix.texi:2118 -#, no-wrap +#: guix/scripts/build.scm:367 msgid "" -"$ guix package -s '\\' -s game | recsel -p name\n" -"name: gnubg\n" -"@dots{}\n" +"\n" +" --verbosity=LEVEL use the given verbosity LEVEL" msgstr "" -"$ guix package -s '\\' -s game | recsel -p name\n" -"name: gnubg\n" -"@dots{}\n" - -#. type: table -#: doc/guix.texi:2124 -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 "Si on avait oublié @code{-s game}, on aurait aussi eu les paquets logiciels qui s'occupent de circuits imprimés (en anglais : circuit board) ; supprimer les chevrons autour de @code{board} aurait aussi ajouté les paquets qui parlent de clavier (en anglais : key@emph{board})." - -#. type: table -#: doc/guix.texi:2128 -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 "Et maintenant un exemple plus élaboré. La commande suivante recherche les bibliothèques cryptographiques, retire les bibliothèques Haskell, Perl, Python et Ruby et affiche le nom et le synopsis des paquets correspondants :" - -#. type: example -#: doc/guix.texi:2132 -#, no-wrap +"\n" +" --verbosity=NIVEAU utiliser le NIVEAU de verbosité donné" + +#: guix/scripts/build.scm:369 msgid "" -"$ guix package -s crypto -s library | \\\n" -" recsel -e '! (name ~ \"^(ghc|perl|python|ruby)\")' -p name,synopsis\n" +"\n" +" --rounds=N build N times in a row to detect non-determinism" msgstr "" -"$ guix package -s crypto -s library | \\\n" -" recsel -e '! (name ~ \"^(ghc|perl|python|ruby)\")' -p name,synopsis\n" - -#. type: table -#: doc/guix.texi:2137 -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} pour plus d'information sur les @dfn{expressions de sélection} pour @code{recsel -e}." - -#. type: item -#: doc/guix.texi:2138 -#, no-wrap -msgid "--show=@var{package}" -msgstr "--show=@var{paquet}" - -#. type: table -#: doc/guix.texi:2142 -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 "Afficher les détails du @var{paquet} dans la liste des paquets disponibles, au format @code{recutils} (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})." - -#. type: example -#: doc/guix.texi:2147 -#, no-wrap +"\n" +" --rounds=N compiler N fois de suite pour détecter les non déterminismes" + +#: guix/scripts/build.scm:371 msgid "" -"$ guix package --show=python | recsel -p name,version\n" -"name: python\n" -"version: 2.7.6\n" "\n" +" -c, --cores=N allow the use of up to N CPU cores for the build" msgstr "" -"$ guix package --show=python | recsel -p name,version\n" -"name: python\n" -"version: 2.7.6\n" "\n" +" -c, --cores=N utiliser jusqu'à N cœurs CPU pour la compilation" -#. type: example -#: doc/guix.texi:2150 -#, no-wrap +#: guix/scripts/build.scm:373 msgid "" -"name: python\n" -"version: 3.3.5\n" +"\n" +" -M, --max-jobs=N allow at most N build jobs" msgstr "" -"name: python\n" -"version: 3.3.5\n" +"\n" +" -M, --max-jobs=N autoriser au plus N tâches de compilation" -#. type: table -#: doc/guix.texi:2154 -msgid "You may also specify the full name of a package to only get details about a specific version of it:" -msgstr "Vous pouvez aussi spécifier le nom complet d'un paquet pour n'avoir que les détails concernant une version spécifique :" +#: guix/scripts/build.scm:479 guix/scripts/build.scm:486 +#, scheme-format +msgid "not a number: '~a' option argument: ~a~%" +msgstr "pas un nombre: argument d'option « ~a » : ~a~%" -#. type: example -#: doc/guix.texi:2158 -#, no-wrap -msgid "" -"$ guix package --show=python@@3.4 | recsel -p name,version\n" -"name: python\n" -"version: 3.4.3\n" -msgstr "" -"$ guix package --show=python@@3.4 | recsel -p name,version\n" -"name: python\n" -"version: 3.4.3\n" - -#. type: item -#: doc/guix.texi:2162 -#, no-wrap -msgid "--list-installed[=@var{regexp}]" -msgstr "--list-installed[=@var{regexp}]" - -#. type: itemx -#: doc/guix.texi:2163 -#, no-wrap -msgid "-I [@var{regexp}]" -msgstr "-I [@var{regexp}]" - -#. type: table -#: doc/guix.texi:2167 -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 "Liste les paquets actuellement installés dans le profil spécifié, avec les paquets les plus récemment installés en dernier. Lorsque @var{regexp} est spécifié, liste uniquement les paquets installés dont le nom correspond à @var{regexp}." - -#. type: table -#: doc/guix.texi:2173 -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 "Pour chaque paquet installé, affiche les éléments suivants, séparés par des tabulations : le nom du paquet, sa version, la partie du paquet qui est installé (par exemple, @code{out} pour la sortie par défaut, @code{include} pour ses en-têtes, etc) et le chemin du paquet dans le dépôt." - -#. type: item -#: doc/guix.texi:2174 -#, no-wrap -msgid "--list-available[=@var{regexp}]" -msgstr "--list-available[=@var{regexp}]" - -#. type: itemx -#: doc/guix.texi:2175 -#, no-wrap -msgid "-A [@var{regexp}]" -msgstr "-A [@var{regexp}]" - -#. type: table -#: doc/guix.texi:2179 -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}." -msgstr "Lister les paquets actuellement disponibles dans la distribution pour ce système (@pxref{Distribution GNU}). Lorsque @var{regexp} est spécifié, liste uniquement les paquets dont le nom correspond à @var{regexp}." - -#. type: table -#: doc/guix.texi:2183 -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 "Pour chaque paquet, affiche les éléments suivants séparés par des tabulations : son nom, sa version, les parties du paquet (@pxref{Packages with Multiple Outputs}), et l'emplacement de sa définition." - -#. type: item -#: doc/guix.texi:2184 doc/guix.texi:2821 -#, no-wrap -msgid "--list-generations[=@var{pattern}]" -msgstr "--list-generations[=@var{motif}]" - -#. type: itemx -#: doc/guix.texi:2185 doc/guix.texi:2822 -#, no-wrap -msgid "-l [@var{pattern}]" -msgstr "-l [@var{motif}]" - -#. type: table -#: doc/guix.texi:2191 -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 "Renvoyer la liste des générations avec leur date de création ; pour chaque génération, montre les paquets installés avec les paquets installés les plus récemment en dernier. Remarquez que la zéroième génération n'est jamais montrée." - -#. type: table -#: doc/guix.texi:2196 -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 "Pour chaque paquet installé, afficher les éléments suivants, séparés par des tabulations : le nom du paquet, sa version, la partie du paquet qui a été installée (@pxref{Packages with Multiple Outputs}), et l'emplacement du paquet dans le dépôt." - -#. type: table -#: doc/guix.texi:2199 -msgid "When @var{pattern} is used, the command returns only matching generations. Valid patterns include:" -msgstr "Lorsque @var{motif} est utilisé, la commande ne renvoie que les générations correspondantes. Les motifs valides sont :" - -#. type: item -#: doc/guix.texi:2201 -#, no-wrap -msgid "@emph{Integers and comma-separated integers}. Both patterns denote" -msgstr "@emph{Des entiers et des entiers séparés par des virgules}. Les deux motifs correspondent" - -#. type: itemize -#: doc/guix.texi:2204 -msgid "generation numbers. For instance, @code{--list-generations=1} returns the first one." -msgstr "à des numéros de version. Par exemple, @code{--list-generations=1} renvoie la première." - -#. type: itemize -#: doc/guix.texi:2207 -msgid "And @code{--list-generations=1,8,2} outputs three generations in the specified order. Neither spaces nor trailing commas are allowed." -msgstr "Et @code{--list-generations=1,8,2} renvoie les trois générations dans l'ordre spécifié. Aucune espace ni virgule surnuméraire n'est permise." - -#. type: item -#: doc/guix.texi:2208 -#, no-wrap -msgid "@emph{Ranges}. @code{--list-generations=2..9} prints the" -msgstr "@emph{Des interval}. @code{--list-generations=2..9} affiche les" - -#. type: itemize -#: doc/guix.texi:2211 -msgid "specified generations and everything in between. Note that the start of a range must be smaller than its end." -msgstr "générations demandées et tout ce qui se trouvent entre elles. Remarquez que le début d'un interval doit être plus petit que sa fin." - -#. type: itemize -#: doc/guix.texi:2215 -msgid "It is also possible to omit the endpoint. For example, @code{--list-generations=2..}, returns all generations starting from the second one." -msgstr "Il est aussi possible d'omettre le numéro final. Par exemple, @code{--list-generations=2..} renvoie toutes les générations à partir de la deuxième." - -#. type: item -#: doc/guix.texi:2216 -#, no-wrap -msgid "@emph{Durations}. You can also get the last @emph{N}@tie{}days, weeks," -msgstr "@emph{Des durées}. Vous pouvez aussi récupérer les derniers @emph{N}@tie{}jours, semaines," - -#. type: itemize -#: doc/guix.texi:2220 -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 "ou moins en passant un entier avec la première lettre de la durée (en anglais : d, w ou m). Par exemple @code{--list-generations=20d} liste les générations qui sont agées d'au plus 20 jours." - -#. type: item -#: doc/guix.texi:2222 -#, no-wrap -msgid "--delete-generations[=@var{pattern}]" -msgstr "--delete-generations[=@var{motif}]" - -#. type: itemx -#: doc/guix.texi:2223 -#, no-wrap -msgid "-d [@var{pattern}]" -msgstr "-d [@var{motif}]" - -#. type: table -#: doc/guix.texi:2226 -msgid "When @var{pattern} is omitted, delete all generations except the current one." -msgstr "Lorsque @var{motif} est omis, supprimer toutes les générations en dehors de l'actuelle." - -#. type: table -#: doc/guix.texi:2232 -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 "Cette commande accepte les même motifs que @option{--list-generations}. Lorsque @var{motif} est spécifié, supprimer les générations correspondante. Lorsque @var{motif} spécifie une durée, les générations @emph{plus vieilles} que la durée spécifiée correspondent. Par exemple @code{--delete-generations=1m} supprime les générations vieilles de plus d'un mois." - -#. type: table -#: doc/guix.texi:2235 -msgid "If the current generation matches, it is @emph{not} deleted. Also, the zeroth generation is never deleted." -msgstr "Si la génération actuelle correspond, elle n'est @emph{pas} supprimée. La zéroième génération n'est elle non plus jamais supprimée." - -#. type: table -#: doc/guix.texi:2238 -msgid "Note that deleting generations prevents rolling back to them. Consequently, this command must be used with care." -msgstr "Remarquez que supprimer des générations empêche de revenir en arrière vers elles. Ainsi, cette commande doit être utilisée avec précaution." - -#. type: Plain text -#: doc/guix.texi:2249 -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 "Enfin, comme @command{guix package} peut démarrer des processus de construction, elle supporte les options de construction communes (@pxref{Common Build Options}). Elle supporte aussi les options de transformation de paquets comme @option{--with-source} (@pxref{Package Transformation Options}). Cependant, remarquez que les transformations de paquets sont perdues à la mise à jour ; pour les préserver à travers les mises à jours, vous devriez définir vos propres variantes des paquets dans une module Guile et l'ajouter à @code{GUIX_PACKAGE_PATH} (@pxref{Defining Packages})." - -#. type: cindex -#: doc/guix.texi:2254 -#, no-wrap -msgid "pre-built binaries" -msgstr "binaires pré-construits" - -#. type: Plain text -#: doc/guix.texi:2260 -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 gère le déploiement depuis des binaires ou des sources de manière transparente ce qui signifie qu'il peut aussi bien construire localement que télécharger des éléments pré-construits depuis un serveur ou les deux. Nous appelons ces éléments pré-construits des @dfn{substituts} — ils se substituent aux résultats des constructions locales. Dans la plupart des cas, télécharger un substitut est bien plus rapide que de construire les choses localement." - -#. type: Plain text -#: doc/guix.texi:2265 -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 "Les substituts peuvent être tout ce qui résulte d'une construction de dérivation (@pxref{Derivations}). Bien sûr dans le cas général, il s'agit de paquets binaires pré-construits, mais les archives des sources par exemple résultent aussi de la construction d'une dérivation qui peut aussi être disponible en tant que substitut." - -#. type: cindex -#: doc/guix.texi:2278 -#, no-wrap -msgid "hydra" -msgstr "hydra" - -#. type: cindex -#: doc/guix.texi:2279 -#, no-wrap -msgid "build farm" -msgstr "ferme de construction" - -#. type: Plain text -#: doc/guix.texi:2289 -msgid "The @code{mirror.hydra.gnu.org} 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 "Le serveur @code{mirror.hydra.gnu.org} est une interface à la ferme de construction officielle qui construit des paquets pour Guix continuellement pour certaines architectures et les rend disponibles en tant que substituts. C'est la source par défaut des substituts ; elle peut être modifiée en passant l'option @option{--substitute-urls} soit à @command{guix-daemon} (@pxref{daemon-substitute-urls,, @code{guix-daemon --substitute-urls}}) soit aux outils clients comme @command{guix package} (@pxref{client-substitute-urls,, client @option{--substitute-urls} option})." - -#. type: Plain text -#: doc/guix.texi:2295 -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 "Les URL des substituts peuvent être soit en HTTP soit en HTTPS. Le HTTPS est recommandé parce que les communications sont chiffrées ; à l'inverse HTTP rend les communications visibles pour un espion qui peut utiliser les informations accumulées sur vous pour déterminer par exemple si votre système a des vulnérabilités de sécurités non corrigées." - -#. type: Plain text -#: doc/guix.texi:2304 -msgid "Substitutes from the official build farm are enabled by default when using the Guix System Distribution (@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 "Les substituts de la ferme de construction officielle sont activés par défaut dans la distribution système Guix (@pxref{GNU Distribution}). Cependant, ils sont désactivés par défaut lorsque vous utilisez Guix sur une distribution externe, à moins que vous ne les ayez explicitement activés via l'une des étapes d'installation recommandées (@pxref{Installation}). Les paragraphes suivants décrivent comment activer ou désactiver les substituts de la ferme de construction ; la même procédure peut être utilisée pour activer les substituts de n'importe quel autre serveur de substituts." - -#. type: cindex -#: doc/guix.texi:2308 -#, no-wrap -msgid "security" -msgstr "sécurité" - -#. type: cindex -#: doc/guix.texi:2310 -#, no-wrap -msgid "access control list (ACL), for substitutes" -msgstr "liste de contrôle d'accès (ACL), pour les substituts" - -#. type: cindex -#: doc/guix.texi:2311 -#, no-wrap -msgid "ACL (access control list), for substitutes" -msgstr "ACL (liste de contrôle d'accès), pour les substituts" - -#. type: Plain text -#: doc/guix.texi:2318 -msgid "To allow Guix to download substitutes from @code{hydra.gnu.org} 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{hydra.gnu.org} to not be compromised and to serve genuine substitutes." -msgstr "Pour permettre à Guix de télécharger les substituts depuis @code{hydra.gnu.org} ou un mirroir, vous devez ajouter sa clef publique à la liste de contrôle d'accès (ACL) des imports d'archives, avec la commande @command{guix archive} (@pxref{Invoking guix archive}). Cela implique que vous faîtes confiance à @code{hydra.gnu.org} pour ne pas être compromis et vous servir des substituts authentiques." - -#. type: Plain text -#: doc/guix.texi:2325 -msgid "The public key for @code{hydra.gnu.org} is installed along with Guix, in @code{@var{prefix}/share/guix/hydra.gnu.org.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 "La clef publique pour @code{hydra.gnu.org} est installée avec Guix, dans @code{@var{préfixe}/share/guix/hydra.gnu.org.pub}, où @var{préfixe} est le préfixe d'installation de Guix. Si vous avez installé Guix depuis les sources, assurez-vous d'avoir vérifié la signature GPG de @file{guix-@value{VERSION}.tar.gz} qui contient ce fichier de clef publique. Ensuite vous pouvez lancer quelque chose comme ceci :" - -#. type: example -#: doc/guix.texi:2328 -#, no-wrap -msgid "# guix archive --authorize < @var{prefix}/share/guix/hydra.gnu.org.pub\n" -msgstr "# guix archive --authorize < @var{préfixe}/share/guix/hydra.gnu.org.pub\n" - -#. type: quotation -#: doc/guix.texi:2334 -msgid "Similarly, the @file{berlin.guixsd.org.pub} file contains the public key for the project's new build farm, reachable at @indicateurl{https://berlin.guixsd.org}." -msgstr "De même, le fichier @file{berlin.guixsd.org.pub} contient la clef publique de la nouvelle ferme de construction du projet, disponible depuis @indicateurl{https://berlin.guixsd.org}." - -#. type: quotation -#: doc/guix.texi:2339 -msgid "As of this writing @code{berlin.guixsd.org} is being upgraded so it can better scale up, but you might want to give it a try. It is backed by 20 x86_64/i686 build nodes and may be able to provide substitutes more quickly than @code{mirror.hydra.gnu.org}." -msgstr "Au moment où ces lignes sont écrites, @code{berlin.guixsd.org} est mis à niveau pour mieux passer à l'échelle, mais vous pourriez vouloir le tester. Il est associé à 20 nœuds de construction x86_64/i686 et pourrait fournir des substituts plus rapidement que @code{mirror.hydra.gnu.org}" - -#. type: Plain text -#: doc/guix.texi:2343 -msgid "Once this is in place, the output of a command like @code{guix build} should change from something like:" -msgstr "Une fois que cela est en place, la sortie d'une commande comme @code{guix build} devrait changer de quelque chose comme :" - -#. type: example -#: doc/guix.texi:2352 -#, no-wrap +#: guix/scripts/build.scm:505 msgid "" -"$ guix build emacs --dry-run\n" -"The following derivations would be built:\n" -" /gnu/store/yr7bnx8xwcayd6j95r2clmkdl1qh688w-emacs-24.3.drv\n" -" /gnu/store/x8qsh1hlhgjx6cwsjyvybnfv2i37z23w-dbus-1.6.4.tar.gz.drv\n" -" /gnu/store/1ixwp12fl950d15h2cj11c73733jay0z-alsa-lib-1.0.27.1.tar.bz2.drv\n" -" /gnu/store/nlma1pw0p603fpfiqy7kn4zm105r5dmw-util-linux-2.21.drv\n" -"@dots{}\n" +"Usage: guix build [OPTION]... PACKAGE-OR-DERIVATION...\n" +"Build the given PACKAGE-OR-DERIVATION and return their output paths.\n" msgstr "" -"$ guix build emacs --dry-run\n" -"Les dérivations suivantes seraient construites :\n" -" /gnu/store/yr7bnx8xwcayd6j95r2clmkdl1qh688w-emacs-24.3.drv\n" -" /gnu/store/x8qsh1hlhgjx6cwsjyvybnfv2i37z23w-dbus-1.6.4.tar.gz.drv\n" -" /gnu/store/1ixwp12fl950d15h2cj11c73733jay0z-alsa-lib-1.0.27.1.tar.bz2.drv\n" -" /gnu/store/nlma1pw0p603fpfiqy7kn4zm105r5dmw-util-linux-2.21.drv\n" -"@dots{}\n" - -#. type: Plain text -#: doc/guix.texi:2356 -msgid "to something like:" -msgstr "à quelque chose comme :" - -#. type: example -#: doc/guix.texi:2365 -#, no-wrap -msgid "" -"$ guix build emacs --dry-run\n" -"112.3 MB would be downloaded:\n" -" /gnu/store/pk3n22lbq6ydamyymqkkz7i69wiwjiwi-emacs-24.3\n" -" /gnu/store/2ygn4ncnhrpr61rssa6z0d9x22si0va3-libjpeg-8d\n" -" /gnu/store/71yz6lgx4dazma9dwn2mcjxaah9w77jq-cairo-1.12.16\n" -" /gnu/store/7zdhgp0n1518lvfn8mb96sxqfmvqrl7v-libxrender-0.9.7\n" -"@dots{}\n" -msgstr "" -"$ guix build emacs --dry-run\n" -"112.3 Mo seraient téléchargés :\n" -" /gnu/store/pk3n22lbq6ydamyymqkkz7i69wiwjiwi-emacs-24.3\n" -" /gnu/store/2ygn4ncnhrpr61rssa6z0d9x22si0va3-libjpeg-8d\n" -" /gnu/store/71yz6lgx4dazma9dwn2mcjxaah9w77jq-cairo-1.12.16\n" -" /gnu/store/7zdhgp0n1518lvfn8mb96sxqfmvqrl7v-libxrender-0.9.7\n" -"@dots{}\n" - -#. type: Plain text -#: doc/guix.texi:2370 -msgid "This indicates that substitutes from @code{hydra.gnu.org} are usable and will be downloaded, when possible, for future builds." -msgstr "Cela indique que les substituts de @code{hydra.gnu.org} sont utilisables et seront téléchargés, si possible, pour les futures constructions." - -#. type: cindex -#: doc/guix.texi:2371 -#, no-wrap -msgid "substitutes, how to disable" -msgstr "substituts, comment les désactiver" - -#. type: Plain text -#: doc/guix.texi:2377 -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 "Le mécanisme de substitution peut être désactivé globalement en lançant @code{guix-daemon} avec @code{--no-substitutes} (@pxref{Invoking guix-daemon}). Il peut aussi être désactivé temporairement en passant l'option @code{--no-substitutes} à @command{guix package}, @command{guix build} et aux autres outils en ligne de commande." - -#. type: cindex -#: doc/guix.texi:2381 -#, no-wrap -msgid "digital signatures" -msgstr "signatures numériques" - -#. type: Plain text -#: doc/guix.texi:2385 -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 détecte et lève une erreur lorsqu'il essaye d'utiliser un substituts qui a été modifié. De même, il ignore les substituts qui ne sont pas signés ou qui ne sont pas signés par l'une des clefs listés dans l'ACL." - -#. type: Plain text -#: doc/guix.texi:2391 -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 "Il y a une exception cependant : si un serveur non autorisé fournit des substituts qui sont @emph{identiques bit-à-bit} à ceux fournis par un serveur autorisé, alors le serveur non autorisé devient disponible pour les téléchargements. Par exemple en supposant qu'on a choisi deux serveurs de substituts avec cette option :" - -#. type: example -#: doc/guix.texi:2394 -#, 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:2405 -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 "Si l'ACL contient uniquement la clef de @code{b.example.org}, et si @code{a.example.org} sert @emph{exactement les mêmes} substituts, alors Guix téléchargera les substituts de @code{a.example.org} parce qu'il vient en premier dans la liste et peut être considéré comme un mirroir de @code{b.example.org}. En pratique, des machines de constructions produisent souvent les mêmes binaires grâce à des construction reproductibles au bit près (voir plus bas)." - -#. type: Plain text -#: doc/guix.texi:2412 -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 "Lorsque vous utilisez HTTPS, le certificat X.509 du serveur n'est @emph{pas} validé (en d'autre termes, le serveur n'est pas authentifié), contrairement à ce que des clients HTTPS comme des navigateurs web font habituellement. Cela est dû au fait que Guix authentifie les informations sur les substituts eux-même, comme expliqué plus haut, ce dont on se soucie réellement (alors que les certificats X.509 authentifie la relation entre nom de domaine et clef publique)." - -#. type: Plain text -#: doc/guix.texi:2424 -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 "Les substituts sont téléchargés par HTTP ou HTTPS. La variable d'environnement @code{http_proxy} peut être initialisée dans l'environnement de @command{guix-daemon} et est respectée pour le téléchargement des substituts. Remarquez que la valeur de @code{http_proxy} dans l'environnement où tournent @command{guix build}, @command{guix package} et les autres clients n'a @emph{absolument aucun effet}." - -#. type: Plain text -#: doc/guix.texi:2433 -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 "Même lorsqu'un substitut pour une dérivation est disponible, la substitution échoue parfois. Cela peut arriver pour plusieurs raisons : le serveur de substitut peut être hors ligne, le substitut a récemment été supprimé du serveur, la connexion peut avoir été interrompue, etc." - -#. type: Plain text -#: doc/guix.texi:2447 -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 "Lorsque les substituts sont activés et qu'un substitut pour une dérivation est disponible, mais que la tentative de substitution échoue, Guix essaiera de construire la dérivation localement si @code{--fallback} a été passé en argument (@pxref{fallback-option,, common build option @code{--fallback}}). Plus spécifiquement, si cet option n'a pas été passée en argument, alors aucune construction locale n'est effectuée et la dérivation est considérée comme étant en échec. Cependant, si @code{--fallback} est passé en argument, alors Guix essaiera de construire la dérivation localement et l'échec ou le succès de la dérivation dépend de l'échec ou du succès de la construction locale. Remarquez que lorsque les substituts sont désactivés ou qu'aucun substitut n'est disponible pour la dérivation en question, une construction locale sera @emph{toujours} effectuée, indépendamment du fait que l'argument @code{--fallback} ait été ou non passé." - -#. type: Plain text -#: doc/guix.texi:2452 -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 "Pour se donner une idée du nombre de substituts disponibles maintenant, vous pouvez essayer de lancer la commande @command{guix weather} (@pxref{Invoking guix weather}). Cette command fournit des statistiques sur les substituts fournis par un serveur." - -#. type: cindex -#: doc/guix.texi:2456 -#, no-wrap -msgid "trust, of pre-built binaries" -msgstr "confiance, en des binaires pré-construits" - -#. type: Plain text -#: doc/guix.texi:2466 -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{hydra.gnu.org} substitutes can be convenient, we encourage users to also build on their own, or even run their own build farm, such that @code{hydra.gnu.org} 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 "De nos jours, le contrôle individuel sur son utilisation propre de l'informatique est à la merci d'institutions, de sociétés et de groupes avec assez de pouvoir et de détermination pour contourner les infrastructures informatiques et exploiter leurs faiblesses. Bien qu'utiliser les substituts de @code{hydra.gnu.org} soit pratique, nous encourageons les utilisateurs à construire aussi par eux-même, voir à faire tourner leur propre ferme de construction, pour que @code{hydra.gnu.org} devienne une cible moins intéressante. Une façon d'aider est de publier les logiciels que vous construisez avec @command{guix publish} pour que les autres aient plus de choix de serveurs où télécharger les substituts (@pxref{Invoking guix publish})." - -#. type: Plain text -#: doc/guix.texi:2478 -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 possède les fondations pour maximiser la reproductibilité logicielle (@pxref{Features}). Dans la plupart des cas, des constructions indépendantes d'un paquet donnée ou d'une dérivation devrait donner des résultats identiques au bit près. Ainsi, à travers un ensemble de constructions de paquets indépendantes il est possible de renforcer l'intégrité du système. La commande @command{guix challenge} a pour but d'aider les utilisateurs à tester les serveurs de substituts et à aider les développeurs à trouver les constructions de paquets non-déterministes (@pxref{Invoking guix challenge}). De même, l'option @option{--check} de @command{guix build} permet aux utilisateurs de vérifier si les substituts précédemment installés sont authentiques en les reconstruisant localement (@pxref{build-check, @command{guix build --check}})." - -#. type: Plain text -#: doc/guix.texi:2482 -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 "Dans le futur, nous aimerions que Guix puisse publier et recevoir des binaires d'autres utilisateurs, d'une manière pair-à-pair. Si vous voulez discuter de ce projet, rejoignez-nous sur @email{guix-devel@@gnu.org}." - -#. type: cindex -#: doc/guix.texi:2486 -#, no-wrap -msgid "multiple-output packages" -msgstr "paquets avec plusieurs résultats" - -#. type: cindex -#: doc/guix.texi:2487 -#, no-wrap -msgid "package outputs" -msgstr "sorties de paquets" - -#. type: cindex -#: doc/guix.texi:2488 -#, no-wrap -msgid "outputs" -msgstr "sorties" - -#. type: Plain text -#: doc/guix.texi:2498 -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 package -i 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 "Souvent, les paquets définis dans Guix ont une seule @dfn{sortie} — c.-à-d.@: que le paquet source conduit à exactement un répertoire dans le dépôt. Lorsque vous lancez @command{guix package -i glibc}, vous installez la sortie par défaut du paquet GNU libc ; la sortie par défaut est appelée @code{out} mais son nom peut être omis comme le montre cette commande. Dans ce cas particuliers, la sortie par défaut de @code{glibc} contient tous les fichiers d'en-tête C, les bibliothèques partagées, les bibliothèques statiques, la documentation Info et les autres fichiers de support." - -#. type: Plain text -#: doc/guix.texi:2506 -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 "Parfois il est plus approprié de séparer les divers types de fichiers produits par un même paquet source en plusieurs sorties. Par exemple, la bibliothèque C GLib (utilisée par GTK+ et des paquets associés) installe plus de 20 Mo de documentation de référence dans des pages HTML. Pour préserver l'espace disque des utilisateurs qui n'en ont pas besoin, la documentation va dans une sortie séparée nommée @code{doc}. Pour installer la sortie principale de GLib, qui contient tout sauf la documentation, on devrait lancer :" - -#. type: example -#: doc/guix.texi:2509 -#, no-wrap -msgid "guix package -i glib\n" -msgstr "guix package -i glib\n" - -#. type: code{#1} -#: doc/guix.texi:2511 doc/guix.texi:21805 -#, no-wrap -msgid "documentation" -msgstr "documentation" - -#. type: Plain text -#: doc/guix.texi:2513 -msgid "The command to install its documentation is:" -msgstr "La commande pour installer la documentation est :" - -#. type: example -#: doc/guix.texi:2516 -#, no-wrap -msgid "guix package -i glib:doc\n" -msgstr "guix package -i glib:doc\n" - -#. type: Plain text -#: doc/guix.texi:2527 -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 "Certains paquets installent des programmes avec des « empreintes dépendances » différentes. Par exemple le paquet WordNet installe à la fois les outils en ligne de commande et les interfaces graphiques (GUI). La première ne dépend que de la bibliothèque C, alors que cette dernière dépend de Tcl/Tk et des bibliothèques X sous-jacentes. Dans ce cas, nous laissons les outils en ligne de commande dans la sortie par défaut et l'interface graphique dans une sortie séparée. Cela permet aux utilisateurs qui n'ont pas besoin d'interface graphique de gagner de la place. La commande @command{guix size} peut aider à trouver ces situations (@pxref{Invoking guix size}). @command{guix graph} peut aussi être utile (@pxref{Invoking guix graph})." - -#. type: Plain text -#: doc/guix.texi:2535 -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 "Il y a plusieurs paquets à sorties multiples dans la distribution GNU. D'autres noms de sorties conventionnels sont @code{lib} pour les bibliothèques et éventuellement les fichiers d'en-tête, @code{bin} pour les programmes indépendants et @code{debug} pour les informations de débogage (@pxref{Installing Debugging Files}). Les sorties d'un paquet sont listés dans la troisième colonne de la sortie de @command{guix package --list-available} (@pxref{Invoking guix package})." - -#. type: section -#: doc/guix.texi:2538 -#, no-wrap -msgid "Invoking @command{guix gc}" -msgstr "Invoquer @command{guix gc}" - -#. type: cindex -#: doc/guix.texi:2540 -#, no-wrap -msgid "garbage collector" -msgstr "ramasse-miettes" - -#. type: cindex -#: doc/guix.texi:2541 -#, no-wrap -msgid "disk space" -msgstr "espace disque" - -#. type: Plain text -#: doc/guix.texi:2547 -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 "Les paquets qui sont installés mais pas utilisés peuvent être @dfn{glanés}. La commande @command{guix gc} permet aux utilisateurs de lancer explicitement le ramasse-miettes pour récupérer de l'espace dans le répertoire @file{/gnu/store}. C'est la @emph{seule} manière de supprimer des fichiers de @file{/gnu/store} — supprimer des fichiers ou des répertoires à la main peut le casser de manière impossible à réparer !" - -#. type: Plain text -#: doc/guix.texi:2558 -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})." -msgstr "Le ramasse-miettes a un ensemble de @dfn{racines} connues : tout fichier dans @file{/gnu/store} atteignable depuis une racine est considéré comme @dfn{utilisé} et ne peut pas être supprimé ; tous les autres fichiers sont considérés comme @dfn{inutilisés} et peuvent être supprimés. L'ensemble des racines du ramasse-miettes (ou « racines du GC » pour faire court) inclue les profils par défaut des utilisateurs ; par défaut les liens symboliques sous @file{/var/guix/gcroots} représentent ces racines du GC. De nouvelles racines du GC peuvent être ajoutées avec la @command{guix build -- root} par exemple (@pxref{Invoking guix build})." - -#. type: Plain text -#: doc/guix.texi:2564 -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 "Avant de lancer @code{guix gc --collect-garbage} pour faire de la place, c'est souvent utile de supprimer les anciennes génération des profils utilisateurs ; de cette façon les anciennes constructions de paquets référencées par ces générations peuvent être glanées. Cela se fait en lançaint @code{guix package --delete-generations} (@pxref{Invoking guix package})." - -#. type: Plain text -#: doc/guix.texi:2568 -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 "Nous recommandons de lancer le ramasse-miettes régulièrement ou lorsque vous avez besoin d'espace disque. Par exemple pour garantir qu'au moins 5@tie{}Go d'espace reste libre sur votre disque, lancez simplement :" - -#. type: example -#: doc/guix.texi:2571 -#, no-wrap -msgid "guix gc -F 5G\n" -msgstr "guix gc -F 5G\n" - -#. type: Plain text -#: doc/guix.texi:2580 -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 on GuixSD). 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 "Il est parfaitement possible de le lancer comme une tâche périodique non-interactive (@pxref{Scheduled Job Execution} pour apprendre comment paramétrer une telle tâche sur GuixSD). Lancer @command{guix gc} sans argument ramassera autant de miettes que possible mais ça n'est pas le plus pratique : vous pourriez vous retrouver à reconstruire ou re-télécharger des logiciels « inutilisés » du point de vu du GC mais qui sont nécessaires pour construire d'autres logiciels — p.@: ex.@: la chaîne de compilation." - -#. type: Plain text -#: doc/guix.texi:2586 -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 "La command @command{guix gc} a trois modes d'opération : il peut être utilisé pour glaner des fichiers inutilisés (par défaut), pour supprimer des fichiers spécifiques (l'option @code{--delete}), pour afficher des informations sur le ramasse-miettes ou pour des requêtes plus avancées. Les options du ramasse-miettes sont :" - -#. type: item -#: doc/guix.texi:2588 -#, no-wrap -msgid "--collect-garbage[=@var{min}]" -msgstr "--collect-garbage[=@var{min}]" - -#. type: itemx -#: doc/guix.texi:2589 -#, no-wrap -msgid "-C [@var{min}]" -msgstr "-C [@var{min}]" - -#. type: table -#: doc/guix.texi:2593 -msgid "Collect garbage---i.e., unreachable @file{/gnu/store} files and sub-directories. This is the default operation when no option is specified." -msgstr "Ramasse les miettes — c.-à-d.@: les fichiers inaccessibles de @file{/gnu/store} et ses sous-répertoires. C'est l'opération par défaut lorsqu'aucune option n'est spécifiée." - -#. type: table -#: doc/guix.texi:2598 -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 "Lorsque @var{min} est donné, s'arrêter une fois que @var{min} octets ont été collectés. @var{min} pour être un nombre d'octets ou inclure un suffixe d'unité, comme @code{MiB} pour mébioctet et @code{GB} pour gigaoctet (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})." - -#. type: table -#: doc/guix.texi:2600 -msgid "When @var{min} is omitted, collect all the garbage." -msgstr "Lorsque @var{min} est omis, tout glaner." - -#. type: item -#: doc/guix.texi:2601 -#, no-wrap -msgid "--free-space=@var{free}" -msgstr "--free-space=@var{libre}" - -#. type: itemx -#: doc/guix.texi:2602 -#, no-wrap -msgid "-F @var{free}" -msgstr "-F @var{libre}" - -#. type: table -#: doc/guix.texi:2606 -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 "Glaner jusqu'à ce que @var{libre} espace soit disponible dans @file{/gnu/store} si possible ; @var{libre} est une quantité de stockage comme @code{500MiB} comme décrit ci-dessus." - -#. type: table -#: doc/guix.texi:2609 -msgid "When @var{free} or more is already available in @file{/gnu/store}, do nothing and exit immediately." -msgstr "Lorsque @var{libre} ou plus est disponible dans @file{/gnu/store} ne rien faire et s'arrêter immédiatement." - -#. type: item -#: doc/guix.texi:2610 -#, no-wrap -msgid "--delete" -msgstr "--delete" - -#. type: itemx -#: doc/guix.texi:2611 doc/guix.texi:6018 doc/guix.texi:21082 -#, no-wrap -msgid "-d" -msgstr "-d" - -#. type: table -#: doc/guix.texi:2615 -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 "Essayer de supprimer tous les fichiers et les répertoires du dépôt spécifiés en argument. Cela échoue si certains des fichiers ne sont pas dans le dépôt ou s'ils sont toujours utilisés." - -#. type: item -#: doc/guix.texi:2616 -#, no-wrap -msgid "--list-failures" -msgstr "--list-failures" - -#. type: table -#: doc/guix.texi:2618 -msgid "List store items corresponding to cached build failures." -msgstr "Lister les éléments du dépôt qui correspondent à des échecs de construction" - -#. type: table -#: doc/guix.texi:2622 -msgid "This prints nothing unless the daemon was started with @option{--cache-failures} (@pxref{Invoking guix-daemon, @option{--cache-failures}})." -msgstr "Cela n'affiche rien à moins que le démon n'ait été démarré avec @option{--cache-failures} (@pxref{Invoking guix-daemon, @option{--cache-failures}})." - -#. type: item -#: doc/guix.texi:2623 -#, no-wrap -msgid "--clear-failures" -msgstr "--clear-failures" - -#. type: table -#: doc/guix.texi:2625 -msgid "Remove the specified store items from the failed-build cache." -msgstr "Supprimer les éléments du dépôt spécifiés du cache des constructions échouées." - -#. type: table -#: doc/guix.texi:2628 -msgid "Again, this option only makes sense when the daemon is started with @option{--cache-failures}. Otherwise, it does nothing." -msgstr "De nouveau, cette option ne fait de sens que lorsque le démon est démarré avec @option{--cache-failures}. Autrement elle ne fait rien." - -#. type: item -#: doc/guix.texi:2629 -#, no-wrap -msgid "--list-dead" -msgstr "--list-dead" - -#. type: table -#: doc/guix.texi:2632 -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 "Montrer la liste des fichiers et des répertoires inutilisés encore présents dans le dépôt — c.-à-d.@: les fichiers et les répertoires qui ne sont plus atteignables par aucune racine." - -#. type: item -#: doc/guix.texi:2633 -#, no-wrap -msgid "--list-live" -msgstr "--list-live" - -#. type: table -#: doc/guix.texi:2635 -msgid "Show the list of live store files and directories." -msgstr "Montrer la liste des fichiers et des répertoires du dépôt utilisés." - -#. type: Plain text -#: doc/guix.texi:2639 -msgid "In addition, the references among existing store files can be queried:" -msgstr "En plus, les références entre les fichiers existants du dépôt peuvent être demandés :" - -#. type: item -#: doc/guix.texi:2642 -#, no-wrap -msgid "--references" -msgstr "--references" - -#. type: itemx -#: doc/guix.texi:2643 -#, no-wrap -msgid "--referrers" -msgstr "--referrers" - -#. type: cindex -#: doc/guix.texi:2644 doc/guix.texi:7145 -#, no-wrap -msgid "package dependencies" -msgstr "dépendances des paquets" - -#. type: table -#: doc/guix.texi:2647 -msgid "List the references (respectively, the referrers) of store files given as arguments." -msgstr "Lister les références (respectivement les référents) des fichiers du dépôt en argument." - -#. type: item -#: doc/guix.texi:2648 -#, no-wrap -msgid "--requisites" -msgstr "--requisites" - -#. type: itemx -#: doc/guix.texi:2649 doc/guix.texi:2956 -#, no-wrap -msgid "-R" -msgstr "-R" - -#. type: item -#: doc/guix.texi:2650 doc/guix.texi:7021 doc/guix.texi:7049 doc/guix.texi:7117 -#, no-wrap -msgid "closure" -msgstr "closure" - -#. type: table -#: doc/guix.texi:2655 -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 "Lister les prérequis des fichiers du dépôt passés en argument. Les prérequis sont le fichier du dépôt lui-même, leur références et les références de ces références, récursivement. En d'autre termes, la liste retournée est la @dfn{closure transitive} des fichiers du dépôt." - -#. type: table -#: doc/guix.texi:2659 -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} pour un outil pour surveiller la taille de la closure d'un élément. @xref{Invoking guix graph} pour un outil pour visualiser le graphe des références." - -#. type: item -#: doc/guix.texi:2660 -#, no-wrap -msgid "--derivers" -msgstr "--derivers" - -#. type: item -#: doc/guix.texi:2661 doc/guix.texi:3241 doc/guix.texi:7230 -#, no-wrap -msgid "derivation" -msgstr "dérivation" - -#. type: table -#: doc/guix.texi:2664 -msgid "Return the derivation(s) leading to the given store items (@pxref{Derivations})." -msgstr "Renvoie les dérivations menant aux éléments du dépôt donnés (@pxref{Derivations})." - -#. type: table -#: doc/guix.texi:2666 -msgid "For example, this command:" -msgstr "Par exemple cette commande :" - -#. type: example -#: doc/guix.texi:2669 -#, 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:2674 -msgid "returns the @file{.drv} file(s) leading to the @code{emacs} package installed in your profile." -msgstr "renvoie les fichiers @file{.drv} menant au paquet @code{emacs} installé dans votre profil." - -#. type: table -#: doc/guix.texi:2678 -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 "Remarquez qu'il peut n'y avoir aucun fichier @file{.drv} par exemple quand ces fichiers ont été glanés. Il peut aussi y avoir plus d'un fichier @file{.drv} correspondant à cause de dérivations à sortie fixées." - -#. type: Plain text -#: doc/guix.texi:2682 -msgid "Lastly, the following options allow you to check the integrity of the store and to control disk usage." -msgstr "Enfin, les options suivantes vous permettent de vérifier l'intégrité du dépôt et de contrôler l'utilisation du disque." - -#. type: item -#: doc/guix.texi:2685 -#, no-wrap -msgid "--verify[=@var{options}]" -msgstr "--verify[=@var{options}]" - -#. type: cindex -#: doc/guix.texi:2686 -#, no-wrap -msgid "integrity, of the store" -msgstr "intégrité, du dépôt" - -#. type: cindex -#: doc/guix.texi:2687 -#, no-wrap -msgid "integrity checking" -msgstr "vérification d'intégrité" - -#. type: table -#: doc/guix.texi:2689 -msgid "Verify the integrity of the store." -msgstr "Vérifier l'intégrité du dépôt." - -#. type: table -#: doc/guix.texi:2692 -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 "Par défaut, s'assurer que tous les éléments du dépôt marqués comme valides dans la base de données du démon existent bien dans @file{/gnu/store}." - -#. type: table -#: doc/guix.texi:2695 -msgid "When provided, @var{options} must be a comma-separated list containing one or more of @code{contents} and @code{repair}." -msgstr "Lorsqu'elle est fournie, l'@var{option} doit être une liste séparée par des virgule de l'un ou plus parmi @code{contents} et @code{repair}." - -#. type: table -#: doc/guix.texi:2701 -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 "Lorsque vous passez @option{--verify=contents}, le démon calcul le hash du contenu de chaque élément du dépôt et le compare au hash de sa base de données. Les différences de hash sont rapportées comme des corruptions de données. Comme elle traverse @emph{tous les fichiers du dépôt}, cette commande peut prendre très longtemps pour terminer, surtout sur un système avec un disque lent." - -#. type: cindex -#: doc/guix.texi:2702 -#, no-wrap -msgid "repairing the store" -msgstr "réparer le dépôt" - -#. type: cindex -#: doc/guix.texi:2703 doc/guix.texi:6011 -#, no-wrap -msgid "corruption, recovering from" -msgstr "corruption, récupérer de" - -#. type: table -#: doc/guix.texi:2711 -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 "Utiliser @option{--verify=repair} ou @option{--verify=contents,repair} fait que le démon essaie de réparer les objets du dépôt corrompus en récupérant leurs substituts (@pxref{Substituts}). Comme la réparation n'est pas atomique et donc potentiellement dangereuse, elle n'est disponible que pour l'administrateur système. Une alternative plus légère lorsque vous connaissez exactement quelle entrée est corrompue consiste à lancer @command{guix build --repair} (@pxref{Invoking guix build})." - -#. type: item -#: doc/guix.texi:2712 -#, no-wrap -msgid "--optimize" -msgstr "--optimize" - -#. type: table -#: doc/guix.texi:2716 -msgid "Optimize the store by hard-linking identical files---this is @dfn{deduplication}." -msgstr "Optimiser le dépôt en liant en dur les fichiers identiques — c'est la @dfn{déduplication}." - -#. type: table -#: doc/guix.texi:2722 -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 "Le démon effectue une déduplication à chaque construction réussie ou import d'archive à moins qu'il n'ait été démarré avec @code{--disable-deduplication} (@pxref{Invoking guix-daemon, @code{--disable-deduplication}}). Ainsi, cette option est surtout utile lorsque le démon tourne avec @code{--disable-deduplication}." - -#. type: section -#: doc/guix.texi:2726 -#, no-wrap -msgid "Invoking @command{guix pull}" -msgstr "Invoquer @command{guix pull}" - -#. type: cindex -#: doc/guix.texi:2728 -#, no-wrap -msgid "upgrading Guix" -msgstr "mettre à niveau Guix" - -#. type: cindex -#: doc/guix.texi:2729 -#, no-wrap -msgid "updating Guix" -msgstr "mettre à jour Guix" - -#. type: command{#1} -#: doc/guix.texi:2730 -#, no-wrap -msgid "guix pull" -msgstr "guix pull" - -#. type: cindex -#: doc/guix.texi:2731 -#, no-wrap -msgid "pull" -msgstr "pull" - -#. type: Plain text -#: doc/guix.texi:2738 -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." -msgstr "Les paquets sont installés ou mis à jour vers la dernière version disponible dans la distribution actuellement disponible sur votre machine locale. Pour mettre à jour cette distribution, en même temps que les outils Guix, vous devez lancer @command{guix pull} ; la commande télécharge le dernier code source de Guix et des descriptions de paquets et le déploie. Le code source est téléchargé depuis un dépôt @uref{https://git-scm.com, Git}." - -#. type: Plain text -#: doc/guix.texi:2744 -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 "À la fin, @command{guix package} utilisera les paquets et les versions des paquets de la copie de Guix tout juste récupérée. Non seulement ça, mais toutes les commandes Guix et les modules Scheme seront aussi récupérés depuis la dernière version. Les nouvelles sous-commandes de @command{guix} ajoutés par la mise à jour sont aussi maintenant disponibles." - -#. type: Plain text -#: doc/guix.texi:2750 -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." -msgstr "Chaque utilisateur peut mettre à jour sa copie de Guix avec @command{guix pull} et l'effet est limité à l'utilisateur qui a lancé @command{guix pull}. Par exemple, lorsque l'utilisateur @code{root} lance @command{guix pull}, cela n'a pas d'effet sur la version de Guix que vois @code{alice} et vice-versa" - -#. type: Plain text -#: doc/guix.texi:2756 -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 "Le résultat après avoir lancé @command{guix pull} est un @dfn{profil} disponible sous @file{~/.config/guix/current} contenant la dernière version de Guix. Ainsi, assurez-vous de l'ajouter au début de votre chemin de recherche pour que vous utilisiez la dernière version. Le même conseil s'applique au manuel Info (@pxref{Documentation}) :" - -#. type: example -#: doc/guix.texi:2760 -#, no-wrap -msgid "" -"export PATH=\"$HOME/.config/guix/current/bin:$PATH\"\n" -"export INFOPATH=\"$HOME/.config/guix/current/share/info:$INFOPATH\"\n" -msgstr "" -"export PATH=\"$HOME/.config/guix/current/bin:$PATH\"\n" -"export INFOPATH=\"$HOME/.config/guix/current/share/info:$INFOPATH\"\n" +"Usage: guix build [OPTION]... PAQUET-OU-DERIVATION...\n" +"Compiler le PAQUET-OU-DERIVATION donné et retourner leurs chemins de sortie.\n" -#. type: Plain text -#: doc/guix.texi:2764 -msgid "The @code{--list-generations} or @code{-l} option lists past generations produced by @command{guix pull}, along with details about their provenance:" -msgstr "L'option @code{--list-generations} ou @code{-l} liste les anciennes générations produites par @command{guix pull}, avec des détails sur leur origine :" - -#. type: example -#: doc/guix.texi:2772 -#, no-wrap +#: guix/scripts/build.scm:507 msgid "" -"$ guix pull -l\n" -"Generation 1\tJun 10 2018 00:18:18\n" -" guix 65956ad\n" -" repository URL: https://git.savannah.gnu.org/git/guix.git\n" -" branch: origin/master\n" -" commit: 65956ad3526ba09e1f7a40722c96c6ef7c0936fe\n" "\n" +" -e, --expression=EXPR build the package or derivation EXPR evaluates to" msgstr "" -"$ guix pull -l\n" -"Génération 1\t10 juin 2018 00:18:18\n" -" guix 65956ad\n" -" URL du dépôt : https://git.savannah.gnu.org/git/guix.git\n" -" branche : origin/master\n" -" commit : 65956ad3526ba09e1f7a40722c96c6ef7c0936fe\n" "\n" +" -e, --expression=EXPR compiler le paquet ou la dérivation évalué par EXPR" -#. type: example -#: doc/guix.texi:2778 -#, no-wrap +#: guix/scripts/build.scm:509 msgid "" -"Generation 2\tJun 11 2018 11:02:49\n" -" guix e0cc7f6\n" -" repository URL: https://git.savannah.gnu.org/git/guix.git\n" -" branch: origin/master\n" -" commit: e0cc7f669bec22c37481dd03a7941c7d11a64f1d\n" "\n" +" -f, --file=FILE build the package or derivation that the code within\n" +" FILE evaluates to" msgstr "" -"Génération 2\t11 juin 2018 11:02:49\n" -" guix e0cc7f6\n" -" URL du dépôt : https://git.savannah.gnu.org/git/guix.git\n" -" branche : origin/master\n" -" commit : e0cc7f669bec22c37481dd03a7941c7d11a64f1d\n" "\n" +" -f, --file=FICHIER compiler le paquet ou la dérivation qui est évaluée\n" +" par le code dans FICHIER" -#. type: example -#: doc/guix.texi:2784 -#, no-wrap -msgid "" -"Generation 3\tJun 13 2018 23:31:07\t(current)\n" -" guix 844cc1c\n" -" repository URL: https://git.savannah.gnu.org/git/guix.git\n" -" branch: origin/master\n" -" commit: 844cc1c8f394f03b404c5bb3aee086922373490c\n" -msgstr "" -"Génération 3\t13 juin 2018 23:31:07\t(actuelle)\n" -" guix 844cc1c\n" -" URL du dépôt : https://git.savannah.gnu.org/git/guix.git\n" -" branche : origin/master\n" -" commit : 844cc1c8f394f03b404c5bb3aee086922373490c\n" - -#. type: Plain text -#: doc/guix.texi:2790 -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:" -msgstr "Ce profil @code{~/.config/guix/current} fonctionne comme les autres profils créés par @command{guix package} (@pxref{Invoking guix package}). C'est-à-dire que vous pouvez lister les générations, revenir en arrière à une génération précédente — c.-à-d.@: la version de Guix précédente — etc :" - -#. type: example -#: doc/guix.texi:2796 -#, no-wrap +#: guix/scripts/build.scm:512 msgid "" -"$ guix package -p ~/.config/guix/current --roll-back\n" -"switched from generation 3 to 2\n" -"$ guix package -p ~/.config/guix/current --delete-generations=1\n" -"deleting /home/charlie/.config/guix/current-1-link\n" +"\n" +" -S, --source build the packages' source derivations" msgstr "" -"$ guix package -p ~/.config/guix/current --roll-back\n" -"passé de la génération 3 à 2\n" -"$ guix package -p ~/.config/guix/current --delete-generations=1\n" -"suppression de /home/charlie/.config/guix/current-1-link\n" - -#. type: Plain text -#: doc/guix.texi:2800 -msgid "The @command{guix pull} command is usually invoked with no arguments, but it supports the following options:" -msgstr "La commande @command{guix pull} est typiquement invoquée sans arguments mais il supporte les options suivantes :" - -#. type: table -#: doc/guix.texi:2804 -msgid "Produce verbose output, writing build logs to the standard error output." -msgstr "Produire une sortie verbeuse, en écrivant les journaux de construction sur la sortie d'erreur standard." - -#. type: item -#: doc/guix.texi:2805 -#, no-wrap -msgid "--url=@var{url}" -msgstr "--url=@var{url}" - -#. type: table -#: doc/guix.texi:2807 -msgid "Download Guix from the Git repository at @var{url}." -msgstr "Télécharger Guix depuis le dépôt Git à @var{url}." - -#. type: vindex -#: doc/guix.texi:2808 -#, no-wrap -msgid "GUIX_PULL_URL" -msgstr "GUIX_PULL_URL" - -#. type: table -#: doc/guix.texi:2812 -msgid "By default, the source is taken from its canonical Git repository at @code{gnu.org}, for the stable branch of Guix. To use a different source, set the @code{GUIX_PULL_URL} environment variable." -msgstr "Par défaut, la source est récupérée depuis le dépôt Git canonique sur @code{gnu.org}, pour la branche stable de Guix. Pour utiliser une autre source, paramétrez la variable d'environnement @code{GUIX_PULL_URL}." - -#. type: item -#: doc/guix.texi:2813 -#, no-wrap -msgid "--commit=@var{commit}" -msgstr "--commit=@var{commit}" - -#. type: table -#: doc/guix.texi:2816 -msgid "Deploy @var{commit}, a valid Git commit ID represented as a hexadecimal string." -msgstr "Déployer de @var{commit}, un ID de commit Git valide représenté par une chaîne hexadécimale." - -#. type: item -#: doc/guix.texi:2817 -#, no-wrap -msgid "--branch=@var{branch}" -msgstr "--branch=@var{branche}" - -#. type: table -#: doc/guix.texi:2820 -msgid "Deploy the tip of @var{branch}, the name of a Git branch available on the repository at @var{url}." -msgstr "Déployer le haut de la @var{branche}, le nom d'une branche Git disponible sur le répertoire à @var{url}." - -#. type: table -#: doc/guix.texi:2827 -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 "Liste toutes les générations de @file{~/.config/guix/current} ou, si @var{motif} est fournit, le sous-ensemble des générations qui correspondent à @var{motif}. La syntaxe de @var{motif} est la même qu'avec @code{guix package --list-generations} (@pxref{Invoking guix package})." - -#. type: table -#: doc/guix.texi:2831 -msgid "Use the bootstrap Guile to build the latest Guix. This option is only useful to Guix developers." -msgstr "Utiliser le programme d'amorçage Guile pour construire la dernière version de Guix. Cette option n'est utile que pour les développeurs de Guix." - -#. type: Plain text -#: doc/guix.texi:2835 -msgid "In addition, @command{guix pull} supports all the common build options (@pxref{Common Build Options})." -msgstr "En plus, @command{guix pull} supporte toutes les options de construction communes (@pxref{Common Build Options})." - -#. type: section -#: doc/guix.texi:2837 -#, no-wrap -msgid "Invoking @command{guix pack}" -msgstr "Invoquer @command{guix pack}" - -#. type: Plain text -#: doc/guix.texi:2843 -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 "Parfois vous voulez passer un logiciel à des gens qui n'ont pas (encore !) la chance d'utiliser Guix. Vous leur diriez bien de lancer @command{guix package -i @var{quelque chose}} mais ce n'est pas possible dans ce cas. C'est là que @command{guix pack} entre en jeu." - -#. type: quotation -#: doc/guix.texi:2848 -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 "Si vous cherchez comment échanger des binaires entre des machines où Guix est déjà installé, @pxref{Invoking guix copy}, @ref{Invoking guix publish}, et @ref{Invoking guix archive}." - -#. type: cindex -#: doc/guix.texi:2850 -#, no-wrap -msgid "pack" -msgstr "pack" - -#. type: cindex -#: doc/guix.texi:2851 -#, no-wrap -msgid "bundle" -msgstr "lot" - -#. type: cindex -#: doc/guix.texi:2852 -#, no-wrap -msgid "application bundle" -msgstr "lot d'applications" - -#. type: cindex -#: doc/guix.texi:2853 -#, no-wrap -msgid "software bundle" -msgstr "lot de logiciels" - -#. type: Plain text -#: doc/guix.texi:2862 -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 "La commande @command{guix pack} crée un @dfn{pack} ou @dfn{lot de logiciels} : elle crée une archive tar ou un autre type d'archive contenunt les binaires pour le logiciel qui vous intéresse ainsi que ses dépendances. L'archive qui en résulte peut être utilisée sur toutes les machines qui n'ont pas Guix et les gens peuvent lancer exactement les mêmes binaires que ceux que vous avez avec Guix. Le pack lui-même est créé d'une manière reproductible au bit près, pour que n'importe qui puisse vérifier qu'il contient bien les résultats que vous prétendez proposer." - -#. type: Plain text -#: doc/guix.texi:2865 -msgid "For example, to create a bundle containing Guile, Emacs, Geiser, and all their dependencies, you can run:" -msgstr "Par exemple, pour créer un lot contenant Guile, Emacs, Geiser et toutes leurs dépendances, vous pouvez lancer :" - -#. type: example -#: doc/guix.texi:2870 -#, no-wrap +"\n" +" -S, --source compiler les dérivations de source du paquet" + +#: guix/scripts/build.scm:514 msgid "" -"$ guix pack guile emacs geiser\n" -"@dots{}\n" -"/gnu/store/@dots{}-pack.tar.gz\n" +"\n" +" --sources[=TYPE] build source derivations; TYPE may optionally be one\n" +" of \"package\", \"all\" (default), or \"transitive\"" msgstr "" -"$ guix pack guile emacs geiser\n" -"@dots{}\n" -"/gnu/store/@dots{}-pack.tar.gz\n" - -#. type: Plain text -#: doc/guix.texi:2878 -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 "Le résultat ici est une archive tar contenant un répertoire @file{/gnu/store} avec tous les paquets nécessaires. L'archive qui en résulte contient un @dfn{profil} avec les trois paquets qui vous intéressent ; le profil est le même qui celui qui aurait été créé avec @command{guix package -i}. C'est ce mécanisme qui est utilisé pour créer les archives tar binaires indépendantes de Guix (@pxref{Binary Installation})." - -#. type: Plain text -#: doc/guix.texi:2883 -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 "Les utilisateurs de ce pack devraient lancer @file{/gnu/store/@dots{}-profile/bin/guile} pour lancer Guile, ce qui n'est pas très pratique. Pour éviter cela, vous pouvez créer, disons, un lien symbolique @file{/opt/gnu/bin} vers le profil :" - -#. type: example -#: doc/guix.texi:2886 -#, 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:2890 -msgid "That way, users can happily type @file{/opt/gnu/bin/guile} and enjoy." -msgstr "De cette façon, les utilisateurs peuvent joyeusement taper @file{/opt/gnu/bin/guile} et profiter." - -#. type: cindex -#: doc/guix.texi:2891 -#, no-wrap -msgid "relocatable binaries, with @command{guix pack}" -msgstr "binaires repositionnables, avec @command{guix pack}" - -#. type: Plain text -#: doc/guix.texi:2899 -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 "Et si le destinataire de votre pack n'a pas les privilèges root sur sa machine, et ne peut donc pas le décompresser dans le système de fichiers racine ? Dans ce cas, vous pourriez utiliser l'option @code{--relocatable} (voir plus bas). Cette option produite des @dfn{binaire repositionnables}, ce qui signifie qu'ils peuvent être placés n'importe où dans l'arborescence du système de fichiers : dans l'exemple au-dessus, les utilisateurs peuvent décompresser votre archive dans leur répertoire personnel et lancer directement @file{./opt/gnu/bin/guile}." - -#. type: cindex -#: doc/guix.texi:2900 -#, no-wrap -msgid "Docker, build an image with guix pack" -msgstr "Docker, construire une image avec guix pack" - -#. type: Plain text -#: doc/guix.texi:2903 -msgid "Alternatively, you can produce a pack in the Docker image format using the following command:" -msgstr "Autrement, vous pouvez produire un pack au format d'image Docker avec la commande suivante :" - -#. type: example -#: doc/guix.texi:2906 -#, no-wrap -msgid "guix pack -f docker guile emacs geiser\n" -msgstr "guix pack -f docker guile emacs geiser\n" - -#. type: Plain text -#: doc/guix.texi:2913 -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." -msgstr "Le résultat est une archive tar qui peut être passée à la commande @command{docker load}. Voir la @uref{https://docs.docker.com/engine/reference/commandline/load/, documentation de Docker} pour plus d'informations." - -#. type: cindex -#: doc/guix.texi:2914 -#, no-wrap -msgid "Singularity, build an image with guix pack" -msgstr "Singularity, construire une image avec guix pack" - -#. type: cindex -#: doc/guix.texi:2915 -#, no-wrap -msgid "SquashFS, build an image with guix pack" -msgstr "SquashFS, construire une image avec guix pack" - -#. type: Plain text -#: doc/guix.texi:2918 -msgid "Yet another option is to produce a SquashFS image with the following command:" -msgstr "Autrement, vous pouvez produire une image SquashFS avec la commande suivante :" - -#. type: example -#: doc/guix.texi:2921 -#, no-wrap -msgid "guix pack -f squashfs guile emacs geiser\n" -msgstr "guix pack -f squashfs guile emacs geiser\n" - -#. type: Plain text -#: doc/guix.texi:2929 -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}." -msgstr "Le résultat est une image de système de fichiers SquashFS qui peut soit être montée directement soit être utilisée comme image de conteneur de système de fichiers avec l'@uref{http://singularity.lbl.gov, environnement d'exécution conteneurisé Singularity}, avec des commandes comme @command{singularity shell} ou @command{singularity exec}." - -#. type: Plain text -#: doc/guix.texi:2931 -msgid "Several command-line options allow you to customize your pack:" -msgstr "Diverses options en ligne de commande vous permettent de personnaliser votre pack :" - -#. type: item -#: doc/guix.texi:2933 -#, no-wrap -msgid "--format=@var{format}" -msgstr "--format=@var{format}" - -#. type: itemx -#: doc/guix.texi:2934 -#, no-wrap -msgid "-f @var{format}" -msgstr "-f @var{format}" - -#. type: table -#: doc/guix.texi:2936 -msgid "Produce a pack in the given @var{format}." -msgstr "Produire un pack dans le @var{format} donné." - -#. type: table -#: doc/guix.texi:2938 -msgid "The available formats are:" -msgstr "Les formats disponibles sont :" - -#. type: item -#: doc/guix.texi:2940 -#, no-wrap -msgid "tarball" -msgstr "tarball" - -#. type: table -#: doc/guix.texi:2943 -msgid "This is the default format. It produces a tarball containing all the specified binaries and symlinks." -msgstr "C'est le format par défaut. Il produit une archive tar contenant tous les binaires et les liens symboliques spécifiés." - -#. type: item -#: doc/guix.texi:2944 -#, no-wrap -msgid "docker" -msgstr "docker" - -#. type: table -#: doc/guix.texi:2948 -msgid "This produces a tarball that follows the @uref{https://github.com/docker/docker/blob/master/image/spec/v1.2.md, Docker Image Specification}." -msgstr "Cela produit une archive tar qui suit la @uref{https://github.com/docker/docker/blob/master/image/spec/v1.2.md, spécification des images Docker}." - -#. type: item -#: doc/guix.texi:2949 -#, no-wrap -msgid "squashfs" -msgstr "squashfs" - -#. type: table -#: doc/guix.texi:2953 -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 "Cela produit une image SquashFS contenant tous les binaires et liens symboliques spécifiés, ainsi que des points de montages vides pour les systèmes de fichiers virtuels comme procfs." - -#. type: item -#: doc/guix.texi:2955 -#, no-wrap -msgid "--relocatable" -msgstr "--relocatable" - -#. type: table -#: doc/guix.texi:2960 -msgid "Produce @dfn{relocatable binaries}---i.e., binaries that can be placed anywhere in the file system hierarchy and run from there. For example, if you create a pack containing Bash with:" -msgstr "Produit des @dfn{binaires repositionnables} — c.-à-d.@: des binaires que vous pouvez placer n'importe où dans l'arborescence du système de fichiers et les lancer à partir de là. Par exemple, si vous créez un pack contenant Bash avec :" - -#. type: example -#: doc/guix.texi:2963 -#, no-wrap -msgid "guix pack -R -S /mybin=bin bash\n" -msgstr "guix pack -R -S /mybin=bin bash\n" - -#. type: table -#: doc/guix.texi:2968 -msgid "... you can copy that pack to a machine that lacks Guix, and from your home directory as a normal user, run:" -msgstr "… vous pouvez copier ce pack sur une machine qui n'a pas Guix et depuis votre répertoire personnel en tant qu'utilisateur non-privilégié, lancer :" - -#. type: example -#: doc/guix.texi:2972 -#, no-wrap +"\n" +" --sources[=TYPE] compiler les dérivations sources. TYPE peut optionnellement\n" +" être « package », « all » (défaut) ou « transitive »" + +#: guix/scripts/build.scm:517 guix/scripts/pack.scm:646 msgid "" -"tar xf pack.tar.gz\n" -"./mybin/sh\n" +"\n" +" -s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\"" msgstr "" -"tar xf pack.tar.gz\n" -"./mybin/sh\n" - -#. type: table -#: doc/guix.texi:2980 -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 "Dans ce shell, si vous tapez @code{ls /gnu/store}, vous remarquerez que @file{/gnu/store} apparaît et contient toutes les dépendances de @code{bash}, même si la machine n'a pas du tout de @file{/gnu/store} ! C'est sans doute la manière la plus simple de déployer du logiciel construit avec Guix sur une machine sans Guix." - -#. type: table -#: doc/guix.texi:2987 -msgid "There's a gotcha though: this technique relies 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; on these systems, programs from the pack @emph{will fail to run}, unless they are unpacked in the root file system." -msgstr "Il y a un inconvénient cependant : cette technique repose sur les @dfn{espaces de noms} du noyau Linux qui permettent à des utilisateurs non-privilégiés de monter des systèmes de fichiers ou de changer de racine. Les anciennes versions de Linux ne le supportaient pas et certaines distributions GNU/Linux les désactivent ; sur ces système, les programme du pack @emph{ne fonctionneront pas} à moins qu'ils ne soient décompressés à la racine du système de fichiers." - -#. type: item -#: doc/guix.texi:2988 doc/guix.texi:5882 doc/guix.texi:6720 doc/guix.texi:7307 -#: doc/guix.texi:7457 doc/guix.texi:21068 -#, no-wrap -msgid "--expression=@var{expr}" -msgstr "--expression=@var{expr}" - -#. type: itemx -#: doc/guix.texi:2989 doc/guix.texi:5883 doc/guix.texi:6721 doc/guix.texi:7308 -#: doc/guix.texi:7458 doc/guix.texi:21069 -#, no-wrap -msgid "-e @var{expr}" -msgstr "-e @var{expr}" - -#. type: table -#: doc/guix.texi:2991 doc/guix.texi:6723 doc/guix.texi:7310 -msgid "Consider the package @var{expr} evaluates to." -msgstr "Considérer le paquet évalué par @var{expr}." - -#. type: table -#: doc/guix.texi:2995 -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 "Cela a le même but que l'option de même nom de @command{guix build} (@pxref{Additional Build Options, @code{--expression} dans @command{guix build}})." - -#. type: table -#: doc/guix.texi:3000 -msgid "Use the packages contained in the manifest object returned by the Scheme code in @var{file}." -msgstr "Utiliser les paquets contenus dans l'objet manifeste renvoyé par le code Scheme dans @var{fichier}" - -#. type: table -#: doc/guix.texi:3008 -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 "Elle a un but similaire à l'option de même nom dans @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) et utilise les mêmes fichiers manifeste. Ils vous permettent de définir une collection de paquets une fois et de l'utiliser aussi bien pour créer des profils que pour créer des archives pour des machines qui n'ont pas Guix d'installé. Remarquez que vous pouvez spécifier @emph{soit} un fichier manifeste, @emph{soit} une liste de paquet, mais pas les deux." - -#. type: itemx -#: doc/guix.texi:3010 doc/guix.texi:5955 doc/guix.texi:7135 doc/guix.texi:7543 -#: doc/guix.texi:8177 doc/guix.texi:21077 -#, no-wrap -msgid "-s @var{system}" -msgstr "-s @var{système}" - -#. type: table -#: doc/guix.texi:3013 doc/guix.texi:5958 -msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of the system type of the build host." -msgstr "Tenter de construire pour le @var{système} — p.@: ex.@: @code{i686-linux} — plutôt que pour le type de système de l'hôte de construction." - -#. type: item -#: doc/guix.texi:3014 doc/guix.texi:5986 -#, no-wrap -msgid "--target=@var{triplet}" -msgstr "--target=@var{triplet}" - -#. type: cindex -#: doc/guix.texi:3015 doc/guix.texi:3441 doc/guix.texi:5987 -#, no-wrap -msgid "cross-compilation" -msgstr "compilation croisée" - -#. type: table -#: doc/guix.texi:3019 doc/guix.texi:5991 -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 "Effectuer une compilation croisée pour @var{triplet} qui doit être un triplet GNU valide, comme @code{\"mips64el-linux-gnu\"} (@pxref{Specifying target triplets, GNU configuration triplets,, autoconf, Autoconf})." - -#. type: item -#: doc/guix.texi:3020 -#, no-wrap -msgid "--compression=@var{tool}" -msgstr "--compression=@var{outil}" - -#. type: itemx -#: doc/guix.texi:3021 -#, no-wrap -msgid "-C @var{tool}" -msgstr "-C @var{outil}" - -#. type: table -#: doc/guix.texi:3024 -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 "Compresser l'archive résultante avec @var{outil} — l'un des outils parmi @code{bzip2}, @code{xz}, @code{lzip} ou @code{none} pour aucune compression." - -#. type: item -#: doc/guix.texi:3025 -#, no-wrap -msgid "--symlink=@var{spec}" -msgstr "--symlink=@var{spec}" - -#. type: itemx -#: doc/guix.texi:3026 -#, no-wrap -msgid "-S @var{spec}" -msgstr "-S @var{spec}" - -#. type: table -#: doc/guix.texi:3029 -msgid "Add the symlinks specified by @var{spec} to the pack. This option can appear several times." -msgstr "Ajouter les liens symboliques spécifiés par @var{spec} dans le pack. Cette option peut apparaître plusieurs fois." - -#. type: table -#: doc/guix.texi:3033 -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 "@var{spec} a la forme @code{@var{source}=@var{cible}}, où @var{source} est le lien symbolique qui sera créé et @var{cible} est la cible du lien." - -#. type: table -#: doc/guix.texi:3036 -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 "Par exemple, @code{-S /opt/gnu/bin=bin} crée un lien symbolique @file{/opt/gnu/bin} qui pointe vers le sous-répertoire @file{bin} du profil." - -#. type: item -#: doc/guix.texi:3037 -#, no-wrap -msgid "--localstatedir" -msgstr "--localstatedir" - -#. type: table -#: doc/guix.texi:3040 -msgid "Include the ``local state directory'', @file{/var/guix}, in the resulting pack." -msgstr "Inclure le « répertoire d'état local », @file{/var/guix} dans le paquet résultant." - -#. type: table -#: doc/guix.texi:3046 -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 "@file{/var/guix} contient la base de données du dépôt (@pxref{The Store}) ainsi que les racines du ramasse-miettes (@pxref{Invoking guix gc}). Le fournir dans le pack signifie que le dépôt et « complet » et gérable par Guix ; ne pas le fournir dans le pack signifie que le dépôt est « mort » : aucun élément ne peut être ajouté ni enlevé après l'extraction du pack." - -#. type: table -#: doc/guix.texi:3049 -msgid "One use case for this is the Guix self-contained binary tarball (@pxref{Binary Installation})." -msgstr "Un cas d'utilisation est l'archive binaire indépendante de Guix (@pxref{Binary Installation})." - -#. type: table -#: doc/guix.texi:3053 -msgid "Use the bootstrap binaries to build the pack. This option is only useful to Guix developers." -msgstr "Utiliser les programmes d'amorçage pour construire le pack. Cette option n'est utile que pour les développeurs de Guix." - -#. type: Plain text -#: doc/guix.texi:3058 -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 "En plus, @command{guix pack} supporte toutes les options de construction communes (@pxref{Common Build Options}) et toutes les options de transformation de paquets (@pxref{Package Transformation Options})." - -#. type: section -#: doc/guix.texi:3061 -#, no-wrap -msgid "Invoking @command{guix archive}" -msgstr "Invoquer @command{guix archive}" - -#. type: command{#1} -#: doc/guix.texi:3063 -#, no-wrap -msgid "guix archive" -msgstr "guix archive" - -#. type: cindex -#: doc/guix.texi:3064 -#, no-wrap -msgid "archive" -msgstr "archive" - -#. type: Plain text -#: doc/guix.texi:3070 -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 "La commande @command{guix archive} permet aux utilisateurs d'@dfn{exporter} des fichiers du dépôt dans une simple archive puis ensuite de les @dfn{importer} sur une machine qui fait tourner Guix. En particulier, elle permet de transférer des fichiers du dépôt d'une machine vers le dépôt d'une autre machine." - -#. type: quotation -#: doc/guix.texi:3074 -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 "Si vous chercher une manière de produire des archives dans un format adapté pour des outils autres que Guix, @pxref{Invoking guix pack}." - -#. type: cindex -#: doc/guix.texi:3076 -#, no-wrap -msgid "exporting store items" -msgstr "exporter des éléments du dépôt" - -#. type: Plain text -#: doc/guix.texi:3078 -msgid "To export store files as an archive to standard output, run:" -msgstr "Pour exporter des fichiers du dépôt comme une archive sur la sortie standard, lancez :" - -#. type: example -#: doc/guix.texi:3081 -#, no-wrap -msgid "guix archive --export @var{options} @var{specifications}...\n" -msgstr "guix archive --export @var{options} @var{spécifications}...\n" - -#. type: Plain text -#: doc/guix.texi:3088 -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{spécifications} peut être soit des noms de fichiers soit des spécifications de paquets, comme pour @command{guix package} (@pxref{Invoking guix package}). Par exemple, la commande suivante crée une archive contenant la sortie @code{gui} du paquet @code{git} et la sortie principale de @code{emacs} :" - -#. type: example -#: doc/guix.texi:3091 -#, 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:3096 -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 "Si les paquets spécifiés ne sont pas déjà construits, @command{guix archive} les construit automatiquement. Le processus de construction peut être contrôlé avec les options de construction communes (@pxref{Common Build Options})." - -#. type: Plain text -#: doc/guix.texi:3099 -msgid "To transfer the @code{emacs} package to a machine connected over SSH, one would run:" -msgstr "Pour transférer le paquet @code{emacs} vers une machine connectée en SSH, on pourrait lancer :" - -#. type: example -#: doc/guix.texi:3102 -#, no-wrap -msgid "guix archive --export -r emacs | ssh the-machine guix archive --import\n" -msgstr "guix archive --export -r emacs | ssh la-machine guix archive --import\n" - -#. type: Plain text -#: doc/guix.texi:3107 -msgid "Similarly, a complete user profile may be transferred from one machine to another like this:" -msgstr "De même, on peut transférer un profil utilisateur complet d'une machine à une autre comme cela :" - -#. type: example -#: doc/guix.texi:3111 -#, no-wrap +"\n" +" -s, --system=SYSTÈME essayer de compiler pour le SYSTÈME donné, par exemple « i686-linux »" + +#: guix/scripts/build.scm:519 guix/scripts/pack.scm:648 msgid "" -"guix archive --export -r $(readlink -f ~/.guix-profile) | \\\n" -" ssh the-machine guix-archive --import\n" +"\n" +" --target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\"" msgstr "" -"guix archive --export -r $(readlink -f ~/.guix-profile) | \\\n" -" ssh la-machine guix-archive --import\n" - -#. type: Plain text -#: doc/guix.texi:3121 -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 "Cependant, remarquez que, dans les deux exemples, le paquet @code{emacs}, le profil ainsi que toutes leurs dépendances sont transférées (à cause de @code{-r}), indépendamment du fait qu'ils soient disponibles dans le dépôt de la machine cible. L'option @code{--missing} peut vous aider à comprendre les éléments qui manquent dans le dépôt de la machine cible. La commande @command{guix copy} simplifie et optimise ce processus, c'est donc ce que vous devriez utiliser dans ce cas (@pxref{Invoking guix copy})." - -#. type: cindex -#: doc/guix.texi:3122 -#, no-wrap -msgid "nar, archive format" -msgstr "nar, format d'archive" - -#. type: cindex -#: doc/guix.texi:3123 -#, no-wrap -msgid "normalized archive (nar)" -msgstr "archive normalisée (nar)" - -#. type: Plain text -#: doc/guix.texi:3133 -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 "Les archives sont stockées au format « archive normalisé » ou « nar », qui est comparable dans l'esprit à « tar » mais avec des différences qui le rendent utilisable pour ce qu'on veut faire. Tout d'abord, au lieu de stocker toutes les métadonnées Unix de chaque fichier, le format nar ne mentionne que le type de fichier (normal, répertoire ou lien symbolique) ; les permissions Unix, le groupe et l'utilisateur ne sont pas mentionnés. Ensuite, l'ordre dans lequel les entrées de répertoires sont stockés suit toujours l'ordre des noms de fichier dans l'environnement linguistique C. Cela rend la production des archives entièrement déterministe." - -#. type: Plain text -#: doc/guix.texi:3139 -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 "Lors de l'export, le démon signe numériquement le contenu de l'archive et cette signature est ajoutée à la fin du fichier. Lors de l'import, le démon vérifie la signature et rejette l'import en cas de signature invalide ou si la clef de signature n'est pas autorisée." - -#. type: Plain text -#: doc/guix.texi:3141 -msgid "The main options are:" -msgstr "Les principales options sont :" - -#. type: item -#: doc/guix.texi:3143 -#, no-wrap -msgid "--export" -msgstr "--export" - -#. type: table -#: doc/guix.texi:3146 -msgid "Export the specified store files or packages (see below.) Write the resulting archive to the standard output." -msgstr "Exporter les fichiers ou les paquets du dépôt (voir plus bas). Écrire l'archive résultante sur la sortie standard." - -#. type: table -#: doc/guix.texi:3149 -msgid "Dependencies are @emph{not} included in the output, unless @code{--recursive} is passed." -msgstr "Les dépendances ne sont @emph{pas} incluses dans la sortie à moins que @code{--recursive} ne soit passé." - -#. type: itemx -#: doc/guix.texi:3150 doc/guix.texi:6258 doc/guix.texi:6644 -#, no-wrap -msgid "-r" -msgstr "-r" - -#. type: item -#: doc/guix.texi:3151 doc/guix.texi:6257 doc/guix.texi:6643 -#, no-wrap -msgid "--recursive" -msgstr "--recursive" - -#. type: table -#: doc/guix.texi:3156 -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 "En combinaison avec @code{--export}, cette option demande à @command{guix archive} d'inclure les dépendances des éléments donnés dans l'archive. Ainsi, l'archive résultante est autonome : elle contient la closure des éléments du dépôt exportés." - -#. type: item -#: doc/guix.texi:3157 -#, no-wrap -msgid "--import" -msgstr "--import" - -#. type: table -#: doc/guix.texi:3162 -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 "Lire une archive depuis l'entrée standard et importer les fichiers inclus dans le dépôt. Annuler si l'archive a une signature invalide ou si elle est signée par une clef publique qui ne se trouve pas dans le clefs autorisées (voir @code{--authorize} plus bas.)" - -#. type: item -#: doc/guix.texi:3163 -#, no-wrap -msgid "--missing" -msgstr "--missing" - -#. type: table -#: doc/guix.texi:3167 -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 "Liste une liste de noms de fichiers du dépôt sur l'entrée standard, un par ligne, et écrit sur l'entrée standard le sous-ensemble de ces fichiers qui manquent dans le dépôt." - -#. type: item -#: doc/guix.texi:3168 -#, no-wrap -msgid "--generate-key[=@var{parameters}]" -msgstr "--generate-key[=@var{paramètres}]" - -#. type: cindex -#: doc/guix.texi:3169 -#, no-wrap -msgid "signing, archives" -msgstr "signature, archives" - -#. type: table -#: doc/guix.texi:3174 -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 "Générer une nouvelle paire de clefs pour le démon. Cela est un prérequis avant que les archives ne puissent être exportées avec @code{--export}. Remarquez que cette opération prend généralement du temps parce qu'elle doit récupère suffisamment d'entropie pour générer la paire de clefs." - -#. type: table -#: doc/guix.texi:3184 -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 "La paire de clefs générée est typiquement stockée dans @file{/etc/guix}, dans @file{signing-key.pub} (clef publique) et @file{signing-key.sec} (clef privée, qui doit rester secrète). Lorsque @var{paramètres} est omis, une clef ECDSA utilisant la courbe Ed25519 est générée ou pour les version de libgcrypt avant 1.6.0, une clef RSA de 4096 bits. Autrement, @var{paramètres} peut spécifier les paramètres @code{genkey} adaptés pour libgcrypt (@pxref{General public-key related Functions, @code{gcry_pk_genkey},, gcrypt, The Libgcrypt Reference Manual})." - -#. type: item -#: doc/guix.texi:3185 -#, no-wrap -msgid "--authorize" -msgstr "--authorize" - -#. type: cindex -#: doc/guix.texi:3186 -#, no-wrap -msgid "authorizing, archives" -msgstr "autorisation, archives" - -#. type: table -#: doc/guix.texi:3190 -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 "Autoriser les imports signés par la clef publique passée sur l'entrée standard. La clef publique doit être au « format avancé s-expression » — c.-à-d.@: le même format que le fichier @file{signing-key.pub}." - -#. type: table -#: doc/guix.texi:3197 -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)}." -msgstr "La liste des clefs autorisées est gardée dans un fichier modifiable par des humains dans @file{/etc/guix/acl}. Le fichier contient des @url{http://people.csail.mit.edu/rivest/Sexp.txt, « s-expressions au format avancé »} et est structuré comme une liste de contrôle d'accès dans l'@url{http://theworld.com/~cme/spki.txt, infrastructure à clefs publiques simple (SPKI)}." - -#. type: item -#: doc/guix.texi:3198 -#, no-wrap -msgid "--extract=@var{directory}" -msgstr "--extract=@var{répertoire}" - -#. type: itemx -#: doc/guix.texi:3199 -#, no-wrap -msgid "-x @var{directory}" -msgstr "-x @var{répertoire}" - -#. type: table -#: doc/guix.texi:3203 -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 "Lit une archive à un seul élément telle que servie par un serveur de substituts (@pxref{Substituts}) et l'extrait dans @var{répertoire}. C'est une opération de bas niveau requise seulement dans de rares cas d'usage ; voir plus loin." - -#. type: table -#: doc/guix.texi:3206 -msgid "For example, the following command extracts the substitute for Emacs served by @code{hydra.gnu.org} to @file{/tmp/emacs}:" -msgstr "Par exemple, la commande suivante extrait le substitut pour Emacs servi par @code{hydra.gnu.org} dans @file{/tmp/emacs} :" - -#. type: example -#: doc/guix.texi:3211 -#, no-wrap +"\n" +" --target=TRIPLET effectuer une compilation croisée pour TRIPLET, par exemple « armel-linux-gnu »" + +#: guix/scripts/build.scm:521 msgid "" -"$ wget -O - \\\n" -" https://hydra.gnu.org/nar/@dots{}-emacs-24.5 \\\n" -" | bunzip2 | guix archive -x /tmp/emacs\n" +"\n" +" -d, --derivations return the derivation paths of the given packages" msgstr "" -"$ wget -O - \\\n" -" https://hydra.gnu.org/nar/@dots{}-emacs-24.5 \\\n" -" | bunzip2 | guix archive -x /tmp/emacs\n" - -#. type: table -#: doc/guix.texi:3218 -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 "Les archives à un seul élément sont différentes des archives à plusieurs éléments produites par @command{guix archive --export} ; elles contiennent un seul élément du dépôt et elles n'embarquent @emph{pas} de signature. Ainsi cette opération ne vérifie @emph{pas} de signature et sa sortie devrait être considérée comme non sûre." - -#. type: table -#: doc/guix.texi:3221 -msgid "The primary purpose of this operation is to facilitate inspection of archive contents coming from possibly untrusted substitute servers." -msgstr "Le but principal de cette opération est de faciliter l'inspection du contenu des archives venant de serveurs auxquels on ne fait potentiellement pas confiance." - -#. type: Plain text -#: doc/guix.texi:3234 -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 "GNU Guix fournit diverses interface de programmation Scheme (API) qui pour définir, construire et faire des requêtes sur des paquets. La première interface permet aux utilisateurs d'écrire des définitions de paquets de haut-niveau. Ces définitions se réfèrent à des concepts de création de paquets familiers, comme le nom et la version du paquet, son système de construction et ses dépendances. Ces définitions peuvent ensuite être transformées en actions concrètes lors de la construction." - -#. type: Plain text -#: doc/guix.texi:3240 -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 "Les actions de construction sont effectuées par le démon Guix, pour le compte des utilisateurs. Dans un environnement standard, le démon possède les droits en écriture sur le dépôt — le répertoire @file{/gnu/store} — mais pas les utilisateurs. La configuration recommandée permet aussi au démon d'effectuer la construction dans des chroots, avec un utilisateur de construction spécifique pour minimiser les interférences avec le reste du système." - -#. type: Plain text -#: doc/guix.texi:3249 -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 "Il y a des API de plus bas niveau pour interagir avec le démon et le dépôt. Pour demander au démon d'effectuer une action de construction, les utilisateurs lui donnent en fait une @dfn{dérivation}. Une dérivation est une représentation à bas-niveau des actions de construction à entreprendre et l'environnement dans lequel elles devraient avoir lieu — les dérivations sont aux définitions de paquets ce que l'assembleur est aux programmes C. Le terme de « dérivation » vient du fait que les résultats de la construction en @emph{dérivent}." - -#. type: Plain text -#: doc/guix.texi:3252 -msgid "This chapter describes all these APIs in turn, starting from high-level package definitions." -msgstr "Ce chapitre décrit toutes ces API tour à tour, à partir des définitions de paquets à haut-niveau." - -#. type: Plain text -#: doc/guix.texi:3269 -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 "L'interface de haut-niveau pour les définitions de paquets est implémentée dans les modules @code{(guix packages)} et @code{(guix build-system)}. Par exemple, la définition du paquet, ou la @dfn{recette}, du paquet GNU Hello ressemble à cela :" - -#. type: example -#: doc/guix.texi:3277 -#, no-wrap +"\n" +" -d, --derivations retourner les chemins de dérivation pour les paquets donnés" + +#: guix/scripts/build.scm:523 msgid "" -"(define-module (gnu packages hello)\n" -" #:use-module (guix packages)\n" -" #:use-module (guix download)\n" -" #:use-module (guix build-system gnu)\n" -" #:use-module (guix licenses)\n" -" #:use-module (gnu packages gawk))\n" "\n" +" --check rebuild items to check for non-determinism issues" msgstr "" -"(define-module (gnu packages hello)\n" -" #:use-module (guix packages)\n" -" #:use-module (guix download)\n" -" #:use-module (guix build-system gnu)\n" -" #:use-module (guix licenses)\n" -" #:use-module (gnu packages gawk))\n" "\n" +" --check recompiler les éléments pour détecter des problèmes de non déterminisme" -#. type: example -#: doc/guix.texi:3296 -#, no-wrap +#: guix/scripts/build.scm:525 msgid "" -"(define-public hello\n" -" (package\n" -" (name \"hello\")\n" -" (version \"2.10\")\n" -" (source (origin\n" -" (method url-fetch)\n" -" (uri (string-append \"mirror://gnu/hello/hello-\" version\n" -" \".tar.gz\"))\n" -" (sha256\n" -" (base32\n" -" \"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i\"))))\n" -" (build-system gnu-build-system)\n" -" (arguments '(#:configure-flags '(\"--enable-silent-rules\")))\n" -" (inputs `((\"gawk\" ,gawk)))\n" -" (synopsis \"Hello, GNU world: An example GNU package\")\n" -" (description \"Guess what GNU Hello prints!\")\n" -" (home-page \"http://www.gnu.org/software/hello/\")\n" -" (license gpl3+)))\n" +"\n" +" --repair repair the specified items" msgstr "" -"(define-public hello\n" -" (package\n" -" (name \"hello\")\n" -" (version \"2.10\")\n" -" (source (origin\n" -" (method url-fetch)\n" -" (uri (string-append \"mirror://gnu/hello/hello-\" version\n" -" \".tar.gz\"))\n" -" (sha256\n" -" (base32\n" -" \"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i\"))))\n" -" (build-system gnu-build-system)\n" -" (arguments '(#:configure-flags '(\"--enable-silent-rules\")))\n" -" (inputs `((\"gawk\" ,gawk)))\n" -" (synopsis \"Hello, GNU world: An example GNU package\")\n" -" (description \"Guess what GNU Hello prints!\")\n" -" (home-page \"http://www.gnu.org/software/hello/\")\n" -" (license gpl3+)))\n" - -#. type: Plain text -#: doc/guix.texi:3306 -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 "Sans être un expert Scheme, le lecteur peut comprendre la signification des différents champs présents. Cette expression lie la variable @code{hello} à un objet @code{}, qui est essentiellement un enregistrement (@pxref{SRFI-9, Scheme records,, guile, GNU Guile Reference Manual}). On peut inspecter cet objet de paquet avec les procédures qui se trouvent dans le module @code{(guix packages)} ; par exemple, @code{(package-name hello)} renvoie — oh surprise ! — @code{\"hello\"}." - -#. type: Plain text -#: doc/guix.texi:3310 -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 "Avec un peu de chance, vous pourrez importer tout ou partie de la définition du paquet qui vous intéresse depuis un autre répertoire avec la commande @code{guix import} (@pxref{Invoking guix import})." - -#. type: Plain text -#: doc/guix.texi:3316 -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 "Dans l'exemple précédent, @var{hello} est défini dans un module à part, @code{(gnu packages hello)}. Techniquement, cela n'est pas strictement nécessaire, mais c'est pratique : tous les paquets définis dans des modules sous @code{(gnu packages @dots{})} sont automatiquement connus des outils en ligne de commande (@pxref{Package Modules})." - -#. type: Plain text -#: doc/guix.texi:3318 -msgid "There are a few points worth noting in the above package definition:" -msgstr "Il y a quelques points à remarquer dans la définition de paquet précédente :" - -#. type: itemize -#: doc/guix.texi:3325 -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 "Le champ @code{source} du paquet est un objet @code{} (@pxref{origin Reference}, pour la référence complète). Ici, on utilise la méthode @code{url-fetch} de @code{(guix download)}, ce qui signifie que la source est un fichier à télécharger par FTP ou HTTP." - -#. type: itemize -#: doc/guix.texi:3328 -msgid "The @code{mirror://gnu} prefix instructs @code{url-fetch} to use one of the GNU mirrors defined in @code{(guix download)}." -msgstr "Le préfixe @code{mirror://gnu} demande à @code{url-fetch} d'utiliser l'un des miroirs GNU définis dans @code{(guix download)}." - -#. type: itemize -#: doc/guix.texi:3335 -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 "Le champ @code{sha256} spécifie le hash SHA256 attendu pour le fichier téléchargé. Il est requis et permet à Guix de vérifier l'intégrité du fichier. La forme @code{(base32 @dots{})} introduit a représentation en base32 du hash. Vous pouvez obtenir cette information avec @code{guix download} (@pxref{Invoking guix download}) et @code{guix hash} (@pxref{Invoking guix hash})." - -#. type: cindex -#: doc/guix.texi:3336 -#, no-wrap -msgid "patches" -msgstr "correctifs" - -#. type: itemize -#: doc/guix.texi:3340 -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 "Lorsque cela est requis, la forme @code{origin} peut aussi avec un champ @code{patches} qui liste les correctifs à appliquer et un champ @code{snippet} qui donne une expression Scheme pour modifier le code source." - -#. type: cindex -#: doc/guix.texi:3342 -#, no-wrap -msgid "GNU Build System" -msgstr "Système de construction GNU" - -#. type: itemize -#: doc/guix.texi:3348 -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 "Le champ @code{build-system} spécifie la procédure pour construire le paquet (@pxref{Build Systems}). Ici, @var{gnu-build-system} représente le système de construction GNU familier, où les paquets peuvent être configurés, construits et installés avec la séquence @code{./configure && make && make check && make install} habituelle." - -#. type: itemize -#: doc/guix.texi:3354 -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 "Le champ @code{arguments} spécifie des options pour le système de construction (@pxref{Build Systems}). Ici il est interprété par @var{gnu-build-system} comme une demande de lancer @file{configure} avec le drapeau @code{--enable-silent-rules}." - -#. type: findex -#: doc/guix.texi:3355 doc/guix.texi:3358 -#, no-wrap -msgid "quote" -msgstr "quote" - -#. type: cindex -#: doc/guix.texi:3356 -#, no-wrap -msgid "quoting" -msgstr "quoting" - -#. type: findex -#: doc/guix.texi:3357 -#, no-wrap -msgid "'" -msgstr "'" - -#. type: itemize -#: doc/guix.texi:3366 -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 "Que sont ces apostrophes (@code{'}) ? C'est de la syntaxe Scheme pour introduire une liste ; @code{'} est synonyme de la fonction @code{quote}. @xref{Expression Syntax, quoting,, guile, GNU Guile Reference Manual}, pour des détails. Ice la valeur du champ @code{arguments} est une liste d'arguments passés au système de construction plus tard, comme avec @code{apply} (@pxref{Fly Evaluation, @code{apply},, guile, GNU Guile Reference Manual})." - -#. type: itemize -#: doc/guix.texi:3372 -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 "La séquence dièse-deux-points (@code{#:}) définie un @dfn{mot-clef} Scheme (@pxref{Keywords,,, guile, GNU Guile Reference Manual}), et @code{#:configure-flags} est un mot-clef utilisé pour passer un argument au système de construction (@pxref{Coding With Keywords,,, guile, GNU Guile Reference Manual})." - -#. type: itemize -#: doc/guix.texi:3378 -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 "Le champ @code{inputs} spécifie les entrées du processus de construction — c.-à-d.@: les dépendances à la construction ou à l'exécution du paquet. Ici on définie une entrée nommée @code{\"gawk\"} dont la valeur est la variable @var{gawk} ; @var{gawk} est elle-même liée à un objet @code{}." - -#. type: cindex -#: doc/guix.texi:3379 -#, no-wrap -msgid "backquote (quasiquote)" -msgstr "accent grave (quasiquote)" - -#. type: findex -#: doc/guix.texi:3380 -#, no-wrap -msgid "`" -msgstr "`" - -#. type: findex -#: doc/guix.texi:3381 -#, no-wrap -msgid "quasiquote" -msgstr "quasiquote" - -#. type: cindex -#: doc/guix.texi:3382 -#, no-wrap -msgid "comma (unquote)" -msgstr "virgule (unquote)" - -#. type: findex -#: doc/guix.texi:3383 -#, no-wrap -msgid "," -msgstr "," - -#. type: findex -#: doc/guix.texi:3384 -#, no-wrap -msgid "unquote" -msgstr "unquote" - -#. type: findex -#: doc/guix.texi:3385 -#, no-wrap -msgid ",@@" -msgstr ",@@" - -#. type: findex -#: doc/guix.texi:3386 -#, no-wrap -msgid "unquote-splicing" -msgstr "unquote-splicing" - -#. type: itemize -#: doc/guix.texi:3392 -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 "De nouveau, @code{`} (un accent grave, synonyme de la fonction @code{quasiquote}) nous permet d'introduire une liste litérale dans le champ @code{inputs}, tandis que @code{,} (une virgule, synonyme de la fonction @code{unquote}) nous permet d'insérer une valeur dans cette liste (@pxref{Expression Syntax, unquote,, guile, GNU Guile Reference Manual})." - -#. type: itemize -#: doc/guix.texi:3396 -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 "Remarquez que GCC, Coreutils, Bash et les autres outils essentiels n'ont pas besoin d'être spécifiés en tant qu'entrées ici. À la place, le @var{gnu-build-system} est en charge de s'assurer qu'ils sont présents (@pxref{Build Systems})." - -#. type: itemize -#: doc/guix.texi:3400 -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 "Cependant, toutes les autres dépendances doivent être spécifiées dans le champ @code{inputs}. Toute dépendance qui ne serait pas spécifiée ici sera simplement indisponible pour le processus de construction, ce qui peut mener à un échec de la construction." - -#. type: Plain text -#: doc/guix.texi:3403 -msgid "@xref{package Reference}, for a full description of possible fields." -msgstr "@xref{package Reference}, pour une description complète des champs possibles." - -#. type: Plain text -#: doc/guix.texi:3414 -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 "Lorsqu'une définition de paquet est en place, le paquet peut enfin être construit avec l'outil en ligne de commande @code{guix build} (@pxref{Invoking guix build}), pour résoudre les échecs de construction que vous pourriez rencontrer (@pxref{Debugging Build Failures}). Vous pouvez aisément revenir à la définition du paquet avec la commande @command{guix edit} (@pxref{Invoking guix edit}). @xref{Packaging Guidelines}, pour plus d'inforamtions sur la manière de tester des définitions de paquets et @ref{Invoking guix lint}, pour des informations sur la manière de vérifier que la définition réspecte les conventions de style." - -#. type: vindex -#: doc/guix.texi:3414 -#, no-wrap -msgid "GUIX_PACKAGE_PATH" -msgstr "GUIX_PACKAGE_PATH" - -#. type: Plain text -#: doc/guix.texi:3418 -msgid "Lastly, @pxref{Package Modules}, for information on how to extend the distribution by adding your own package definitions to @code{GUIX_PACKAGE_PATH}." -msgstr "Enfin, @pxref{Package Modules} pour des informations sur la manière d'étendre la distribution en ajoutant vos propres définitions de paquets dans @code{GUIX_PACKAGE_PATH}." - -#. type: Plain text -#: doc/guix.texi:3422 -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 "Finalement, la mise à jour de la définition du paquet à une nouvelle version amont peut en partie s'automatiser avec la commande @command{guix refresh} (@pxref{Invoking guix refresh})." - -#. type: Plain text -#: doc/guix.texi:3428 -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 "Sous le capot, une dérivation qui correspond à un objet @code{} est d'abord calculé par la procédure @code{package-derivation}. Cette dérivation est stockée dans un fichier @code{.drv} dans @file{/gnu/store}. Les actions de construction qu'il prescrit peuvent ensuite être réalisées par la procédure @code{build-derivation} (@pxref{The Store})." - -#. type: deffn -#: doc/guix.texi:3429 -#, no-wrap -msgid "{Scheme Procedure} package-derivation @var{store} @var{package} [@var{system}]" -msgstr "{Procédure Scheme} package-derivation @var{dépôt} @var{paquet} [@var{système}]" - -#. type: deffn -#: doc/guix.texi:3432 -msgid "Return the @code{} object of @var{package} for @var{system} (@pxref{Derivations})." -msgstr "Renvoie l'objet @code{} du @var{paquet} pour le @var{système} (@pxref{Derivations})." - -#. type: deffn -#: doc/guix.texi:3438 -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 "@var{paquet} doit être un objet @code{} valide et @var{système} une chaîne indiquant le type de système cible — p.ex.@: @code{\"x86_64-linux\"} pour un système GNU x86_64 basé sur Linux. @var{dépôt} doit être une connexion au démon, qui opère sur les dépôt (@pxref{The Store})." - -#. type: Plain text -#: doc/guix.texi:3444 -msgid "Similarly, it is possible to compute a derivation that cross-builds a package for some other system:" -msgstr "De manière identique, il est possible de calculer une dérivation qui effectue une compilation croisée d'un paquet pour un autre système :" - -#. type: deffn -#: doc/guix.texi:3445 -#, no-wrap -msgid "{Scheme Procedure} package-cross-derivation @var{store} @" -msgstr "{Procédure Scheme} package-cross-derivation @var{dépôt} @" - -#. type: deffn -#: doc/guix.texi:3449 -msgid "@var{package} @var{target} [@var{system}] Return the @code{} object of @var{package} cross-built from @var{system} to @var{target}." -msgstr "@var{paquet} @var{cible} [@var{système}] renvoie l'objet @code{} duof @var{paquet} construit depuis @var{système} pour @var{cible}." - -#. type: deffn -#: doc/guix.texi:3454 -msgid "@var{target} must be a valid GNU triplet denoting the target hardware and operating system, such as @code{\"mips64el-linux-gnu\"} (@pxref{Configuration Names, GNU configuration triplets,, configure, GNU Configure and Build System})." -msgstr "@var{cible} doit être un triplet GNU valide indiquant le matériel cible et le système d'exploitation, comme @code{\"mips64el-linux-gnu\"} (@pxref{Configuration Names, GNU configuration triplets,, configure, GNU Configure and Build System})." - -#. type: cindex -#: doc/guix.texi:3456 -#, no-wrap -msgid "package transformations" -msgstr "transformations de paquets" - -#. type: cindex -#: doc/guix.texi:3457 -#, no-wrap -msgid "input rewriting" -msgstr "réécriture d'entrées" - -#. type: cindex -#: doc/guix.texi:3458 -#, no-wrap -msgid "dependency tree rewriting" -msgstr "réécriture de l'arbre des dépendances" - -#. type: Plain text -#: doc/guix.texi:3462 -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 "On peut manipuler les paquets de manière arbitraire. Une transformation utile est par exemple la @dfn{réécriture d'entrées} où l'arbre des dépendances d'un paquet est réécrit en replaçant des entrées spécifiques par d'autres :" - -#. type: deffn -#: doc/guix.texi:3463 -#, no-wrap -msgid "{Scheme Procedure} package-input-rewriting @var{replacements} @" -msgstr "{Procédure Scheme} package-input-rewriting @var{remplacements} @" - -#. type: deffn -#: doc/guix.texi:3470 -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 "[@var{nom-réécrit}] Renvoie une procédure qui, lorsqu'on lui donne un paquet, remplace des dépendances directes et indirectes (mais pas ses entrées implicites) en fonction de @var{remplacements}. @var{remplacements} est une liste de paires de paquets ; le premier élément de chaque pair est le paquet à remplacer, le second son remplaçant." - -#. type: deffn -#: doc/guix.texi:3473 -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 "De manière facultative, @var{nom-réécrit} est une procédure à un argument qui prend le nom d'un paquet et renvoie son nouveau nom après l'avoir réécrit." - -#. type: Plain text -#: doc/guix.texi:3477 -msgid "Consider this example:" -msgstr "Regardez cet exemple :" - -#. type: example -#: doc/guix.texi:3483 -#, no-wrap +"\n" +" --repair réparer les éléments spécifiés" + +#: guix/scripts/build.scm:527 msgid "" -"(define libressl-instead-of-openssl\n" -" ;; This is a procedure to replace OPENSSL by LIBRESSL,\n" -" ;; recursively.\n" -" (package-input-rewriting `((,openssl . ,libressl))))\n" "\n" +" -r, --root=FILE make FILE a symlink to the result, and register it\n" +" as a garbage collector root" msgstr "" -"(define libressl-instead-of-openssl\n" -" ;; Cette procédure remplace OPENSSL par LIBRESSL,\n" -" ;; récursivement.\n" -" (package-input-rewriting `((,openssl . ,libressl))))\n" "\n" +" -r, --root=FICHIER faire de FICHIER un lien symbolique pointant sur le résultat\n" +" et l'enregistrer en tant que racine du garbage collector" -#. type: example -#: doc/guix.texi:3486 -#, no-wrap +#: guix/scripts/build.scm:530 msgid "" -"(define git-with-libressl\n" -" (libressl-instead-of-openssl git))\n" +"\n" +" -q, --quiet do not show the build log" msgstr "" -"(define git-with-libressl\n" -" (libressl-instead-of-openssl git))\n" - -#. type: Plain text -#: doc/guix.texi:3494 -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 "Ici nous définissons d'abord une procédure de réécriture qui remplace @var{openssl} par @var{libressl}. Ensuite nous l'utilisons pour définir une @dfn{variante} du paquet @var{git} qui utilise @var{libressl} plutôt que @var{openssl}. cela est exactement ce que l'option en ligne de commande @option{--with-input} fait (@pxref{Package Transformation Options, @option{--with-input}})." - -#. type: Plain text -#: doc/guix.texi:3498 -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 "Une procédure plus générique pour réécrire un graphe de dépendance d'un paquet est @code{package-mapping} : elle supporte n'importe quel changement dans les nœuds du graphe." - -#. type: deffn -#: doc/guix.texi:3499 -#, no-wrap -msgid "{Scheme Procedure} package-mapping @var{proc} [@var{cut?}]" -msgstr "{Procédure Scheme} package-mapping @var{proc} [@var{cut?}]" - -#. type: deffn -#: doc/guix.texi:3503 -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 "Renvoie une procédure qui, avec un paquet, applique @var{proc} sur tous les paquets dont il dépend et renvoie le paquet qui en résulte. La procédure arrête la récursion là où @var{cut?} renvoie vrai pour un paquet donné." - -#. type: subsection -#: doc/guix.texi:3512 -#, no-wrap -msgid "@code{package} Reference" -msgstr "Référence de @code{package}" - -#. type: Plain text -#: doc/guix.texi:3516 -msgid "This section summarizes all the options available in @code{package} declarations (@pxref{Defining Packages})." -msgstr "Cette section résume toutes les options disponibles dans les déclarations @code{package} (@pxref{Defining Packages})." - -#. type: deftp -#: doc/guix.texi:3517 -#, no-wrap -msgid "{Data Type} package" -msgstr "{Type de donnée} package" - -#. type: deftp -#: doc/guix.texi:3519 -msgid "This is the data type representing a package recipe." -msgstr "C'est le type de donnée représentant une recette de paquets" - -#. type: table -#: doc/guix.texi:3523 -msgid "The name of the package, as a string." -msgstr "Le nom du paquet, comme une chaîne de caractères." - -#. type: code{#1} -#: doc/guix.texi:3524 -#, no-wrap -msgid "version" -msgstr "version" - -#. type: table -#: doc/guix.texi:3526 -msgid "The version of the package, as a string." -msgstr "La version du paquet, comme une chaîne de caractères." - -#. type: code{#1} -#: doc/guix.texi:3527 doc/guix.texi:6927 doc/guix.texi:9509 doc/guix.texi:9797 -#, no-wrap -msgid "source" -msgstr "source" - -#. type: table -#: doc/guix.texi:3534 -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 "Un objet qui indique comment le code source du paquet devrait être récupéré. La plupart du temps, c'est un objet @code{origin} qui indique un fichier récupéré depuis internet (@pxref{origin Reference}). Il peut aussi s'agir de tout autre objet ``simili-fichier'' comme un @code{local-file} qui indique un fichier du système de fichier local (@pxref{G-Expressions, @code{local-file}})." - -#. type: code{#1} -#: doc/guix.texi:3535 -#, no-wrap -msgid "build-system" -msgstr "build-system" - -#. type: table -#: doc/guix.texi:3538 -msgid "The build system that should be used to build the package (@pxref{Build Systems})." -msgstr "Le système de construction qui devrait être utilisé pour construire le paquet (@pxref{Build Systems})." - -#. type: item -#: doc/guix.texi:3539 doc/guix.texi:11285 -#, no-wrap -msgid "@code{arguments} (default: @code{'()})" -msgstr "@code{arguments} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:3542 -msgid "The arguments that should be passed to the build system. This is a list, typically containing sequential keyword-value pairs." -msgstr "Les arguments à passer au système de construction. C'est une liste qui contient typiquement une séquence de paires de clefs-valeurs." - -#. type: item -#: doc/guix.texi:3543 -#, no-wrap -msgid "@code{inputs} (default: @code{'()})" -msgstr "@code{inputs} (par défaut : @code{'()})" - -#. type: itemx -#: doc/guix.texi:3544 -#, no-wrap -msgid "@code{native-inputs} (default: @code{'()})" -msgstr "@code{native-inputs} (par défaut : @code{'()})" - -#. type: itemx -#: doc/guix.texi:3545 -#, no-wrap -msgid "@code{propagated-inputs} (default: @code{'()})" -msgstr "@code{propagated-inputs} (par défaut : @code{'()})" - -#. type: cindex -#: doc/guix.texi:3546 -#, no-wrap -msgid "inputs, of packages" -msgstr "entrées, des paquets" - -#. type: table -#: doc/guix.texi:3554 -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 "Ces champs listent les dépendances du paquet. Chacune est une liste de tuples, où chaque tuple a une étiquette pour une entrée (une chaîne de caractères) comme premier élément, un paquet, une origine ou une dérivation comme deuxième élément et éventuellement le nom d'une sortie à utiliser qui est @code{\"out\"} par défaut (@pxref{Packages with Multiple Outputs}, pour plus d'informations sur les sorties des paquets). Par exemple, la liste suivante spécifie trois entrées :" - -#. type: example -#: doc/guix.texi:3559 -#, no-wrap +"\n" +" -q, --quiet ne pas montrer le journal de compilation" + +#: guix/scripts/build.scm:532 msgid "" -"`((\"libffi\" ,libffi)\n" -" (\"libunistring\" ,libunistring)\n" -" (\"glib:bin\" ,glib \"bin\")) ;the \"bin\" output of Glib\n" +"\n" +" --log-file return the log file names for the given derivations" msgstr "" -"`((\"libffi\" ,libffi)\n" -" (\"libunistring\" ,libunistring)\n" -" (\"glib:bin\" ,glib \"bin\")) ;la sortie \"bin\" de Glib\n" - -#. type: cindex -#: doc/guix.texi:3561 -#, no-wrap -msgid "cross compilation, package dependencies" -msgstr "compilation croisée, dépendances des paquets" - -#. type: table -#: doc/guix.texi:3567 -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 "La distinction entre @code{native-inputs} et @code{inputs} est nécessaire lorsqu'on considère la compilation croisée. Lors d'une compilation croisée, les dépendances listées dans @code{inputs} sont construites pour l'architecture @emph{cible} ; inversement, les dépendances listées dans @code{native-inputs} sont construites pour l'architecture de la machine de @emph{construction}." - -#. type: table -#: doc/guix.texi:3572 -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 "@code{native-inputs} est typiquement utilisé pour lister les outils requis à la construction mais pas à l'exécution, comme Autoconf, Automake, pkg-config, Gettext ou Bison. @command{guix lint} peut rapporter des erreurs de ce type (@pxref{Invoking guix lint})." - -#. type: anchor{#1} -#: doc/guix.texi:3579 -msgid "package-propagated-inputs" -msgstr "package-propagated-inputs" - -#. type: table -#: doc/guix.texi:3579 -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 "Enfin, @code{propagated-inputs} est similaire à @code{inputs}, mais les paquets spécifiés seront automatiquement installés avec le paquet auquel ils appartiennent (@pxref{package-cmd-propagated-inputs, @command{guix package}}, pour des informations sur la manière dont @command{guix package} traite les entrées propagées)." - -#. type: table -#: doc/guix.texi:3583 -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 "Par exemple cela est nécessaire lorsque des bibliothèques C/C++ ont besoin d'en-têtes d'une autre bibliothèque pour être compilé ou lorsqu'un fichier pkg-config se rapporte à un autre @i{via} son champ @code{Requires}." - -#. type: table -#: doc/guix.texi:3590 -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 "Un autre exemple où @code{propagated-inputs} est utile est pour les langages auxquels il manque un moyen de retenir le chemin de recherche comme c'est le cas du @code{RUNPATH} des fichiers ELF ; cela comprend Guile, Python, Perl et plus. Pour s'assurer que les bibliothèques écrites dans ces langages peuvent trouver le code des bibliothèques dont elles dépendent à l'exécution, les dépendances à l'exécution doivent être listées dans @code{propagated-inputs} plutôt que @code{inputs}." - -#. type: item -#: doc/guix.texi:3591 -#, no-wrap -msgid "@code{self-native-input?} (default: @code{#f})" -msgstr "@code{self-native-input?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:3594 -msgid "This is a Boolean field telling whether the package should use itself as a native input when cross-compiling." -msgstr "C'est un champ booléen qui indique si le paquet devrait s'utiliser lui-même comme entrée native lors de la compilation croisée." - -#. type: item -#: doc/guix.texi:3595 -#, no-wrap -msgid "@code{outputs} (default: @code{'(\"out\")})" -msgstr "@code{outputs} (par défaut : @code{'(\"out\")})" - -#. type: table -#: doc/guix.texi:3598 -msgid "The list of output names of the package. @xref{Packages with Multiple Outputs}, for typical uses of additional outputs." -msgstr "La liste des noms de sorties du paquet. @xref{Packages with Multiple Outputs}, pour des exemples typiques d'utilisation de sorties supplémentaires." - -#. type: item -#: doc/guix.texi:3599 -#, no-wrap -msgid "@code{native-search-paths} (default: @code{'()})" -msgstr "@code{native-search-paths} (par défaut : @code{'()})" - -#. type: itemx -#: doc/guix.texi:3600 -#, no-wrap -msgid "@code{search-paths} (default: @code{'()})" -msgstr "@code{search-paths} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:3603 -msgid "A list of @code{search-path-specification} objects describing search-path environment variables honored by the package." -msgstr "Une liste d'objets @code{search-path-specification} décrivant les variables d'environnement de recherche de chemins que ce paquet utilise." - -#. type: item -#: doc/guix.texi:3604 -#, no-wrap -msgid "@code{replacement} (default: @code{#f})" -msgstr "@code{replacement} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:3608 -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 "Ce champ doit être soit @code{#f} soit un objet de paquet qui sera utilisé comme @dfn{remplaçant} de ce paquet. @xref{Security Updates, grafts}, pour plus de détails." - -#. type: item -#: doc/guix.texi:3609 doc/guix.texi:6919 -#, no-wrap -msgid "synopsis" -msgstr "synopsis" - -#. type: table -#: doc/guix.texi:3611 -msgid "A one-line description of the package." -msgstr "Une description sur une ligne du paquet." - -#. type: item -#: doc/guix.texi:3612 doc/guix.texi:6920 doc/guix.texi:21511 -#, no-wrap -msgid "description" -msgstr "description" - -#. type: table -#: doc/guix.texi:3614 -msgid "A more elaborate description of the package." -msgstr "Une description plus détaillée du paquet." - -#. type: code{#1} -#: doc/guix.texi:3615 -#, no-wrap -msgid "license" -msgstr "license" - -#. type: cindex -#: doc/guix.texi:3616 -#, no-wrap -msgid "license, of packages" -msgstr "licence, des paquets" - -#. type: table -#: doc/guix.texi:3619 -msgid "The license of the package; a value from @code{(guix licenses)}, or a list of such values." -msgstr "La licence du paquet ; une valeur tirée de @code{(guix licenses)} ou une liste de ces valeurs." - -#. type: itemx -#: doc/guix.texi:3620 doc/guix.texi:6928 -#, no-wrap -msgid "home-page" -msgstr "home-page" - -#. type: table -#: doc/guix.texi:3622 -msgid "The URL to the home-page of the package, as a string." -msgstr "L'URL de la page d'accueil du paquet, en tant que chaîne de caractères." - -#. type: item -#: doc/guix.texi:3623 -#, no-wrap -msgid "@code{supported-systems} (default: @var{%supported-systems})" -msgstr "@code{supported-systems} (par défaut : @var{%supported-systems})" - -#. type: table -#: doc/guix.texi:3626 -msgid "The list of systems supported by the package, as strings of the form @code{architecture-kernel}, for example @code{\"x86_64-linux\"}." -msgstr "La liste des systèmes supportés par le paquet, comme des chaînes de caractères de la forme @code{architecture-noyau}, par exemple @code{\"x86_64-linux\"}." - -#. type: item -#: doc/guix.texi:3627 -#, no-wrap -msgid "@code{maintainers} (default: @code{'()})" -msgstr "@code{maintainers} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:3629 -msgid "The list of maintainers of the package, as @code{maintainer} objects." -msgstr "La liste des mainteneurs du paquet, comme des objets @code{maintainer}." - -#. type: item -#: doc/guix.texi:3630 -#, no-wrap -msgid "@code{location} (default: source location of the @code{package} form)" -msgstr "@code{location} (par défaut : emplacement de la source de la forme @code{package})" - -#. type: table -#: doc/guix.texi:3634 -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 "L'emplacement de la source du paquet. C'est utile de le remplacer lorsqu'on hérite d'un autre paquet, auquel cas ce champ n'est pas automatiquement corrigé." - -#. type: subsection -#: doc/guix.texi:3639 -#, no-wrap -msgid "@code{origin} Reference" -msgstr "Référence de @code{origin}" - -#. type: Plain text -#: doc/guix.texi:3643 -msgid "This section summarizes all the options available in @code{origin} declarations (@pxref{Defining Packages})." -msgstr "Cette section résume toutes les options disponibles dans le déclarations @code{origin} (@pxref{Defining Packages})." - -#. type: deftp -#: doc/guix.texi:3644 -#, no-wrap -msgid "{Data Type} origin" -msgstr "{Type de donnée} origin" - -#. type: deftp -#: doc/guix.texi:3646 -msgid "This is the data type representing a source code origin." -msgstr "C'est le type de donnée qui représente l'origine d'un code source." - -#. type: code{#1} -#: doc/guix.texi:3648 doc/guix.texi:16065 -#, no-wrap -msgid "uri" -msgstr "uri" - -#. type: table -#: doc/guix.texi:3653 -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 "Un objet contenant l'URI de la source. Le type d'objet dépend de la @code{method} (voir plus bas). Par exemple, avec la méthode @var{url-fetch} de @code{(guix download)}, les valeurs valide d'@code{uri} sont : une URL représentée par une chaîne de caractères, ou une liste de chaînes de caractères." - -#. type: code{#1} -#: doc/guix.texi:3654 -#, no-wrap -msgid "method" -msgstr "method" - -#. type: table -#: doc/guix.texi:3656 -msgid "A procedure that handles the URI." -msgstr "Un procédure qui gère l'URI." - -#. type: table -#: doc/guix.texi:3658 -msgid "Examples include:" -msgstr "Quelques exemples :" - -#. type: item -#: doc/guix.texi:3660 -#, no-wrap -msgid "@var{url-fetch} from @code{(guix download)}" -msgstr "@var{url-fetch} de @code{(guix download)}" - -#. type: table -#: doc/guix.texi:3663 -msgid "download a file from the HTTP, HTTPS, or FTP URL specified in the @code{uri} field;" -msgstr "télécharge un fichier depuis l'URL HTTP, HTTPS ou FTP spécifiée dans le champ @code{uri} ;" - -#. type: vindex -#: doc/guix.texi:3664 doc/guix.texi:6275 -#, no-wrap -msgid "git-fetch" -msgstr "git-fetch" - -#. type: item -#: doc/guix.texi:3665 -#, no-wrap -msgid "@var{git-fetch} from @code{(guix git-download)}" -msgstr "@var{git-fetch} de @code{(guix git-download)}" - -#. type: table -#: doc/guix.texi:3669 -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 "clone le dépôt sous contrôle de version Git et récupère la révision spécifiée dans le champ @code{uri} en tant qu'objet @code{git-reference} ; un objet @code{git-reference} ressemble à cela :" - -#. type: example -#: doc/guix.texi:3674 -#, no-wrap +"\n" +" --log-file retourner les fichiers de journalisation pour les dérivations données" + +#: guix/scripts/build.scm:539 guix/scripts/download.scm:83 +#: guix/scripts/package.scm:395 guix/scripts/gc.scm:76 +#: guix/scripts/hash.scm:59 guix/scripts/import.scm:92 +#: guix/scripts/import/cran.scm:47 guix/scripts/pull.scm:120 +#: guix/scripts/substitute.scm:879 guix/scripts/system.scm:993 +#: guix/scripts/lint.scm:1107 guix/scripts/publish.scm:94 +#: guix/scripts/edit.scm:44 guix/scripts/size.scm:243 +#: guix/scripts/graph.scm:466 guix/scripts/challenge.scm:241 +#: guix/scripts/copy.scm:122 guix/scripts/pack.scm:661 +#: guix/scripts/weather.scm:258 guix/scripts/container.scm:33 +#: guix/scripts/container/exec.scm:43 msgid "" -"(git-reference\n" -" (url \"git://git.debian.org/git/pkg-shadow/shadow\")\n" -" (commit \"v4.1.5.1\"))\n" -msgstr "" -"(git-reference\n" -" (url \"git://git.debian.org/git/pkg-shadow/shadow\")\n" -" (commit \"v4.1.5.1\"))\n" - -#. type: code{#1} -#: doc/guix.texi:3677 -#, no-wrap -msgid "sha256" -msgstr "sha256" - -#. type: table -#: doc/guix.texi:3681 -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 "Un bytevector contenant le hash SHA-256 de la source. Typiquement la forme @code{base32} est utilisée ici pour générer le bytevector depuis une chaîne de caractères en base-32." - -#. type: table -#: doc/guix.texi:3685 -msgid "You can obtain this information using @code{guix download} (@pxref{Invoking guix download}) or @code{guix hash} (@pxref{Invoking guix hash})." -msgstr "Vous pouvez obtenir cette information avec @code{guix download} (@pxref{Invoking guix download}) ou @code{guix hash} (@pxref{Invoking guix hash})." - -#. type: item -#: doc/guix.texi:3686 -#, no-wrap -msgid "@code{file-name} (default: @code{#f})" -msgstr "@code{file-name} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:3692 -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 "Le nom de fichier à utiliser pour sauvegarder le fichier. Lorsqu'elle est à @code{#f}, une valeur par défaut raisonnable est utilisée dans la plupart des cas. Dans le cas où la source est récupérée depuis une URL, le nom de fichier est celui de l'URL. Pour les sources récupérées depuis un outil de contrôle de version, il est recommandé de fournir un nom de fichier explicitement parce que le nom par défaut n'est pas très descriptif." - -#. type: item -#: doc/guix.texi:3693 -#, no-wrap -msgid "@code{patches} (default: @code{'()})" -msgstr "@code{patches} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:3696 -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 "Une liste de noms de fichiers, d'origines ou d'objets simili-fichiers (@pxref{G-Expressions, file-like objects}) qui pointent vers des correctifs à appliquer sur la source." - -#. type: table -#: doc/guix.texi:3700 -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 "Cette liste de correctifs doit être inconditionnelle. En particulier, elle ne peut pas dépendre des valeurs de @code{%current-system} ou @code{%current-target-system}." - -#. type: item -#: doc/guix.texi:3701 -#, no-wrap -msgid "@code{snippet} (default: @code{#f})" -msgstr "@code{snippet} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:3705 -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 "Une G-expression (@pxref{G-Expressions}) ou une S-expression qui sera lancée dans le répertoire des sources. C'est une manière pratique de modifier la source, parfois plus qu'un correctif." - -#. type: item -#: doc/guix.texi:3706 -#, no-wrap -msgid "@code{patch-flags} (default: @code{'(\"-p1\")})" -msgstr "@code{patch-flags} (par défaut : @code{'(\"-p1\")})" - -#. type: table -#: doc/guix.texi:3709 -msgid "A list of command-line flags that should be passed to the @code{patch} command." -msgstr "Une liste de drapeaux à passer à la commande @code{patch}." - -#. type: item -#: doc/guix.texi:3710 -#, no-wrap -msgid "@code{patch-inputs} (default: @code{#f})" -msgstr "@code{patch-inputs} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:3714 -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 "Paquets d'entrées ou dérivations pour le processus de correction. Lorsqu'elle est à @code{#f}, l'ensemble d'entrées habituellement nécessaire pour appliquer des correctifs est fournit, comme GNU@tie{}Patch." - -#. type: item -#: doc/guix.texi:3715 -#, no-wrap -msgid "@code{modules} (default: @code{'()})" -msgstr "@code{modules} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:3718 -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 "Une liste de modules Guile qui devraient être chargés pendant le processus de correction et pendant que le lancement du code du champ @code{snippet}." - -#. type: item -#: doc/guix.texi:3719 -#, no-wrap -msgid "@code{patch-guile} (default: @code{#f})" -msgstr "@code{patch-guile} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:3722 -msgid "The Guile package that should be used in the patching process. When this is @code{#f}, a sensible default is used." -msgstr "Le paquet Guile à utiliser dans le processus de correction. Lorsqu'elle est à @code{#f}, une valeur par défaut raisonnable est utilisée." - -#. type: cindex -#: doc/guix.texi:3729 -#, no-wrap -msgid "build system" -msgstr "système de construction" - -#. type: Plain text -#: doc/guix.texi:3734 -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 "Chaque définition de paquet définie un @dfn{système de construction} et des arguments pour ce système de construction (@pxref{Defining Packages}). Ce champ @code{build-system} représente la procédure de construction du paquet, ainsi que des dépendances implicites pour cette procédure de construction." - -#. type: Plain text -#: doc/guix.texi:3738 -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 "Les systèmes de construction sont des objets @code{}. L'interface pour les créer et les manipuler est fournie par le module @code{(guix build-system)} et les systèmes de construction eux-mêmes sont exportés par des modules spécifiques." - -#. type: cindex -#: doc/guix.texi:3739 -#, no-wrap -msgid "bag (low-level package representation)" -msgstr "sac (représentation à bas-niveau des paquets)" - -#. type: Plain text -#: doc/guix.texi:3746 -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 "Sous le capot, les systèmes de construction compilent d'abord des objets paquets en @dfn{sacs}. Un @dfn{sac} est comme un paquet, mais avec moins de décoration — en d'autres mots, un sac est une représentation à bas-niveau d'un paquet, qui inclus toutes les entrées de ce paquet, dont certaines ont été implicitement ajoutées par le système de construction. Cette représentation intermédiaire est ensuite compilée en une dérivation (@pxref{Derivations})." - -#. type: Plain text -#: doc/guix.texi:3754 -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 "Les systèmes de construction acceptent une liste d'@dfn{arguments} facultatifs. Dans les définitions de paquets, ils sont passés @i{via} le champ @code{arguments} (@pxref{Defining Packages}). Ce sont typiquement des arguments par mot-clef (@pxref{Optional Arguments, keyword arguments in Guile,, guile, GNU Guile Reference Manual}). La valeur de ces arguments est habituellement évaluée dans la @dfn{strate de construction} — c.-à-d.@: par un processus Guile lancé par le démon (@pxref{Derivations})." - -#. type: Plain text -#: doc/guix.texi:3758 -msgid "The main build system is @var{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 "Le système de construction principal est le @var{gnu-build-system} qui implémente les procédures de construction standard pour les paquets GNU et de nombreux autres. Il est fournit par le module @code{(guix build-system gnu)}." - -#. type: defvr -#: doc/guix.texi:3759 -#, no-wrap -msgid "{Scheme Variable} gnu-build-system" -msgstr "{Variable Scheme} gnu-build-system" - -#. type: defvr -#: doc/guix.texi:3763 -msgid "@var{gnu-build-system} represents the GNU Build System, and variants thereof (@pxref{Configuration, configuration and makefile conventions,, standards, GNU Coding Standards})." -msgstr "@var{gnu-build-system} représente le système de construction GNU et ses variantes (@pxref{Configuration, configuration and makefile conventions,, standards, GNU Coding Standards})." - -#. type: cindex -#: doc/guix.texi:3764 -#, no-wrap -msgid "build phases" -msgstr "phases de construction" - -#. type: defvr -#: doc/guix.texi:3771 -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 "En résumé, les paquets qui l'utilisent sont configurés, construits et installés avec la séquence @code{./configure && make && make check && make install} habituelle. En pratique, des étapes supplémentaires sont souvent requises. Toutes ces étapes sont séparées dans des @dfn{phases} différentes, notamment@footnote{Regardez les modules @code{(guix build gnu-build-system)} pour plus de détails sur les phases de construction.}:" - -#. type: item -#: doc/guix.texi:3773 -#, no-wrap -msgid "unpack" -msgstr "unpack" - -#. type: table -#: doc/guix.texi:3777 -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 "Décompresse l'archive des sources et se déplace dans l'arborescence des sources fraîchement extraites. Si la source est en fait un répertoire, le copie dans l'arborescence de construction et entre dans ce répertoire." - -#. type: item -#: doc/guix.texi:3778 -#, no-wrap -msgid "patch-source-shebangs" -msgstr "patch-source-shebangs" - -#. type: table -#: doc/guix.texi:3782 -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 "Corrige les shebangs (@code{#!}) rencontrés dans les fichiers pour qu'ils se réfèrent aux bons noms de fichiers. Par exemple, elle change @code{#!/bin/sh} en @code{#!/gnu/store/@dots{}-bash-4.3/bin/sh}." - -#. type: item -#: doc/guix.texi:3783 doc/guix.texi:4268 -#, no-wrap -msgid "configure" -msgstr "configure" - -#. type: table -#: doc/guix.texi:3787 -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 "Lance le script @code{configure} avec un certain nombre d'options par défaut, comme @code{--prefix=/gnu/store/@dots{}}, ainsi que les options spécifiées par l'argument @code{#:configure-flags}." - -#. type: item -#: doc/guix.texi:3788 doc/guix.texi:4273 doc/guix.texi:20921 -#, no-wrap -msgid "build" -msgstr "build" - -#. type: table -#: doc/guix.texi:3792 -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 "Lance @code{make} avec la liste des drapeaux spécifiés avec @code{#:make-flags}. Si l'argument @code{#:parallel-build?} est vrai (par défaut), construit avec @code{make -j}." - -#. type: item -#: doc/guix.texi:3793 doc/guix.texi:4277 -#, no-wrap -msgid "check" -msgstr "check" - -#. type: table -#: doc/guix.texi:3798 -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 "Lance @code{make check}, ou une autre cible spécifiée par @code{#:test-target}, à moins que @code{#:tests? #f} ne soit passé. Si l'argument @code{#:parallel-tests?} est vrai (par défaut), lance @code{make check -j}." - -#. type: item -#: doc/guix.texi:3799 doc/guix.texi:4281 -#, no-wrap -msgid "install" -msgstr "install" - -#. type: table -#: doc/guix.texi:3801 -msgid "Run @code{make install} with the flags listed in @code{#:make-flags}." -msgstr "Lance @code{make install} avec les drapeaux listés dans @code{#:make-flags}." - -#. type: item -#: doc/guix.texi:3802 -#, no-wrap -msgid "patch-shebangs" -msgstr "patch-shebangs" - -#. type: table -#: doc/guix.texi:3804 -msgid "Patch shebangs on the installed executable files." -msgstr "Corrige les shebangs des fichiers exécutables installés." - -#. type: item -#: doc/guix.texi:3805 -#, no-wrap -msgid "strip" -msgstr "strip" - -#. type: table -#: doc/guix.texi:3809 -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 "Nettoie les symboles de débogage dans les fichiers ELF (à moins que @code{#:strip-binaries?} ne soit faux), les copie dans la sortie @code{debug} lorsqu'elle est disponible (@pxref{Installing Debugging Files})." - -#. type: vindex -#: doc/guix.texi:3811 -#, no-wrap -msgid "%standard-phases" -msgstr "%standard-phases" - -#. type: defvr -#: doc/guix.texi:3816 -msgid "The build-side module @code{(guix build gnu-build-system)} defines @var{%standard-phases} as the default list of build phases. @var{%standard-phases} is a list of symbol/procedure pairs, where the procedure implements the actual phase." -msgstr "Le module du côté du constructeur @code{(guix build gnu-build-system)} définie @var{%standard-phases} comme la liste par défaut des phases de construction. @var{%standard-phases} est une liste de paires de symboles et de procédures, où la procédure implémente la phase en question." - -#. type: defvr -#: doc/guix.texi:3819 -msgid "The list of phases used for a particular package can be changed with the @code{#:phases} parameter. For instance, passing:" -msgstr "La liste des phases utilisées par un paquet particulier peut être modifiée avec le paramètre @code{#:phases}. Par exemple, en passant :" - -#. type: example -#: doc/guix.texi:3822 -#, no-wrap -msgid "#:phases (modify-phases %standard-phases (delete 'configure))\n" -msgstr "#:phases (modify-phases %standard-phases (delete 'configure))\n" - -#. type: defvr -#: doc/guix.texi:3826 -msgid "means that all the phases described above will be used, except the @code{configure} phase." -msgstr "signifie que toutes les procédures décrites plus haut seront utilisées, sauf la phase @code{configure}." - -#. type: defvr -#: doc/guix.texi:3833 -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 "En plus, ce système de construction s'assure que l'environnement « standard » pour les paquets GNU est disponible. Cela inclus des outils comme GCC, libc, Coreutils, Bash, Make, Diffutils, grep et sed (voir le module @code{(guix build-system gnu)} pour une liste complète). Nous les appelons les @dfn{entrées implicites} d'un paquet parce que la définition du paquet ne les mentionne pas." - -#. type: Plain text -#: doc/guix.texi:3840 -msgid "Other @code{} objects are defined to support other conventions and tools used by free software packages. They inherit most of @var{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 "D'autres objets @code{} sont définis pour supporter d'autres conventions et outils utilisés par les paquets de logiciels libres. Ils héritent de la plupart de @var{gnu-build-system} et diffèrent surtout dans l'ensemble des entrées implicites ajoutées au processus de construction et dans la liste des phases exécutées. Certains de ces systèmes de construction sont listés ci-dessous." - -#. type: defvr -#: doc/guix.texi:3841 -#, no-wrap -msgid "{Scheme Variable} ant-build-system" -msgstr "{Variable Scheme} ant-build-system" - -#. type: defvr -#: doc/guix.texi:3845 -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{http://ant.apache.org/, Ant build tool}." -msgstr "Cette variable est exportée par @code{(guix build-system ant)}. Elle implémente la procédure de construction pour les paquets Java qui peuvent être construits avec @url{http://ant.apache.org/, l'outil de construction Ant}." - -#. type: defvr -#: doc/guix.texi:3850 -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 "Elle ajoute à la fois @code{ant} et the @dfn{kit de développement Java} (JDK) fournit par le paquet @code{icedtea} à l'ensemble des entrées. Des paquets différents peuvent être spécifiés avec les paramètres @code{#:ant} et @code{#:jdk} respectivement." - -#. type: defvr -#: doc/guix.texi:3856 -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 "Lorsque le paquet d'origine ne fournit pas de fichier de construction Ant acceptable, le paramètre @code{#:jar-name} peut être utilisé pour générer un fichier de construction Ant @file{build.xml} minimal, avec des tâches pour construire l'archive jar spécifiée. Dans ce cas, le paramètre @code{#:source-dir} peut être utilisé pour spécifier le sous-répertoire des sources, par défaut « src »." - -#. type: defvr -#: doc/guix.texi:3864 -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 "Le paramètre @code{#:main-class} peut être utilisé avec le fichier de construction minimal pour spécifier la classe principale du jar. Cela rend le fichier jar exécutable. Le paramètre @code{#:test-include} peut être utilisé pour spécifier la liste des tests junit à lancer. Il vaut par défaut @code{(list \"**/*Test.java\")}. Le paramètre @code{#:test-exclude} peut être utilisé pour désactiver certains tests. Sa valeur par défaut est @code{(list \"**/Abstract*.java\")}, parce que les classes abstraites ne peuvent pas être utilisées comme des tests." - -#. type: defvr -#: doc/guix.texi:3868 -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 "Le paramètre @code{#:build-target} peut être utilisé pour spécifier la tâche Ant qui devrait être lancée pendant la phase @code{build}. Par défaut la tâche « jar » sera lancée." - -#. type: defvr -#: doc/guix.texi:3871 -#, no-wrap -msgid "{Scheme Variable} android-ndk-build-system" -msgstr "{Variable Scheme} android-ndk-build-system" - -#. type: cindex -#: doc/guix.texi:3872 -#, no-wrap -msgid "Android distribution" -msgstr "Distribution android" - -#. type: cindex -#: doc/guix.texi:3873 -#, no-wrap -msgid "Android NDK build system" -msgstr "système de construction Android NDK" - -#. type: defvr -#: doc/guix.texi:3877 -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 "Cette variable est exportée par @code{(guix build-system android-ndk)}. Elle implémente une procédure de construction pour les paquets du NDK Android (@i{native development kit}) avec des processus de construction spécifiques à Guix." - -#. type: defvr -#: doc/guix.texi:3881 -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 "Le système de construction suppose que les paquets installent leur interface publique (les en-têtes) dans un sous-répertoire de « include » de la sortie « out » et leurs bibliothèques dans le sous-répertoire « lib » de la sortie « out »." - -#. type: defvr -#: doc/guix.texi:3884 -msgid "It's also assumed that the union of all the dependencies of a package has no conflicting files." -msgstr "Il est aussi supposé que l'union de toutes les dépendances d'un paquet n'a pas de fichiers en conflit." - -#. type: defvr -#: doc/guix.texi:3887 -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 "Pour l'instant, la compilation croisée n'est pas supportées — donc pour l'instant les bibliothèques et les fichiers d'en-têtes sont supposés être des outils de l'hôte." - -#. type: defvr -#: doc/guix.texi:3890 -#, no-wrap -msgid "{Scheme Variable} asdf-build-system/source" -msgstr "{Variable Scheme} asdf-build-system/source" - -#. type: defvrx -#: doc/guix.texi:3891 -#, no-wrap -msgid "{Scheme Variable} asdf-build-system/sbcl" -msgstr "{Variable Scheme} asdf-build-system/sbcl" - -#. type: defvrx -#: doc/guix.texi:3892 -#, no-wrap -msgid "{Scheme Variable} asdf-build-system/ecl" -msgstr "{Variable Scheme} asdf-build-system/ecl" - -#. type: defvr -#: doc/guix.texi:3898 -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 "Ces variables, exportées par @code{(guix build-system asdf)}, implémentent les procédures de constructions pour les paquets en Common Lisp qui utilisent @url{https://common-lisp.net/project/asdf/, ``ASDF''}. ASDF est un dispositif de définition de systèmes pour les programmes et les bibliothèques en Common Lisp." - -#. type: defvr -#: doc/guix.texi:3905 -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 "Le système @code{asdf-build-system/source} installe les paquets au format source qui peuvent être chargés avec n'importe quelle implémentation de common lisp, via ASDF. Les autres, comme @code{asdf-build-system/sbcl}, installent des binaires au format qu'un implémentation particulière comprend. Ces systèmes de constructions peuvent aussi être utilisés pour produire des programmes exécutables ou des images lisp qui contiennent un ensemble de paquets pré-chargés." - -#. type: defvr -#: doc/guix.texi:3909 -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 "Le système de construction utilise des conventions de nommage. Pour les paquets binaires, le nom du paquet devrait être préfixé par l'implémentation lisp, comme @code{sbcl-} pour @code{asdf-build-system/sbcl}." - -#. type: defvr -#: doc/guix.texi:3913 -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 "En plus, le paquet source correspondant devrait étiquetté avec la même convention que les paquets python (voir @ref{Python Modules}), avec le préfixe @code{cl-}." - -#. type: defvr -#: doc/guix.texi:3918 -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 "Pour les paquets binaires, chaque système devrait être défini comme un paquet Guix. Si un paquet @code{origine} contient plusieurs systèmes, on peut créer des variantes du paquet pour construire tous les systèmes. Les paquets sources, qui utilisent @code{asdf-build-system/source}, peuvent contenir plusieurs systèmes." - -#. type: defvr -#: doc/guix.texi:3925 -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 "Pour créer des programmes exécutables et des images, les procédures côté construction @code{build-program} et @code{build-image} peuvent être utilisées. Elles devraient être appelées dans une phase de construction après la phase @code{create-symlinks} pour que le système qui vient d'être construit puisse être utilisé dans l'image créée. @code{build-program} requiert une liste d'expressions Common Lisp dans l'argument @code{#:entry-program}." - -#. type: defvr -#: doc/guix.texi:3934 -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 "Si le système n'est pas défini dans son propre fichier @code{.asd} du même nom, alors le paramètre @code{#:asd-file} devrait être utilisé pour spécifier dans quel fichier le système est défini. De plus, si le paquet défini un système pour ses tests dans un fichier séparé, il sera chargé avant que les tests ne soient lancés s'il est spécifié par le paramètre @code{#:test-asd-file}. S'il n'est pas spécifié, les fichiers @code{-tests.asd}, @code{-test.asd}, @code{tests.asd} et @code{test.asd} seront testés." - -#. type: defvr -#: doc/guix.texi:3938 -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 "Si pour quelque raison que ce soit le paquet doit être nommé d'une manière différente de ce que la convention de nommage suggère, le paramètre @code{#:asd-system-name} peut être utilisé pour spécifier le nom du système." - -#. type: defvr -#: doc/guix.texi:3941 -#, no-wrap -msgid "{Scheme Variable} cargo-build-system" -msgstr "{Variable Scheme} cargo-build-system" - -#. type: cindex -#: doc/guix.texi:3942 -#, no-wrap -msgid "Rust programming language" -msgstr "Langage de programmation Rust" - -#. type: cindex -#: doc/guix.texi:3943 -#, no-wrap -msgid "Cargo (Rust build system)" -msgstr "Cargo (système de construction Rust)" - -#. type: defvr -#: doc/guix.texi:3947 -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 "Cette variable est exportée par @code{(guix build-system cargo)}. Elle supporte les construction de paquets avec Cargo, le système de construction du @uref{https://www.rust-lang.org, langage de programmation Rust}." - -#. type: defvr -#: doc/guix.texi:3952 -msgid "In its @code{configure} phase, this build system replaces dependencies specified in the @file{Carto.toml} file with inputs to the Guix package. The @code{install} phase installs the binaries, and it also installs the source code and @file{Cargo.toml} file." -msgstr "Dans sa phase @code{configure}, ce système de construction remplace les dépendances spécifiées dans le fichier @file{Cargo.toml} par des paquets Guix. La phase @code{install} installe les binaires et installe aussi le code source et le fichier @file{Cargo.toml}." - -#. type: defvr -#: doc/guix.texi:3954 -#, no-wrap -msgid "{Scheme Variable} cmake-build-system" -msgstr "{Variable Scheme} cmake-build-system" - -#. type: defvr -#: doc/guix.texi:3958 -msgid "This variable is exported by @code{(guix build-system cmake)}. It implements the build procedure for packages using the @url{http://www.cmake.org, CMake build tool}." -msgstr "Cette variable est exportée par @code{(guix build-system cmake)}. Elle implémente la procédure de construction des paquets qui utilisent l'@url{http://www.cmake.org, outils de construction CMake}." - -#. type: defvr -#: doc/guix.texi:3962 -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 "Elle ajoute automatiquement le paquet @code{cmake} à l'ensemble des entrées. Le paquet utilisé peut être spécifié par le paramètre @code{#:cmake}." - -#. type: defvr -#: doc/guix.texi:3969 -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 "Le paramètre @code{#:configure-flags} est pris comme une liste de drapeaux à passer à la commande @command{cmake}. Le paramètre @code{#:build-type} spécifie en termes abstrait les drapeaux passés au compilateur ; sa valeur par défaut est @code{\"RelWithDebInfo\"} (ce qui veut dire « mode public avec les informations de débogage » en plus court), ce qui signifie en gros que le code sera compilé avec @code{-O2 -g} comme pour les paquets autoconf par défaut." - -#. type: defvr -#: doc/guix.texi:3971 -#, no-wrap -msgid "{Scheme Variable} go-build-system" -msgstr "{Variable Scheme} go-build-system" - -#. type: defvr -#: doc/guix.texi:3976 -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 "Cette variable est exportée par @code{(guix build-system go)}. Elle implémente la procédure pour les paquets Go utilisant les @url{https://golang.org/cmd/go/#hdr-Compile_packages_and_dependencies, mécanismes de construction Go} standard." - -#. type: defvr -#: doc/guix.texi:3987 -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 "L'utilisateur doit fournir une valeur à la clef @code{#:import-path} et, dans certains cas, @code{#:unpack-path}. Le @url{https://golang.org/doc/code.html#ImportPaths, chemin d'import} correspond au chemin dans le système de fichiers attendu par le script de construction du paquet et les paquets qui s'y réfèrent et fournit une manière unique de se référer à un paquet Go. Il est typiquement basé sur une combinaison de l'URI du code source du paquet et d'une structure hiérarchique du système de fichier. Dans certains cas, vous devrez extraire le code source du paquet dans une structure de répertoires différente que celle indiquée par le chemin d'import et @code{#:unpack-path} devrait être utilisé dans ces cas-là." - -#. type: defvr -#: doc/guix.texi:3992 -msgid "Packages that provide Go libraries should be installed along with their source code. 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 "Les paquets qui fournissent des bibliothèques Go devraient être installées avec leur code source. La clef @code{#:install-soruce?}, qui vaut @code{#t} par défaut, contrôle l'installation du code source. Elle peut être mise à @code{#f} pour les paquets qui ne fournissent que des fichiers exécutables." - -#. type: defvr -#: doc/guix.texi:3994 -#, no-wrap -msgid "{Scheme Variable} glib-or-gtk-build-system" -msgstr "{Variable Scheme} glib-or-gtk-build-system" - -#. type: defvr -#: doc/guix.texi:3997 -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 "Cette variable est exportée par @code{(guix build-system glib-or-gtk)}. Elle est conçue pour être utilisée par des paquets qui utilisent GLib ou GTK+." - -#. type: defvr -#: doc/guix.texi:4000 -msgid "This build system adds the following two phases to the ones defined by @var{gnu-build-system}:" -msgstr "Ce système de construction ajoute les deux phases suivantes à celles définies par @var{gnu-build-system} :" - -#. type: item -#: doc/guix.texi:4002 doc/guix.texi:4297 -#, no-wrap -msgid "glib-or-gtk-wrap" -msgstr "glib-or-gtk-wrap" - -#. type: table -#: doc/guix.texi:4009 -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 "La phase @code{glib-or-gtk-wrap} s'assure que les programmes dans @file{bin/} sont capable de trouver les « schemas » GLib et les @uref{https://developer.gnome.org/gtk3/stable/gtk-running.html, modules GTK+}. Ceci est fait en enveloppant les programmes dans des scripts de lancement qui initialisent correctement les variables d'environnement @code{XDG_DATA_DIRS} et @code{GTK_PATH}." - -#. type: table -#: doc/guix.texi:4016 -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 "Il est possible d'exclure des sorties spécifiques de ce processus d'enveloppage en listant leur nom dans le paramètre @code{#:glib-or-gtk-wrap-excluded-outputs}. C'est utile lorsqu'une sortie est connue pour ne pas contenir de binaires GLib ou GTK+, et où l'enveloppe ajouterait une dépendance inutile vers GLib et GTK+." - -#. type: item -#: doc/guix.texi:4017 doc/guix.texi:4301 -#, no-wrap -msgid "glib-or-gtk-compile-schemas" -msgstr "glib-or-gtk-compile-schemas" - -#. type: table -#: doc/guix.texi:4025 -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 "La phase @code{glib-or-gtk-compile-schemas} s'assure que tous les @uref{https://developer.gnome.org/gio/stable/glib-compile-schemas.html, schémas GSettings} de GLib sont compilés. La compilation est effectuée par le programme @command{glib-compile-schemas}. Il est fournit par le paquet @code{glib:bin} qui est automatiquement importé par le système de construction. Le paquet @code{glib} qui fournit @command{glib-compile-schemas} peut être spécifié avec le paramètre @code{#:glib}." - -#. type: defvr -#: doc/guix.texi:4028 -msgid "Both phases are executed after the @code{install} phase." -msgstr "Ces deux phases sont exécutées après la phase @code{install}." - -#. type: defvr -#: doc/guix.texi:4030 -#, no-wrap -msgid "{Scheme Variable} minify-build-system" -msgstr "{Variable Scheme} minify-build-system" - -#. type: defvr -#: doc/guix.texi:4033 -msgid "This variable is exported by @code{(guix build-system minify)}. It implements a minification procedure for simple JavaScript packages." -msgstr "Cette variable est exportée par @code{(guix build-system minify)}. Elle implémente une procédure de minification pour des paquets JavaScript simples." - -#. type: defvr -#: doc/guix.texi:4039 -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 "Elle ajoute @code{uglify-js} à l'ensemble des entrées et l'utilise pour compresser tous les fichiers JavaScript du répertoire @file{src}. Un minifieur différent peut être spécifié avec le paramètre @code{#:uglify-js} mais il est attendu que ce paquet écrive le code minifié sur la sortie standard." - -#. type: defvr -#: doc/guix.texi:4043 -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 "Lorsque les fichiers JavaScript d'entrée ne sont pas situés dans le répertoire @file{src}, le paramètre @code{#:javascript-files} peut être utilisé pour spécifier une liste de noms de fichiers à donner au minifieur." - -#. type: defvr -#: doc/guix.texi:4045 -#, no-wrap -msgid "{Scheme Variable} ocaml-build-system" -msgstr "{Variable Scheme} ocaml-build-system" - -#. type: defvr -#: doc/guix.texi:4051 -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 "Cette variable est exportée par @code{(guix build-system ocaml)}. Elle implémente une procédure de construction pour les paquets @uref{https://ocaml.org, OCaml} qui consiste à choisir le bon ensemble de commande à lancer pour chaque paquet. Les paquets OCaml peuvent demander des commandes diverses pour être construit. Ce système de construction en essaye certaines." - -#. type: defvr -#: doc/guix.texi:4061 -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 "Lorsqu'un fichier @file{setup.ml} est présent dans le répertoire de plus haut niveau, elle lancera @code{ocaml setup.ml -configure}, @code{ocaml setup.ml -build} et @code{ocaml setup.ml -install}. Le système de construction supposera que ces fichiers ont été générés par @uref{http://oasis.forge.ocamlcore.org/, OASIS} et prendra soin d'initialiser le préfixe et d'activer les tests s'ils ne sont pas désactivés. Vous pouvez passer des drapeaux de configuration et de consturction avec @code{#:configure-flags} et @code{#:build-flags}. La clef @code{#:test-flags} peut être passée pour changer l'ensemble des drapeaux utilisés pour activer les tests. La clef @code{#:use-make?} peut être utilisée pour outrepasser ce système dans les phases de construction et d'installation." - -#. type: defvr -#: doc/guix.texi:4066 -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 "Lorsque le paquet a un fichier @file{configure}, il est supposé qu'il s'agit d'un script configure écrit à la main qui demande un format différent de celui de @code{gnu-build-system}. Vous pouvez ajouter plus de drapeaux avec la clef @code{#:configure-flags}." - -#. type: defvr -#: doc/guix.texi:4070 -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 "Lorsque le paquet a un fichier @file{Makefile} (ou @code{#:use-make?} vaut @code{#t}), il sera utilisé et plus de drapeaux peuvent être passés à la construction et l'installation avec la clef @code{#:make-flags}." - -#. type: defvr -#: doc/guix.texi:4078 -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 "Enfin, certains paquets n'ont pas ces fichiers mais utilisent un emplacement plus ou moins standard pour leur système de construction. Dans ce cas, le système de construction lancera @code{ocaml pkg/pkg.ml} ou @code{pkg/build.ml} et prendra soin de fournir le chemin du module findlib requis. Des drapeaux supplémentaires peuvent être passés via la clef @code{#:bulid-flags}. L'installation se fait avec @command{opam-installer}. Dans ce cas, le paquet @code{opam} doit être ajouté au champ @code{native-inputs} de la définition du paquet." - -#. type: defvr -#: doc/guix.texi:4086 -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 "Remarquez que la plupart des paquets OCaml supposent qu'ils seront installés dans le même répertoire qu'OCaml, ce qui n'est pas ce que nous voulons faire dans Guix. En particulier, ils installeront leurs fichiers @file{.so} dans leur propre répertoire de module, ce qui est normalement correct puisqu'il s'agit du répertoire du compilateur OCaml. Dans Guix en revanche, le bibliothèques ne peuvent pas y être trouvées et on utilise @code{CAML_LD_LIBRARY_PATH} à la place. Cette variable pointe vers @file{lib/ocaml/site-lib/stubslibs} et c'est là où les bibliothèques @file{.so} devraient être installées." - -#. type: defvr -#: doc/guix.texi:4088 -#, no-wrap -msgid "{Scheme Variable} python-build-system" -msgstr "{Variable Scheme} python-build-system" - -#. type: defvr -#: doc/guix.texi:4093 -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 "Cette variable est exportée par @code{(guix build-system python)}. Elle implémente la procédure de construction plus ou moins standarde utilisée pour les paquets Python, qui consiste à lancer @code{python setup.py build} puis @code{python setup.py install --prefix=/gnu/store/@dots{}}." - -#. type: defvr -#: doc/guix.texi:4097 -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 "Pour les paquets qui installent des programmes autonomes dans @code{bin/}, elle prend soin d'envelopper ces binaires pour que leur variable d'environnement @code{PYTHONPATH} pointe vers toutes les bibliothèques Python dont ils dépendent." - -#. type: defvr -#: doc/guix.texi:4103 -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 "Le paquet Python utilisé pour effectuer la construction peut être spécifié avec le paramètre @code{#:python}. C'est une manière utile de forcer un paquet à être construit avec une version particulière de l'interpréteur python, ce qui peut être nécessaire si le paquet n'est compatible qu'avec une version de l'interpréteur." - -#. type: defvr -#: doc/guix.texi:4108 -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 "Par défaut Guix appelle @code{setup.py} sous le contrôle de @code{setuptools}, comme le fait @command{pip}. Certains paquets ne sont pas compatibles avec setuptools (et pip), ainsi vous pouvez désactiver cela en mettant le paramètre @code{#:use-setuptools} à @code{#f}." - -#. type: defvr -#: doc/guix.texi:4110 -#, no-wrap -msgid "{Scheme Variable} perl-build-system" -msgstr "{Variable Scheme} perl-build-system" - -#. type: defvr -#: doc/guix.texi:4122 -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 "Cette variable est exportée par @code{(guix build-system perl)}. Elle implémente la procédure de construction standarde des paquets Perl, qui consiste soit à lancer @code{perl Build.PL --prefix=/gnu/store/@dots{}}, suivi de @code{Build} et @code{Build install} ; ou à lancer @code{perl Makefile.PL PREFIX=/gnu/store/@dots{}}, suivi de @code{make} et @code{make install}, en fonction de la présence de @code{Build.PL} ou @code{Makefile.PL} dans la distribution du paquet. Le premier a la préférence si @code{Build.PL} et @code{Makefile.PL} existent tous deux dans la distribution du paquet. Cette préférence peut être inversée en spécifiant @code{#t} pour le paramètre @code{#:make-maker?}." - -#. type: defvr -#: doc/guix.texi:4126 -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 "L'invocation initiale de @code{perl Makefile.PL} ou @code{perl Build.PL} passe les drapeaux spécifiés par le paramètre @code{#:make-maker-flags} ou @code{#:module-build-flags}, respectivement." - -#. type: defvr -#: doc/guix.texi:4128 -msgid "Which Perl package is used can be specified with @code{#:perl}." -msgstr "Le paquet Perl utilisé peut être spécifié avec @code{#:perl}." - -#. type: defvr -#: doc/guix.texi:4130 -#, no-wrap -msgid "{Scheme Variable} r-build-system" -msgstr "{Variable Scheme} r-build-system" - -#. type: defvr -#: doc/guix.texi:4138 -msgid "This variable is exported by @code{(guix build-system r)}. It implements the build procedure used by @uref{http://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 "Cette variable est exportée par @code{(guix build-system r)}. Elle implémente la procédure de construction utilisée par les paquets @uref{http://r-project.org, R} qui consiste à lancer à peine plus que @code{R CMD INSTALL --library=/gnu/store/@dots{}} dans un environnement où @code{R_LIBS_SITE} contient les chemins de toutes les entrées R. Les tests sont lancés après l'installation avec la fonction R @code{tools::testInstalledPackage}." - -#. type: defvr -#: doc/guix.texi:4140 -#, no-wrap -msgid "{Scheme Variable} texlive-build-system" -msgstr "{Variable Scheme} texlive-build-system" - -#. type: defvr -#: doc/guix.texi:4145 -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 "Cette variable est exportée par @code{(guix build-system texlive)}. Elle est utilisée pour construire des paquets TeX en mode batch avec le moteur spécifié. Le système de construction initialise la variable @code{TEXINPUTS} pour trouver tous les fichiers source TeX dans ses entrées." - -#. type: defvr -#: doc/guix.texi:4154 -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 "Par défaut, elle lance @code{luatex} sur tous les fichiers qui se terminent par @code{ins}. Un moteur et un format différent peuvent être spécifiés avec l'argument @code{#:tex-format}. Plusieurs cibles de constructions peuvent être indiquées avec l'argument @code{#:build-targets} qui attend une liste de noms de fichiers. Le système de construction ajoute uniquement @code{texlive-bin} et @code{texlive-latex-base} (de @code{(gnu packages tex)} à la liste des entrées. Les deux peuvent être remplacés avec les arguments @code{#:texlive-bin} et @code{#:texlive-latex-base}, respectivement." - -#. type: defvr -#: doc/guix.texi:4157 -msgid "The @code{#:tex-directory} parameter tells the build system where to install the built files under the texmf tree." -msgstr "Le paramètre @code{#:tex-directory} dit au système de construction où installer les fichiers construit dans l'arbre texmf." - -#. type: defvr -#: doc/guix.texi:4159 -#, no-wrap -msgid "{Scheme Variable} ruby-build-system" -msgstr "{Variable Scheme} ruby-build-system" - -#. type: defvr -#: doc/guix.texi:4163 -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 "Cette variable est exportée par @code{(guix build-system ruby)}. Elle implémenter la procédure de construction RubyGems utilisée par les paquets Ruby qui consiste à lancer @code{gem build} suivi de @code{gem install}." - -#. type: defvr -#: doc/guix.texi:4171 -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 "Le champ @code{source} d'un paquet qui utilise ce système de construction référence le plus souvent une archive gem, puisque c'est le format utilisé par les développeurs Ruby quand ils publient leur logiciel. Le système de construction décompresse l'archive gem, éventuellement en corrigeant les sources, lance la suite de tests, recompresse la gemme et l'installe. En plus, des répertoires et des archives peuvent être référencés pour permettre de construire des gemmes qui n'ont pas été publiées depuis Git ou une archive de sources traditionnelle." - -#. type: defvr -#: doc/guix.texi:4175 -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 "Le paquet Ruby utilisé peut être spécifié avec le paramètre @code{#:ruby}. Une liste de drapeaux supplémentaires à passer à la commande @command{gem} peut être spécifiée avec le paramètre @code{#:gem-flags}." - -#. type: defvr -#: doc/guix.texi:4177 -#, no-wrap -msgid "{Scheme Variable} waf-build-system" -msgstr "{Variable Scheme} waf-build-system" - -#. type: defvr -#: doc/guix.texi:4183 -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 "Cette variable est exportée par @code{(guix build-system waf)}. Elle implémente une procédure de construction autour du script @code{waf}. Les phases usuelles — @code{configure}, @code{build} et @code{install} — sont implémentée en passant leur nom en argument au script @code{waf}." - -#. type: defvr -#: doc/guix.texi:4187 -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 "Le script @code{waf} est exécuté par l'interpréteur Python. Le paquet Python utilisé pour lancer le script peut être spécifié avec le paramètre @code{#:python}." - -#. type: defvr -#: doc/guix.texi:4189 -#, no-wrap -msgid "{Scheme Variable} scons-build-system" -msgstr "{Variable Scheme} scons-build-system" - -#. type: defvr -#: doc/guix.texi:4195 -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 "Cette variable est exportée par @code{(guix build-system scons)}. Elle implémente la procédure de construction utilisée par l'outil de construction SCons. Ce système de construction lance @code{scons} pour construire le paquet, @code{scons test} pour lancer les tests puis @code{scons install} pour installer le paquet." - -#. type: defvr -#: doc/guix.texi:4200 -msgid "Additional flags to be passed to @code{scons} can be specified with the @code{#:scons-flags} parameter. The version of Python used to run SCons can be specified by selecting the appropriate SCons package with the @code{#:scons} parameter." -msgstr "On peut passer des drapeaux supplémentaires à @code{scons} en les spécifiant avec le paramètre @code{#:scons-flags}. La version de python utilisée pour lancer SCons peut être spécifiée en sélectionnant le paquet SCons approprié avec le paramètre @code{#:scons}." - -#. type: defvr -#: doc/guix.texi:4202 -#, no-wrap -msgid "{Scheme Variable} haskell-build-system" -msgstr "{Variable Scheme} haskell-build-system" - -#. type: defvr -#: doc/guix.texi:4216 -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 "Cette variable est exportée par @code{(guix build-system haskell)}. Elle implémente la procédure de construction Cabal utilisée par les paquets Haskell, qui consiste à lancer @code{runhaskell Setup.hs configure --prefix=/gnu/store/@dots{}} et @code{runhaskell Setup.hs build}. Plutôt que d'installer le paquets en lançant @code{runhaskell Setup.hs install}, pour éviter d'essayer d'enregistrer les bibliothèques dans le répertoire du dépôt en lecture-seule du compilateur, le système de construction utilise @code{runhaskell Setup.hs copy}, suivi de @code{runhaskell Setup.hs register}. En plus, le système de construction génère la documentation du paquet en lançant @code{runhaskell Setup.hs haddock}, à moins que @code{#:haddock? #f} ne soit passé. Des paramètres facultatifs pour Haddock peuvent être passés à l'aide du paramètre @code{#:haddock-flags}. Si le fichier @code{Setup.hs} n'est pas trouvé, le système de construction cherchera @code{Setup.lhs} à la place." - -#. type: defvr -#: doc/guix.texi:4219 -msgid "Which Haskell compiler is used can be specified with the @code{#:haskell} parameter which defaults to @code{ghc}." -msgstr "Le compilateur Haskell utilisé peut être spécifié avec le paramètre @code{#:haskell} qui a pour valeur par défaut @code{ghc}." - -#. type: defvr -#: doc/guix.texi:4221 -#, no-wrap -msgid "{Scheme Variable} dub-build-system" -msgstr "{Variable Scheme} dub-build-system" - -#. type: defvr -#: doc/guix.texi:4226 -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 "Cette variable est exportée par @code{(guix build-system dub)}. Elle implémente la procédure de construction Dub utilisée par les paquets D qui consiste à lancer @code{dub build} et @code{dub run}. L'installation est effectuée en copiant les fichiers manuellement." - -#. type: defvr -#: doc/guix.texi:4229 -msgid "Which D compiler is used can be specified with the @code{#:ldc} parameter which defaults to @code{ldc}." -msgstr "Le compilateur D utilisé peut être spécifié avec le paramètre @code{#:ldc} qui vaut par défaut @code{ldc}." - -#. type: defvr -#: doc/guix.texi:4231 -#, no-wrap -msgid "{Scheme Variable} emacs-build-system" -msgstr "{Variable Scheme} emacs-build-system" - -#. type: defvr -#: doc/guix.texi:4235 -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 "Cette variable est exportée par @code{(guix build-system emacs)}. Elle implémente une procédure d'installation similaire au système de gestion de paquet d'Emacs lui-même (@pxref{Packages,,, emacs, The GNU Emacs Manual})." - -#. type: defvr -#: doc/guix.texi:4242 -msgid "It first creates the @code{@var{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}." -msgstr "Elle crée d'abord le fichier @code{@var{package}-autoloads.el}, puis compile tous les fichiers Emacs Lisp en bytecode. Contrairement au système de gestion de paquets d'Emacs, les fichiers de documentation info sont déplacés dans le répertoire standard et le fichier @file{dir} est supprimé. Chaque paquet est installé dans son propre répertoire dans @file{share/emacs/site-lisp/guix.d}." - -#. type: defvr -#: doc/guix.texi:4244 -#, no-wrap -msgid "{Scheme Variable} font-build-system" -msgstr "{Variable Scheme} font-build-system" - -#. type: defvr -#: doc/guix.texi:4250 -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 "Cette variable est exportée par @code{(guix build-system font)}. Elle implémente une procédure d'installation pour les paquets de polices où des fichiers de polices TrueType, OpenType, etc sont fournis en amont et n'ont qu'à être copiés à leur emplacement final. Elle copie les fichiers de polices à l'emplacement standard dans le répertoire de sortie." - -#. type: defvr -#: doc/guix.texi:4252 -#, no-wrap -msgid "{Scheme Variable} meson-build-system" -msgstr "{Variable Scheme} meson-build-system" - -#. type: defvr -#: doc/guix.texi:4256 -msgid "This variable is exported by @code{(guix build-system meson)}. It implements the build procedure for packages that use @url{http://mesonbuild.com, Meson} as their build system." -msgstr "Cette variable est exportée par @code{(guix build-system meson)}. Elle implémente la procédure de construction des paquets qui utilisent @url{http://mesonbuild.com, Meson} comme système de construction." - -#. type: defvr -#: doc/guix.texi:4262 -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 "Elle ajoute à la fois Meson et @uref{https://ninja-build.org/, Ninja} à l'ensemble des entrées, et ils peuvent être modifiés avec les paramètres @code{#:meson} et @code{#:ninja} si requis. Le Meson par défaut est @code{meson-for-build}, qui est spécial parce qu'il ne nettoie pas le @code{RUNPATH} des binaires et les bibliothèques qu'il installe." - -#. type: defvr -#: doc/guix.texi:4265 -msgid "This build system is an extension of @var{gnu-build-system}, but with the following phases changed to some specific for Meson:" -msgstr "Ce système de construction est une extension de @var{gnu-build-system}, mais avec les phases suivantes modifiées pour Meson :" - -#. type: table -#: doc/guix.texi:4272 -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 "La phase lance @code{meson} avec les drapeaux spécifiés dans @code{#:configure-flags}. Le drapeau @code{--build-type} est toujours initialisé à @code{plain} à moins que quelque chose d'autre ne soit spécifié dans @code{#:build-type}." - -#. type: table -#: doc/guix.texi:4276 -msgid "The phase runs @code{ninja} to build the package in parallel by default, but this can be changed with @code{#:parallel-build?}." -msgstr "La phase lance @code{ninja} pour construire le paquet en parallèle par défaut, mais cela peut être changé avec @code{#:parallel-build?}." - -#. type: table -#: doc/guix.texi:4280 -msgid "The phase runs @code{ninja} with the target specified in @code{#:test-target}, which is @code{\"test\"} by default." -msgstr "La phase lance @code{ninja} avec la cible spécifiée dans @code{#:test-target}, qui est @code{\"test\"} par défaut." - -#. type: table -#: doc/guix.texi:4283 -msgid "The phase runs @code{ninja install} and can not be changed." -msgstr "La phase lance @code{ninja install} et ne peut pas être changée." - -#. type: defvr -#: doc/guix.texi:4286 -msgid "Apart from that, the build system also adds the following phases:" -msgstr "En dehors de cela, le système de construction ajoute aussi la phase suivante :" - -#. type: item -#: doc/guix.texi:4289 -#, no-wrap -msgid "fix-runpath" -msgstr "fix-runpath" - -#. type: table -#: doc/guix.texi:4296 -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 "Cette phase s'assure que tous les binaire peuvent trouver les bibliothèques dont ils ont besoin. Elle cherche les bibliothèques requises dans les sous-répertoires du paquet en construction et les ajoute au @code{RUNPATH} là où c'est nécessaire. Elle supprime aussi les références aux bibliothèques laissées là par la phase de construction par @code{meson-for-build} comme les dépendances des tests, qui ne sont pas vraiment requises pour le programme." - -#. type: table -#: doc/guix.texi:4300 doc/guix.texi:4304 -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 "Cette phase est la phase fournie par @code{glib-or-gtk-build-system} et n'est pas activée par défaut. Elle peut l'être avec @code{#:glib-or-gtk?}." - -#. type: Plain text -#: doc/guix.texi:4311 -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 "Enfin, pour les paquets qui n'ont pas besoin de choses sophistiquées, un système de construction « trivial » est disponible. Il est trivial dans le sens où il ne fournit en gros aucun support : il n'apporte pas de dépendance implicite, et n'a pas de notion de phase de construction." - -#. type: defvr -#: doc/guix.texi:4312 -#, no-wrap -msgid "{Scheme Variable} trivial-build-system" -msgstr "{Variable Scheme} trivial-build-system" - -#. type: defvr -#: doc/guix.texi:4314 -msgid "This variable is exported by @code{(guix build-system trivial)}." -msgstr "Cette variable est exportée par @code{(guix build-system trivial)}." - -#. type: defvr -#: doc/guix.texi:4319 -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 "Ce système de construction requiert un argument @code{#:builder}. Cet argument doit être une expression Scheme qui construit la sortie du paquet — comme avec @code{build-expression->derivation} (@pxref{Derivations, @code{build-expression->derivation}})." - -#. type: cindex -#: doc/guix.texi:4325 -#, no-wrap -msgid "store items" -msgstr "éléments du dépôt" - -#. type: cindex -#: doc/guix.texi:4326 -#, no-wrap -msgid "store paths" -msgstr "chemins dans le dépôt" - -#. type: Plain text -#: doc/guix.texi:4337 -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 "Conceptuellement, le @dfn{dépôt} est l'endroit où les dérivations qui ont bien été construites sont stockées — par défaut, @file{/gnu/store}. Les sous-répertoires dans le dépôt s'appellent des @dfn{éléments du dépôt} ou parfois des @dfn{chemins du dépôt}. Le dépôt a une base de données associée qui contient des informations comme les chemins du dépôt auxquels se réfèrent chaque chemin du dépôt et la liste des éléments du dépôt @emph{valides} — les résultats d'une construction réussie. Cette base de données se trouve dans @file{@var{localstatedir}/guix/db} où @var{localstatedir} est le répertoire d'états spécifié @i{via} @option {--localstatedir} à la configuration, typiquement @file{/var}." - -#. type: Plain text -#: doc/guix.texi:4342 -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 "C'est @emph{toujours} le démon qui accède au dépôt pour le compte de ses clients (@pxref{Invoking guix-daemon}). Pour manipuler le dépôt, les clients se connectent au démon par un socket Unix-domain, envoient une requête dessus et lisent le résultat — ce sont des appels de procédures distantes, ou RPC." - -#. type: quotation -#: doc/guix.texi:4347 -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 "Les utilisateurs ne doivent @emph{jamais} modifier les fichiers dans @file{/gnu/store} directement. Cela entraînerait des incohérences et casserait l'hypothèse d'immutabilité du modèle fonctionnel de Guix (@pxref{Introduction})." - -#. type: quotation -#: doc/guix.texi:4351 -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 "@xref{Invoking guix gc, @command{guix gc --verify}}, pour des informations sur la manière de vérifier l'intégrité du dépôt et d'essayer de réparer des modifications accidentelles." - -#. type: Plain text -#: doc/guix.texi:4358 -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 "Le module @code{(guix store)} fournit des procédures pour se connecter au démon et pour effectuer des RPC. Elles sont décrites plus bas. Par défaut, @code{open-connection}, et donc toutes les commandes @command{guix} se connectent au démon local ou à l'URI spécifiée par la variable d'environnement @code{GUIX_DAEMON_SOCKET}." - -#. type: defvr -#: doc/guix.texi:4359 -#, no-wrap -msgid "{Environment Variable} GUIX_DAEMON_SOCKET" -msgstr "{Variable d'environnement} GUIX_DAEMON_SOCKET" - -#. type: defvr -#: doc/guix.texi:4364 -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 "Lorsqu'elle est initialisée, la valeur de cette variable devrait être un nom de fichier ou une URI qui désigne l'extrémité du démon. Lorsque c'est un nom de fichier, il dénote un socket Unix-domain où se connecter. En plus des noms de fichiers, les schémas d'URI supportés sont :" - -#. type: code{#1} -#: doc/guix.texi:4366 doc/guix.texi:15771 -#, no-wrap -msgid "file" -msgstr "file" - -#. type: itemx -#: doc/guix.texi:4367 -#, no-wrap -msgid "unix" -msgstr "unix" - -#. type: table -#: doc/guix.texi:4371 -msgid "These are for Unix-domain sockets. @code{file:///var/guix/daemon-socket/socket} is equivalent to @file{/var/guix/daemon-socket/socket}." -msgstr "Pour les sockets Unix-domain. @code{file:///var/guix/daemon-socket/socket} est équivalent à @file{/var/guix/daemon-socket/socket}." - -#. type: item -#: doc/guix.texi:4372 -#, no-wrap -msgid "guix" -msgstr "guix" - -#. type: table -#: doc/guix.texi:4380 -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 "Ces URI dénotent des connexions par TCP/IP, sans chiffrement ni authentification de l'hôte distant. L'URI doit spécifier le nom d'hôte et éventuellement un numéro de port (par défaut 44146) :" - -#. type: example -#: doc/guix.texi:4383 -#, no-wrap -msgid "guix://master.guix.example.org:1234\n" -msgstr "guix://master.guix.example.org:1234\n" - -#. type: table -#: doc/guix.texi:4388 -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 "Ce paramétrage est adapté aux réseaux locaux, comme dans le cas de grappes de serveurs, où seuls des noms de confiance peuvent se connecter au démon de construction sur @code{master.guix.example.org}." - -#. type: table -#: doc/guix.texi:4392 -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 "L'option @code{--listen} de @command{guix-daemon} peut être utilisé pour lui dire d'écouter des connexions TCP (@pxref{Invoking guix-daemon, @code{--listen}})." - -#. type: item -#: doc/guix.texi:4393 -#, no-wrap -msgid "ssh" -msgstr "ssh" - -#. type: cindex -#: doc/guix.texi:4394 -#, no-wrap -msgid "SSH access to build daemons" -msgstr "accès SSH au démon de construction" - -#. type: table -#: doc/guix.texi:4398 -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:" -msgstr "Ces URI vous permettent de vous connecter au démon à distance à travers SSH@footnote{Cette fonctionnalité requiert Guile-SSH (@pxref{Requirements}).}." - -#. type: example -#: doc/guix.texi:4401 -#, no-wrap -msgid "ssh://charlie@@guix.example.org:22\n" -msgstr "ssh://charlie@@guix.example.org:22\n" - -#. type: table -#: doc/guix.texi:4405 -msgid "As for @command{guix copy}, the usual OpenSSH client configuration files are honored (@pxref{Invoking guix copy})." -msgstr "Comme pour @command{guix copy}, les fichiers de configuration du client OpenSSH sont respectés (@pxref{Invoking guix copy})." - -#. type: defvr -#: doc/guix.texi:4408 -msgid "Additional URI schemes may be supported in the future." -msgstr "Des schémas d'URI supplémentaires pourraient être supportés dans le futur." - -#. type: quotation -#: doc/guix.texi:4415 -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 "La capacité de se connecter à un démon de construction distant est considéré comme expérimental à la version @value{VERSION}. Contactez-nous pour partager vos problèmes ou des suggestions que vous pourriez avoir (@pxref{Contributing})." - -#. type: deffn -#: doc/guix.texi:4418 -#, no-wrap -msgid "{Scheme Procedure} open-connection [@var{uri}] [#:reserve-space? #t]" -msgstr "{Procédure Scheme} open-connection [@var{uri}] [#:reserve-space? #t]" - -#. type: deffn -#: doc/guix.texi:4423 -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 "Se connecte au démon à travers le socket Unix-domain à @var{uri} (une chaîne de caractères). Lorsque @var{reserve-space?} est vrai, cela demande de réserver un peu de place supplémentaire sur le système de fichiers pour que le ramasse-miette puisse opérer au cas où le disque serait plein. Renvoie un objet serveur." - -#. type: deffn -#: doc/guix.texi:4426 -msgid "@var{file} defaults to @var{%default-socket-path}, which is the normal location given the options that were passed to @command{configure}." -msgstr "@var{file} a pour valeur par défaut @var{%default-socket-path}, qui est l'emplacement normal en fonction des options données à @command{configure}." - -#. type: deffn -#: doc/guix.texi:4428 -#, no-wrap -msgid "{Scheme Procedure} close-connection @var{server}" -msgstr "{Procédure Scheme} close-connection @var{serveur}" - -#. type: deffn -#: doc/guix.texi:4430 -msgid "Close the connection to @var{server}." -msgstr "Ferme la connexion au @var{serveur}." - -#. type: defvr -#: doc/guix.texi:4432 -#, no-wrap -msgid "{Scheme Variable} current-build-output-port" -msgstr "{Variable Scheme} current-build-output-port" - -#. type: defvr -#: doc/guix.texi:4435 -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 "Cette variable est liée à un paramètre SRFI-39, qui se réfère au port où les journaux de construction et d'erreur envoyés par le démon devraient être écrits." - -#. type: Plain text -#: doc/guix.texi:4439 -msgid "Procedures that make RPCs all take a server object as their first argument." -msgstr "Les procédures qui font des RPC prennent toutes un objet serveur comme premier argument." - -#. type: deffn -#: doc/guix.texi:4440 -#, no-wrap -msgid "{Scheme Procedure} valid-path? @var{server} @var{path}" -msgstr "{Scheme Procedure} valid-path? @var{server} @var{path}" - -#. type: cindex -#: doc/guix.texi:4441 -#, no-wrap -msgid "invalid store items" -msgstr "éléments du dépôt invalides" - -#. type: deffn -#: doc/guix.texi:4446 -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 "Renvoie @code{#t} lorsque @var{path} désigne un élément du dépôt valide et @code{#f} sinon (un élément invalide peut exister sur le disque mais rester invalide, par exemple parce que c'est le résultat d'une construction annulée ou échouée)." - -#. type: deffn -#: doc/guix.texi:4449 -msgid "A @code{&nix-protocol-error} condition is raised if @var{path} is not prefixed by the store directory (@file{/gnu/store})." -msgstr "Une condition @code{&nix-protocol-error} est levée si @var{path} n'est pas préfixée par le répertoire du dépôt (@file{/gnu/store})." - -#. type: deffn -#: doc/guix.texi:4451 -#, no-wrap -msgid "{Scheme Procedure} add-text-to-store @var{server} @var{name} @var{text} [@var{references}]" -msgstr "{Procédure Scheme} add-text-to-store @var{server} @var{name} @var{text} [@var{references}]" - -#. type: deffn -#: doc/guix.texi:4455 -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 "Ajoute @var{text} dans le fichier @var{name} dans le dépôt et renvoie son chemin. @var{references} est la liste des chemins du dépôt référencés par le chemin du dépôt qui en résulte." - -#. type: deffn -#: doc/guix.texi:4457 -#, no-wrap -msgid "{Scheme Procedure} build-derivations @var{server} @var{derivations}" -msgstr "{Procédure Scheme} build-derivations @var{server} @var{derivations}" - -#. type: deffn -#: doc/guix.texi:4461 -msgid "Build @var{derivations} (a list of @code{} objects or derivation paths), and return when the worker is done building them. Return @code{#t} on success." -msgstr "Construit @var{derivaton} (ne liste d'objets @code{} ou de chemins de dérivations) et retourne quand le travailleur a fini de les construire. Renvoie @code{#t} en cas de réussite." - -#. type: Plain text -#: doc/guix.texi:4467 -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 "Remarque que le module @code{(guix monads)} fournit une monad ainsi que des version monadiques des procédures précédentes, avec le but de rendre plus facile de travailler avec le code qui accède au dépôt (@pxref{The Store Monad})." - -#. type: i{#1} -#: doc/guix.texi:4470 -msgid "This section is currently incomplete." -msgstr "Cette section est actuellement incomplète." - -#. type: cindex -#: doc/guix.texi:4474 -#, no-wrap -msgid "derivations" -msgstr "dérivations" - -#. type: Plain text -#: doc/guix.texi:4478 -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 "Les actions de construction à bas-niveau et l'environnement dans lequel elles sont effectuées sont représentés par des @dfn{dérivations}. Une dérivation contient cet ensemble d'informations :" - -#. type: itemize -#: doc/guix.texi:4483 -msgid "The outputs of the derivation---derivations produce at least one file or directory in the store, but may produce more." -msgstr "Les sorties de la dérivation — les dérivations produisent au moins un fichier ou répertoire dans le dépôt, mais peuvent en produire plus." - -#. type: itemize -#: doc/guix.texi:4487 -msgid "The inputs of the derivations, which may be other derivations or plain files in the store (patches, build scripts, etc.)" -msgstr "Les entrées de la dérivation, qui peuvent être d'autres dérivations ou des fichiers dans le dépôt (correctifs, scripts de construction, etc)." - -#. type: itemize -#: doc/guix.texi:4490 -msgid "The system type targeted by the derivation---e.g., @code{x86_64-linux}." -msgstr "Le type de système ciblé par la dérivation — p.ex.@: @code{x86_64-linux}." - -#. type: itemize -#: doc/guix.texi:4494 -msgid "The file name of a build script in the store, along with the arguments to be passed." -msgstr "Le nom de fichier d'un script de construction dans le dépôt avec les arguments à lui passer." - -#. type: itemize -#: doc/guix.texi:4497 -msgid "A list of environment variables to be defined." -msgstr "Une liste de variables d'environnement à définir." - -#. type: cindex -#: doc/guix.texi:4500 -#, no-wrap -msgid "derivation path" -msgstr "chemin de dérivation" - -#. type: Plain text -#: doc/guix.texi:4508 -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 "Les dérivations permettent aux client du démon de communiquer des actions de construction dans le dépôt. Elles existent sous deux formes : en tant que représentation en mémoire, à la fois côté client et démon, et en tant que fichiers dans le dépôt dont le nom fini par @code{.drv} — on dit que ce sont des @dfn{chemins de dérivations}. Les chemins de dérivations peuvent être passés à la procédure @code{build-derivations} pour effectuer les actions de construction qu'ils prescrivent (@pxref{The Store})." - -#. type: cindex -#: doc/guix.texi:4509 -#, no-wrap -msgid "fixed-output derivations" -msgstr "dérivations à sortie fixe" - -#. type: Plain text -#: doc/guix.texi:4516 -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 "Des opérations comme le téléchargement de fichiers et la récupération de sources gérés par un logiciel de contrôle de version pour lesquels le hash du contenu est connu à l'avance sont modélisés par des @dfn{dérivations à sortie fixe}. Contrairement aux dérivation habituelles, les sorties d'une dérivation à sortie fixe sont indépendantes de ses entrées — p.ex.@: un code source téléchargé produit le même résultat quelque soit la méthode de téléchargement utilisée." - -#. type: Plain text -#: doc/guix.texi:4521 -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 "Le module @code{(guix derivations)} fournit une représentation des dérivations comme des objets Scheme, avec des procédures pour créer et manipuler des dérivations. La primitive de plus bas-niveau pour créer une dérivation est la procédure @code{derivation} :" - -#. type: deffn -#: doc/guix.texi:4522 -#, no-wrap -msgid "{Scheme Procedure} derivation @var{store} @var{name} @var{builder} @" -msgstr "{Procédure Scheme} derivation @var{store} @var{name} @var{builder} @" - -#. type: deffn -#: doc/guix.texi:4531 -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] Build a derivation with the given arguments, and return the resulting @code{} object." +"\n" +" -h, --help display this help and exit" msgstr "" -"@var{args} [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @\n" -"[#:recursive? #f] [#:inputs '()] [#:env-vars '()] @ [#:system (%current-system)] [#:references-graphs #f] @\n" -"[#:allowed-references #f] [#:disallowed-references #f] @\n" -"[#:leaked-env-vars #f] [#:local-build? #f] @\n" -"[#:substitutable? #t]\n" -"\n" -"Construit une dérivation avec les arguments donnés et renvie l'objet @code{} obtenu." - -#. type: deffn -#: doc/guix.texi:4538 -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 "Lorsque @var{hash} et @var{hash-algo} sont donnés, une @dfn{dérivation à sortie fixe} est créée — c.-à-d.@: une dérivation dont le résultat est connu à l'avance, comme dans le cas du téléchargement d'un fichier. Si, en plus, @var{recursive?} est vrai, alors la sortie fixe peut être un fichier exécutable ou un répertoire et @var{hash} doit être le hash d'une archive contenant la sortie." - -#. type: deffn -#: doc/guix.texi:4543 -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 "Lorsque @var{references-graphs} est vrai, il doit s'agir d'une liste de paires de noms de fichiers et de chemins du dépôt. Dans ce cas, le graphe des références de chaque chemin du dépôt est exporté dans l'environnement de construction dans le fichier correspondant, dans un simple format texte." - -#. type: deffn -#: doc/guix.texi:4548 -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 "Lorsque @var{allowed-references} est vrai, il doit s'agir d'une liste d'éléments du dépôt ou de sorties auxquelles la sortie de la dérivations peut faire référence. De même, @var{disallowed-references}, si vrai, doit être une liste de choses que la sortie ne doit @emph{pas} référencer." - -#. type: deffn -#: doc/guix.texi:4555 -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 "Lorsque @var{leaked-env-vars} est vrai, il doit s'agir d'une liste de chaînes de caractères qui désignent les variables d'environnements qui peuvent « fuiter » de l'environnement du démon dans l'environnement de construction. Ce n'est possible que pour les dérivations à sortie fixe — c.-à-d.@: lorsque @var{hash} est vrai. L'utilisation principale est de permettre à des variables comme @code{http_proxy} d'être passées aux dérivations qui téléchargent des fichiers." - -#. type: deffn -#: doc/guix.texi:4560 -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 "Lorsque @var{local-build?} est vrai, déclare que la dérivation n'est pas un bon candidat pour le déchargement et devrait plutôt être construit localement (@pxref{Daemon Offload Setup}). C'est le cas des petites dérivations où le coût du transfert de données est plus important que les bénéfices." - -#. type: deffn -#: doc/guix.texi:4565 -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 "Lorsque que @var{substitutable?} est faux, déclare que les substituts de la sortie de la dérivation ne devraient pas être utilisés (@pxref{Substituts}). Cela est utile par exemple pour construire des paquets qui utilisent des détails du jeu d'instruction du CPU hôte." - -#. type: Plain text -#: doc/guix.texi:4571 -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 "Voici un exemple avec un script shell comme constructeur, en supposant que @var{store} est une connexion ouverte au démon et @var{bash} pointe vers un exécutable Bash dans le dépôt :" - -#. type: lisp -#: doc/guix.texi:4576 -#, no-wrap +"\n" +" -h, --help afficher cette aide et quitter" + +#: guix/scripts/build.scm:541 guix/scripts/download.scm:85 +#: guix/scripts/package.scm:397 guix/scripts/gc.scm:78 +#: guix/scripts/hash.scm:61 guix/scripts/import.scm:94 +#: guix/scripts/import/cran.scm:49 guix/scripts/pull.scm:122 +#: guix/scripts/substitute.scm:881 guix/scripts/system.scm:995 +#: guix/scripts/lint.scm:1111 guix/scripts/publish.scm:96 +#: guix/scripts/edit.scm:46 guix/scripts/size.scm:245 +#: guix/scripts/graph.scm:468 guix/scripts/challenge.scm:243 +#: guix/scripts/copy.scm:124 guix/scripts/pack.scm:663 +#: guix/scripts/weather.scm:260 guix/scripts/container.scm:35 +#: guix/scripts/container/exec.scm:45 msgid "" -"(use-modules (guix utils)\n" -" (guix store)\n" -" (guix derivations))\n" "\n" +" -V, --version display version information and exit" msgstr "" -"(use-modules (guix utils)\n" -" (guix store)\n" -" (guix derivations))\n" "\n" +" -V, --version afficher les informations sur la version et quitter" -#. type: lisp -#: doc/guix.texi:4585 -#, no-wrap +#: guix/scripts/build.scm:568 +#, scheme-format msgid "" -"(let ((builder ; add the Bash script to the store\n" -" (add-text-to-store store \"my-builder.sh\"\n" -" \"echo hello world > $out\\n\" '())))\n" -" (derivation store \"foo\"\n" -" bash `(\"-e\" ,builder)\n" -" #:inputs `((,bash) (,builder))\n" -" #:env-vars '((\"HOME\" . \"/homeless\"))))\n" -"@result{} # /gnu/store/@dots{}-foo>\n" -msgstr "" -"(let ((builder ; ajoute le script Bash au dépôt\n" -" (add-text-to-store store \"my-builder.sh\"\n" -" \"echo hello world > $out\\n\" '())))\n" -" (derivation store \"foo\"\n" -" bash `(\"-e\" ,builder)\n" -" #:inputs `((,bash) (,builder))\n" -" #:env-vars '((\"HOME\" . \"/homeless\"))))\n" -"@result{} # /gnu/store/@dots{}-foo>\n" - -#. type: Plain text -#: doc/guix.texi:4592 -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 "Comme on pourrait s'en douter, cette primitive est difficile à utiliser directement. Une meilleure approche est d'écrire les scripts de construction en Scheme, bien sur ! Le mieux à faire pour cela est d'écrire le code de construction comme une « G-expression » et de la passer à @code{gexp->derivation}. Pour plus d'informations, @pxref{G-Expressions}." - -#. type: Plain text -#: doc/guix.texi:4597 -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 "Il fut un temps où @code{gexp->derivation} n'existait pas et où construire une dérivation donc le code de construction était écrit en Scheme se faisait avec @code{build-expression->derivation}, documenté plus bas. Cette procédure est maintenant obsolète, remplacée par @code{gexp->derivation} qui est meilleure." - -#. type: deffn -#: doc/guix.texi:4598 -#, no-wrap -msgid "{Scheme Procedure} build-expression->derivation @var{store} @" -msgstr "{Procédure Scheme} build-expression->derivation @var{store} @" - -#. type: deffn -#: doc/guix.texi:4614 -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))}." +"invalid argument: '~a' option argument: ~a, ~\n" +"must be one of 'package', 'all', or 'transitive'~%" msgstr "" -"@var{name} @var{exp} @\n" -"[#:system (%current-system)] [#:inputs '()] @\n" -"[#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @\n" -"[#:recursive? #f] [#:env-vars '()] [#:modules '()] @\n" -"[#:references-graphs #f] [#:allowed-references #f] @\n" -"[#:disallowed-references #f] @\n" -"[#:local-build? #f] [#:substitutable? #t] [#:guile-for-build #f]\n" -"Renvoie une dérivation qui exécute l'expression Scheme @var{exp} comme un constructeur pour la dérivation @var{name}. @var{inputs} doit être une liste de tuples @code{(name drv-path sub-drv)} ; lorsque @var{sub-drv} est omis, @code{\"out\"} est utilisé. @var{modules} est une liste de noms de modules Guile du chemin de recherche actuel qui seront copiés dans le dépôt, compilés et rendus disponibles dans le chemin de chargement pendant l'exécution de @var{exp} — p.@: ex.@: @code{((guix build utils) (guix build gnu-build-system))}." - -#. type: deffn -#: doc/guix.texi:4622 -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 "@var{exp} est évaluée dans une environnement où @code{%outputs} est lié à une liste de paires de sortie/chemin, et où @code{%build-inputs} est lié à une liste de paires de chaînes de caractères et de chemin de sortie construite à partir de @var{inputs}. Éventuellement, @var{env-vars} est une liste de paires de chaînes de caractères spécifiant le nom et la valeur de variables d'environnement visibles pour le constructeur. Le constructeur termine en passant le résultat de @var{exp} à @code{exit} ; ainsi, lorsque @var{exp} renvoie @code{#f}, la construction est considérée en échec." - -#. type: deffn -#: doc/guix.texi:4626 -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 "@var{exp} est construite avec @var{guile-for-build} (une dérivation). Lorsque @var{guile-for-build} est omis où est @code{#f}, la valeur du fluide @code{%guile-for-build} est utilisée à la place." - -#. type: deffn -#: doc/guix.texi:4631 -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 "Voir la procédure @code{derivation} pour la signification de @var{references-graph}, @var{allowed-references}, @var{disallowed-references}, @var{local-build?} et @var{substitutable?}." - -#. type: Plain text -#: doc/guix.texi:4636 -msgid "Here's an example of a single-output derivation that creates a directory containing one file:" -msgstr "Voici un exemple de dérivation à sortie unique qui crée un répertoire avec un fichier :" - -#. type: lisp -#: doc/guix.texi:4644 -#, no-wrap +"argument invalide: argument en option « ~a » : ~a, ~\n" +"doit être « package », « all » ou « transitive »~%" + +#: guix/scripts/build.scm:621 +#, scheme-format +msgid "~s: not something we can build~%" +msgstr "~s : pas quelque chose qu'on sait compiler~%" + +#: guix/scripts/build.scm:679 +#, scheme-format +msgid "~a: warning: package '~a' has no source~%" +msgstr "~a : attention : le paquet « ~a » n'a pas de source~%" + +#: guix/scripts/build.scm:713 +#, scheme-format +msgid "no build log for '~a'~%" +msgstr "aucun journal de compilation pour « ~a »~%" + +#: guix/discovery.scm:90 +#, scheme-format +msgid "cannot access `~a': ~a~%" +msgstr "impossible d'accéder à « ~a » : ~a~%" + +#: guix/scripts/download.scm:69 msgid "" -"(let ((builder '(let ((out (assoc-ref %outputs \"out\")))\n" -" (mkdir out) ; create /gnu/store/@dots{}-goo\n" -" (call-with-output-file (string-append out \"/test\")\n" -" (lambda (p)\n" -" (display '(hello guix) p))))))\n" -" (build-expression->derivation store \"goo\" builder))\n" +"Usage: guix download [OPTION] URL\n" +"Download the file at URL to the store or to the given file, and print its\n" +"file name and the hash of its contents.\n" "\n" +"Supported formats: 'nix-base32' (default), 'base32', and 'base16'\n" +"('hex' and 'hexadecimal' can be used as well).\n" msgstr "" -"(let ((builder '(let ((out (assoc-ref %outputs \"out\")))\n" -" (mkdir out) ; create /gnu/store/@dots{}-goo\n" -" (call-with-output-file (string-append out \"/test\")\n" -" (lambda (p)\n" -" (display '(hello guix) p))))))\n" -" (build-expression->derivation store \"goo\" builder))\n" -"\n" - -#. type: lisp -#: doc/guix.texi:4646 -#, no-wrap -msgid "@result{} # @dots{}>\n" -msgstr "@result{} # @dots{}>\n" - -#. type: cindex -#: doc/guix.texi:4652 -#, no-wrap -msgid "monad" -msgstr "monad" - -#. type: Plain text -#: doc/guix.texi:4658 -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 "Les procédures qui travaillent sur le dépôt décrites dans les sections précédentes prennent toutes une connexion ouverte au démon de construction comme premier argument. Bien que le modèle sous-jacent soit fonctionnel, elles ont soit des effets de bord, soit dépendent de l'état actuel du dépôt." - -#. type: Plain text -#: doc/guix.texi:4664 -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 "Le premier point est embêtant : on doit se balader avec la connexion au démon dans toutes ces fonctions, ce qui rend impossible le fait de composer des fonctions qui ne prennent pas ce paramètre avec des fonctions qui le prennent. Le deuxième point est problématique : comme les opérations sur le dépôt ont des effets de bord ou dépendent d'états externes, elles doivent être enchaînés correctement." - -#. type: cindex -#: doc/guix.texi:4665 -#, no-wrap -msgid "monadic values" -msgstr "valeurs monadiques" - -#. type: cindex -#: doc/guix.texi:4666 -#, no-wrap -msgid "monadic functions" -msgstr "fonctions monadiques" - -#. type: Plain text -#: doc/guix.texi:4676 -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 "C'est là que le module @code{(guix monads)} arrive à la rescousse. Ce module fournit un cadre pour travailler avec des @dfn{monads}, en particulier une monad très utile pour notre usage, la @dfn{monad du dépôt}. Les monads sont des constructions qui permettent deux choses : associer un « contexte » avec une valeur (dans notre cas, le contexte est le dépôt) et construire une séquence de calculs (ici les calculs comprennent des accès au dépôt). Les valeurs dans une monad — les valeurs qui contiennent ce contexte supplémentaire — sont appelées des @dfn{valeurs monadiques} ; les procédures qui renvoient ce genre de valeur sont appelées des @dfn{procédures monadiques}." - -#. type: Plain text -#: doc/guix.texi:4678 -msgid "Consider this ``normal'' procedure:" -msgstr "Considérez cette procédure « normale » :" - -#. type: example -#: doc/guix.texi:4687 -#, no-wrap -msgid "" -"(define (sh-symlink store)\n" -" ;; Return a derivation that symlinks the 'bash' executable.\n" -" (let* ((drv (package-derivation store bash))\n" -" (out (derivation->output-path drv))\n" -" (sh (string-append out \"/bin/bash\")))\n" -" (build-expression->derivation store \"sh\"\n" -" `(symlink ,sh %output))))\n" -msgstr "" -"(define (sh-symlink store)\n" -" ;; Renvoie une dérivation qui crée un lien symbolique vers l'exécutable « bash ».\n" -" (let* ((drv (package-derivation store bash))\n" -" (out (derivation->output-path drv))\n" -" (sh (string-append out \"/bin/bash\")))\n" -" (build-expression->derivation store \"sh\"\n" -" `(symlink ,sh %output))))\n" - -#. type: Plain text -#: doc/guix.texi:4691 -msgid "Using @code{(guix monads)} and @code{(guix gexp)}, it may be rewritten as a monadic function:" -msgstr "En utilisant @code{(guix monads)} et @code{(guix gexp)}, on peut la réécrire en une fonction monadique :" - -#. type: example -#: doc/guix.texi:4699 -#, no-wrap +"Usage: guix download [OPTION] URL\n" +"Télécharger le fichier à partir de l'URL spécifiée et l'ajouter au dépôt ou\n" +"au fichier spécifié puis afficher son nom de fichier et l'empreinte de son\n" +"contenu.\n" +"\n" +"Formats supportés : « nix-base32 » (par défaut), « base32 », et « base16 »\n" +"(« hex » et « hexadecimal » peuvent aussi être utilisés).\n" + +#: guix/scripts/download.scm:75 guix/scripts/hash.scm:54 msgid "" -"(define (sh-symlink)\n" -" ;; Same, but return a monadic value.\n" -" (mlet %store-monad ((drv (package->derivation bash)))\n" -" (gexp->derivation \"sh\"\n" -" #~(symlink (string-append #$drv \"/bin/bash\")\n" -" #$output))))\n" +"\n" +" -f, --format=FMT write the hash in the given format" msgstr "" -"(define (sh-symlink)\n" -" ;; Pareil, mais renvoie une valeur monadique.\n" -" (mlet %store-monad ((drv (package->derivation bash)))\n" -" (gexp->derivation \"sh\"\n" -" #~(symlink (string-append #$drv \"/bin/bash\")\n" -" #$output))))\n" - -#. type: Plain text -#: doc/guix.texi:4706 -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 "Il y a plusieurs choses à remarquer avec cette deuxième version : le paramètre @code{store} est maintenant implicitement « enfilé » dans les appels aux procédures monadiques @code{package->derivation} et @code{gexp->derivation}, et la valeur monadique renvoyée par @code{package->derivation} est @dfn{liée} avec @code{mlet} plutôt qu'avec un simple @code{let}." - -#. type: Plain text -#: doc/guix.texi:4710 -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 "Il se trouve que l'appel à @code{package->derivation} peut même être omis puisqu'il aura lieu implicitement, comme nous le verrons plus tard (@pxref{G-Expressions}) :" - -#. type: example -#: doc/guix.texi:4716 -#, no-wrap +"\n" +" -f, --format=FORMAT écrire l'empreinte dans le FORMAT donné" + +#: guix/scripts/download.scm:77 msgid "" -"(define (sh-symlink)\n" -" (gexp->derivation \"sh\"\n" -" #~(symlink (string-append #$bash \"/bin/bash\")\n" -" #$output)))\n" +"\n" +" --no-check-certificate\n" +" do not validate the certificate of HTTPS servers " msgstr "" -"(define (sh-symlink)\n" -" (gexp->derivation \"sh\"\n" -" #~(symlink (string-append #$bash \"/bin/bash\")\n" -" #$output)))\n" - -#. type: Plain text -#: doc/guix.texi:4725 -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 "L'appel à la procédure monadique @code{sh-symlink} n'a aucun effet. En anglais on pourrait dire « you exit a monad like you exit a building on fire: by running »@footnote{NdT : « on sort d'une monad comme d'un immeuble en flamme, en courant ». Le jeu de mot est perdu à la traduction : courrir et lancer utilisent le même verbe @i{run} en anglais.}. Donc, pour sortir de la monad et obtenir l'effet escompté, on doit utiliser @code{run-with-store}." - -#. type: example -#: doc/guix.texi:4729 -#, no-wrap +"\n" +" --no-check-certificate\n" +" ne pas valider les certificats des serveurs HTTPS " + +#: guix/scripts/download.scm:80 msgid "" -"(run-with-store (open-connection) (sh-symlink))\n" -"@result{} /gnu/store/...-sh-symlink\n" +"\n" +" -o, --output=FILE download to FILE" msgstr "" -"(run-with-store (open-connection) (sh-symlink))\n" -"@result{} /gnu/store/...-sh-symlink\n" +"\n" +" -o, --output=FICHIER télécharge dans le FICHIER" -#. type: Plain text -#: doc/guix.texi:4735 -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 "Remarquez que le module @code{(guix monad-repl)} étend la console Guile avec de nouvelles « méta-commandes » pour rendre plus facile la manipulation de procédures monadiques : @code{run-in-store} et @code{enter-store-monad}. La première est utilisée pour « lancer » une seule valeur monadique à travers le dépôt :" +#: guix/scripts/download.scm:103 guix/scripts/hash.scm:82 +#, scheme-format +msgid "unsupported hash format: ~a~%" +msgstr "format d'empreinte non supporté : ~a~%" -#. type: example -#: doc/guix.texi:4739 -#, no-wrap -msgid "" -"scheme@@(guile-user)> ,run-in-store (package->derivation hello)\n" -"$1 = # @dots{}>\n" -msgstr "" -"scheme@@(guile-user)> ,run-in-store (package->derivation hello)\n" -"$1 = # @dots{}>\n" +#: guix/scripts/download.scm:138 guix/scripts/package.scm:884 +#: guix/scripts/publish.scm:883 +#, scheme-format +msgid "~A: extraneous argument~%" +msgstr "~A : argument superflu~%" + +#: guix/scripts/download.scm:146 +#, scheme-format +msgid "no download URI was specified~%" +msgstr "aucune URI de téléchargement spécifiée~%" -#. type: Plain text -#: doc/guix.texi:4743 -msgid "The latter enters a recursive REPL, where all the return values are automatically run through the store:" -msgstr "La deuxième entre dans une console récursive, où toutes les valeurs de retour sont automatiquement lancées à travers le dépôt :" +#: guix/scripts/download.scm:151 +#, scheme-format +msgid "~a: failed to parse URI~%" +msgstr "~a : impossible d'évaluer l'URI~%" -#. type: example -#: doc/guix.texi:4752 -#, no-wrap +#: guix/scripts/download.scm:161 +#, scheme-format +msgid "~a: download failed~%" +msgstr "~a : le téléchargement a échoué~%" + +#: guix/scripts/package.scm:72 +#, scheme-format +msgid "Try \"info '(guix) Invoking guix package'\" for more information.~%" +msgstr "Essayez « info '(guix) Invoking guix package' » pour plus d'information.~%" + +#: guix/scripts/package.scm:94 +#, scheme-format +msgid "error: while creating directory `~a': ~a~%" +msgstr "erreur : pendant la création du répertoire « ~a » : ~a~%" + +#: guix/scripts/package.scm:98 +#, scheme-format +msgid "Please create the `~a' directory, with you as the owner.~%" +msgstr "Veuillez créer le répertoire « ~a » dont vous êtes le propriétaire.~%" + +#: guix/scripts/package.scm:105 +#, scheme-format +msgid "error: directory `~a' is not owned by you~%" +msgstr "erreur : vous ne possédez pas le répertoire « ~a »~%" + +#: guix/scripts/package.scm:108 +#, scheme-format +msgid "Please change the owner of `~a' to user ~s.~%" +msgstr "Veuillez définir ~s comme propriétaire de « ~a ».~%" + +#: guix/scripts/package.scm:143 +#, scheme-format +msgid "not removing generation ~a, which is current~%" +msgstr "la génération ~a n'est pas supprimée car elle est actuelle~%" + +#: guix/scripts/package.scm:150 +#, scheme-format +msgid "no matching generation~%" +msgstr "aucune génération correspondante~%" + +#: guix/scripts/package.scm:153 guix/scripts/package.scm:690 +#: guix/scripts/system.scm:593 +#, scheme-format +msgid "invalid syntax: ~a~%" +msgstr "syntaxe non valide : ~a~%" + +#: guix/scripts/package.scm:182 +#, scheme-format +msgid "nothing to be done~%" +msgstr "aucune action à faire~%" + +#: guix/scripts/package.scm:196 +#, scheme-format +msgid "~a package in profile~%" +msgid_plural "~a packages in profile~%" +msgstr[0] "~a paquet dans le profile~%" +msgstr[1] "~a paquets dans le profile~%" + +#: guix/scripts/package.scm:280 +#, scheme-format +msgid "package '~a' no longer exists~%" +msgstr "le paquet « ~a » n'existe plus~%" + +#: guix/scripts/package.scm:318 +#, scheme-format +msgid "The following environment variable definitions may be needed:~%" +msgstr "Il pourrait être nécessaire de définir les variables d'environnement suivantes :~%" + +#: guix/scripts/package.scm:334 msgid "" -"scheme@@(guile-user)> ,enter-store-monad\n" -"store-monad@@(guile-user) [1]> (package->derivation hello)\n" -"$2 = # @dots{}>\n" -"store-monad@@(guile-user) [1]> (text-file \"foo\" \"Hello!\")\n" -"$3 = \"/gnu/store/@dots{}-foo\"\n" -"store-monad@@(guile-user) [1]> ,q\n" -"scheme@@(guile-user)>\n" +"Usage: guix package [OPTION]...\n" +"Install, remove, or upgrade packages in a single transaction.\n" msgstr "" -"scheme@@(guile-user)> ,enter-store-monad\n" -"store-monad@@(guile-user) [1]> (package->derivation hello)\n" -"$2 = # @dots{}>\n" -"store-monad@@(guile-user) [1]> (text-file \"foo\" \"Hello!\")\n" -"$3 = \"/gnu/store/@dots{}-foo\"\n" -"store-monad@@(guile-user) [1]> ,q\n" -"scheme@@(guile-user)>\n" - -#. type: Plain text -#: doc/guix.texi:4757 -msgid "Note that non-monadic values cannot be returned in the @code{store-monad} REPL." -msgstr "Remarquez qu'on ne peut pas renvoyer de valeur non monadique dans la console @code{store-monad}." - -#. type: Plain text -#: doc/guix.texi:4760 -msgid "The main syntactic forms to deal with monads in general are provided by the @code{(guix monads)} module and are described below." -msgstr "Les formes syntaxiques principales pour utiliser des monads en général sont disponibles dans le module @code{(guix monads)} et sont décrites ci-dessous." - -#. type: deffn -#: doc/guix.texi:4761 -#, no-wrap -msgid "{Scheme Syntax} with-monad @var{monad} @var{body} ..." -msgstr "{Syntaxe Scheme} with-monad @var{monad} @var{body} ..." - -#. type: deffn -#: doc/guix.texi:4764 -msgid "Evaluate any @code{>>=} or @code{return} forms in @var{body} as being in @var{monad}." -msgstr "Évalue n'importe quelle forme @code{>>=} ou @code{return} dans @var{body} comme une @var{monad}." - -#. type: deffn -#: doc/guix.texi:4766 -#, no-wrap -msgid "{Scheme Syntax} return @var{val}" -msgstr "{Syntaxe Scheme} return @var{val}" - -#. type: deffn -#: doc/guix.texi:4768 -msgid "Return a monadic value that encapsulates @var{val}." -msgstr "Renvoie une valeur monadique qui encapsule @var{val}." - -#. type: deffn -#: doc/guix.texi:4770 -#, no-wrap -msgid "{Scheme Syntax} >>= @var{mval} @var{mproc} ..." -msgstr "{Syntaxe Scheme} >>= @var{mval} @var{mproc} ..." - -#. type: deffn -#: doc/guix.texi:4777 -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 "@dfn{Lie} une valeur monadique @var{mval}, en passant son « contenu » aux procédures monadiques @var{mproc}@dots{}@footnote{Cette opération est souvent appelée « bind », mais ce nom dénote une procédure qui n'a rien à voir en Guile. Ainsi, nous empruntons ce symbole quelque peu cryptique au langage Haskell}. Il peut y avoir une ou plusieurs @code{mproc}, comme dans cet exemple :" - -#. type: example -#: doc/guix.texi:4785 -#, no-wrap +"Usage : guix package [OPTION]...\n" +"Installer, supprimer ou mettre à jour les paquets en une seule transaction.\n" + +#: guix/scripts/package.scm:336 msgid "" -"(run-with-state\n" -" (with-monad %state-monad\n" -" (>>= (return 1)\n" -" (lambda (x) (return (+ 1 x)))\n" -" (lambda (x) (return (* 2 x)))))\n" -" 'some-state)\n" "\n" +" -i, --install PACKAGE ...\n" +" install PACKAGEs" msgstr "" -"(run-with-state\n" -" (with-monad %state-monad\n" -" (>>= (return 1)\n" -" (lambda (x) (return (+ 1 x)))\n" -" (lambda (x) (return (* 2 x)))))\n" -" 'some-state)\n" "\n" +" -i, --install=PAQUET ...\n" +" installer les PAQUETs" -#. type: example -#: doc/guix.texi:4788 -#, no-wrap +#: guix/scripts/package.scm:339 msgid "" -"@result{} 4\n" -"@result{} some-state\n" -msgstr "" -"@result{} 4\n" -"@result{} some-state\n" - -#. type: deffn -#: doc/guix.texi:4791 -#, no-wrap -msgid "{Scheme Syntax} mlet @var{monad} ((@var{var} @var{mval}) ...) @" -msgstr "{Syntaxe Scheme} mlet @var{monad} ((@var{var} @var{mval}) ...) @" - -#. type: deffn -#: doc/guix.texi:4793 -msgid "@var{body} ..." -msgstr "@var{body} ..." - -#. type: deffnx -#: doc/guix.texi:4793 -#, no-wrap -msgid "{Scheme Syntax} mlet* @var{monad} ((@var{var} @var{mval}) ...) @" -msgstr "{Syntaxe Scheme} mlet* @var{monad} ((@var{var} @var{mval}) ...) @" - -#. type: deffn -#: doc/guix.texi:4805 -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}." +"\n" +" -e, --install-from-expression=EXP\n" +" install the package EXP evaluates to" msgstr "" -"@var{body} ...\n" -"Lie les variables @var{var} aux valeurs monadiques @var{mval} dans @var{body}, une séquence d'expressions. Comme avec l'opérateur de liaison, on peut réfléchir comme si on « ouvrait » la valeur non-monadique « contenue » dans @var{mval} et comme si on faisait en sorte que @var{var} se réfère à cette valeur pure, non-monadique, dans la portée de @var{body}. La forme (@var{var} -> @var{val}) lie @var{var} à la valeur « normale » @var{val}, comme @code{let}. L'opération de liaison a lieu en séquence de la gauche vers la droite. La dernière expression de @var{body} doit être une expression monadique et son résultat deviendra le résultat de @code{mlet} ou @code{mlet*} lorsque lancé dans la @var{monad}." - -#. type: deffn -#: doc/guix.texi:4808 -msgid "@code{mlet*} is to @code{mlet} what @code{let*} is to @code{let} (@pxref{Local Bindings,,, guile, GNU Guile Reference Manual})." -msgstr "@code{mlet*} est à @code{mlet} ce que @code{let*} est à @code{let} (@pxref{Local Bindings,,, guile, GNU Guile Reference Manual})." - -#. type: deffn -#: doc/guix.texi:4810 -#, no-wrap -msgid "{Scheme System} mbegin @var{monad} @var{mexp} ..." -msgstr "{Système Scheme} mbegin @var{monad} @var{mexp} ..." - -#. type: deffn -#: doc/guix.texi:4814 -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 "Lie @var{mexp} et les expressions monadiques suivantes en séquence, et renvoie le résultat de la dernière expression. Chaque expression dans la séquence doit être une expression monadique." - -#. type: deffn -#: doc/guix.texi:4818 -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 "Cette procédure est similaire à @code{mlet}, sauf que les valeurs de retour des expressions monadiques sont ignorées. Dans ce sens, elle est analogue à @code{begin}, mais appliqué à des expressions monadiques." - -#. type: deffn -#: doc/guix.texi:4820 -#, no-wrap -msgid "{Scheme System} mwhen @var{condition} @var{mexp0} @var{mexp*} ..." -msgstr "{Système Scheme} mwhen @var{condition} @var{mexp0} @var{mexp*} ..." - -#. type: deffn -#: doc/guix.texi:4825 -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 "Lorsque la @var{condition} est vraie, évalue la séquence des expressions monadiques @var{mexp0}..@var{mexp*} comme dans un @code{mbegin}. Lorsque la @var{condition} est fausse, renvoie @code{*unspecified*} dans la monad actuelle. Cahque expression dans la séquence doit être une expression monadique." - -#. type: deffn -#: doc/guix.texi:4827 -#, no-wrap -msgid "{Scheme System} munless @var{condition} @var{mexp0} @var{mexp*} ..." -msgstr "{Système Scheme} munless @var{condition} @var{mexp0} @var{mexp*} ..." - -#. type: deffn -#: doc/guix.texi:4832 -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 "Lorsque la @var{condition} est fausse, évalue la séquence des expressions monadiques @var{mexp0}..@var{mexp*} comme dans un @code{mbegin}. Lorsque la @var{condition} est vraie, renvoie @code{*unspecified*} dans la monad actuelle. Cahque expression dans la séquence doit être une expression monadique." - -#. type: cindex -#: doc/guix.texi:4834 -#, no-wrap -msgid "state monad" -msgstr "monad d'état" - -#. type: Plain text -#: doc/guix.texi:4838 -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 "Le module @code{(guix monads)} fournit la @dfn{monad d'état} qui permet à une valeur supplémentaire — l'état — d'être enfilée à travers les appels de procédures." - -#. type: defvr -#: doc/guix.texi:4839 -#, no-wrap -msgid "{Scheme Variable} %state-monad" -msgstr "{Variable Scheme} %state-monad" - -#. type: defvr -#: doc/guix.texi:4842 -msgid "The state monad. Procedures in the state monad can access and change the state that is threaded." -msgstr "La monad d'état. les procédure dans la monad d'état peuvent accéder et modifier l'état qui est enfilé." - -#. type: defvr -#: doc/guix.texi:4846 -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 "Considérez l'exemple ci-dessous. La procédure @code{square} renvoie une valeur dans la monad d'état. Elle renvoie le carré de son argument, mais incrémente aussi la valeur actuelle de l'état :" - -#. type: example -#: doc/guix.texi:4853 -#, no-wrap +"\n" +" -e, --install-from-expression=EXP\n" +" installer le paquet évalué par EXP" + +#: guix/scripts/package.scm:342 msgid "" -"(define (square x)\n" -" (mlet %state-monad ((count (current-state)))\n" -" (mbegin %state-monad\n" -" (set-current-state (+ 1 count))\n" -" (return (* x x)))))\n" "\n" +" -f, --install-from-file=FILE\n" +" install the package that the code within FILE\n" +" evaluates to" msgstr "" -"(define (square x)\n" -" (mlet %state-monad ((count (current-state)))\n" -" (mbegin %state-monad\n" -" (set-current-state (+ 1 count))\n" -" (return (* x x)))))\n" "\n" +" -f, --install-from-file=FICHIER\n" +" installer le paquet évalué par le code dans\n" +" FICHIER" -#. type: example -#: doc/guix.texi:4857 -#, no-wrap +#: guix/scripts/package.scm:346 msgid "" -"(run-with-state (sequence %state-monad (map square (iota 3))) 0)\n" -"@result{} (0 1 4)\n" -"@result{} 3\n" -msgstr "" -"(run-with-state (sequence %state-monad (map square (iota 3))) 0)\n" -"@result{} (0 1 4)\n" -"@result{} 3\n" - -#. type: defvr -#: doc/guix.texi:4861 -msgid "When ``run'' through @var{%state-monad}, we obtain that additional state value, which is the number of @code{square} calls." -msgstr "Lorsqu'on la lance à travers @var{%state-monad}, on obtient cet valeur d'état supplémentaire, qui est le nombre d'appels à @code{square}." - -#. type: deffn -#: doc/guix.texi:4863 -#, no-wrap -msgid "{Monadic Procedure} current-state" -msgstr "{Procédure Monadic} current-state" - -#. type: deffn -#: doc/guix.texi:4865 -msgid "Return the current state as a monadic value." -msgstr "Renvoie l'état actuel dans une valeur monadique." - -#. type: deffn -#: doc/guix.texi:4867 -#, no-wrap -msgid "{Monadic Procedure} set-current-state @var{value}" -msgstr "{Procédure Monadic} set-current-state @var{value}" - -#. type: deffn -#: doc/guix.texi:4870 -msgid "Set the current state to @var{value} and return the previous state as a monadic value." -msgstr "Initialise l'état actuel à @var{value} et renvoie l'état précédent dans une valeur monadique." - -#. type: deffn -#: doc/guix.texi:4872 -#, no-wrap -msgid "{Monadic Procedure} state-push @var{value}" -msgstr "{Procédure Monadic} state-push @var{value}" - -#. type: deffn -#: doc/guix.texi:4875 -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 "Pousse @var{value} sur l'état actuel, qui est supposé être une liste, et renvoie l'état précédent dans une valeur monadique." - -#. type: deffn -#: doc/guix.texi:4877 -#, no-wrap -msgid "{Monadic Procedure} state-pop" -msgstr "{Procédure Monadic} state-pop" - -#. type: deffn -#: doc/guix.texi:4880 -msgid "Pop a value from the current state and return it as a monadic value. The state is assumed to be a list." -msgstr "Récupère (pop) une valeur dans l'état actuel et la renvoie comme une valeur monadique. L'état est supposé être une liste." - -#. type: deffn -#: doc/guix.texi:4882 -#, no-wrap -msgid "{Scheme Procedure} run-with-state @var{mval} [@var{state}]" -msgstr "{Procédure Scheme} run-with-state @var{mval} [@var{state}]" - -#. type: deffn -#: doc/guix.texi:4885 -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 "Lance la valeur monadique @var{mval} avec @var{state} comme valeur initiale. Renvoie deux valeurs : la valeur du résultat et l'état du résultat." - -#. type: Plain text -#: doc/guix.texi:4889 -msgid "The main interface to the store monad, provided by the @code{(guix store)} module, is as follows." -msgstr "L'interface principale avec la monad du dépôt, fournit par le module @code{(guix store)}, est la suivante." - -#. type: defvr -#: doc/guix.texi:4890 -#, no-wrap -msgid "{Scheme Variable} %store-monad" -msgstr "{Variable Scheme} %store-monad" - -#. type: defvr -#: doc/guix.texi:4892 -msgid "The store monad---an alias for @var{%state-monad}." -msgstr "La monad du dépôt — un alias pour @var{%state-monad}." - -#. type: defvr -#: doc/guix.texi:4896 -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 "Les valeurs dans la monad du dépôt encapsulent des accès au dépôt. Lorsque son effet est requis, une valeur de la monad du dépôt doit être « évaluée » en la passant à la procédure @code{run-with-store} (voir plus bas)." - -#. type: deffn -#: doc/guix.texi:4898 -#, no-wrap -msgid "{Scheme Procedure} run-with-store @var{store} @var{mval} [#:guile-for-build] [#:system (%current-system)]" -msgstr "{Procédure Scheme} run-with-store @var{store} @var{mval} [#:guile-for-build] [#:system (%current-system)]" - -#. type: deffn -#: doc/guix.texi:4901 -msgid "Run @var{mval}, a monadic value in the store monad, in @var{store}, an open store connection." -msgstr "Lance @var{mval}, une valeur monadique dans la monad du dépôt, dans @var{store}, une connexion ouvert au dépôt." - -#. type: deffn -#: doc/guix.texi:4903 -#, no-wrap -msgid "{Monadic Procedure} text-file @var{name} @var{text} [@var{references}]" -msgstr "{Procédure Monadique} text-file @var{name} @var{text} [@var{references}]" - -#. type: deffn -#: doc/guix.texi:4907 -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 "Renvoie une valeur monadique correspondant au nom de fichier dans le dépôt du fichier contenant @var{text}, une chaîne de caractères. @var{references} est une liste d'éléments du dépôt auxquels le fichier texte en résultat se réfère ; c'est la liste vide par défaut." - -#. type: deffn -#: doc/guix.texi:4909 -#, no-wrap -msgid "{Monadic Procedure} interned-file @var{file} [@var{name}] @" -msgstr "{Procédure Monadique} interned-file @var{file} [@var{name}] @" - -#. type: deffn -#: doc/guix.texi:4914 -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." +"\n" +" -r, --remove PACKAGE ...\n" +" remove PACKAGEs" msgstr "" -"[#:recursive? #t] [#:select? (const #t)]\n" -"Renvoie le nom de @var{file} une fois ajouté au dépôt. Utilise @var{name} comme nom dans le dépôt ou le nom de fichier de @var{file} si @var{name} est omis." - -#. type: deffn -#: doc/guix.texi:4918 doc/guix.texi:5330 -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 "Lorsque @var{recursive?} est vraie, le contenu de @var{file} est ajouté récursivement ; si @var{file} désigne un fichier simple et que @var{recursive?} est vrai, son contenu est ajouté et ses bits de permissions sont préservés." - -#. type: deffn -#: doc/guix.texi:4923 doc/guix.texi:5335 -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 "Lorsque @var{recursive?} est vraie, appelle @code{(@var{select?} @var{file} @var{stat})} pour chaque répertoire où @var{file} est le nom de fichier absolu de l'entrée et @var{stat} est le résultat de @code{lstat} ; à l'exception des entrées pour lesquelles @var{select?} ne renvoie pas vrai." - -#. type: deffn -#: doc/guix.texi:4925 -msgid "The example below adds a file to the store, under two different names:" -msgstr "L'exemple ci-dessous ajoute un fichier au dépôt, sous deux noms différents :" - -#. type: example -#: doc/guix.texi:4931 -#, no-wrap +"\n" +" -r, --remove=PAQUET ...\n" +" supprimer les PAQUETs" + +#: guix/scripts/package.scm:349 msgid "" -"(run-with-store (open-connection)\n" -" (mlet %store-monad ((a (interned-file \"README\"))\n" -" (b (interned-file \"README\" \"LEGU-MIN\")))\n" -" (return (list a b))))\n" "\n" +" -u, --upgrade[=REGEXP] upgrade all the installed packages matching REGEXP" msgstr "" -"(run-with-store (open-connection)\n" -" (mlet %store-monad ((a (interned-file \"README\"))\n" -" (b (interned-file \"README\" \"LEGU-MIN\")))\n" -" (return (list a b))))\n" -"\n" - -#. type: example -#: doc/guix.texi:4933 -#, no-wrap -msgid "@result{} (\"/gnu/store/rwm@dots{}-README\" \"/gnu/store/44i@dots{}-LEGU-MIN\")\n" -msgstr "@result{} (\"/gnu/store/rwm@dots{}-README\" \"/gnu/store/44i@dots{}-LEGU-MIN\")\n" - -#. type: Plain text -#: doc/guix.texi:4939 -msgid "The @code{(guix packages)} module exports the following package-related monadic procedures:" -msgstr "Le module @code{(guix packages)} exporte les procédures monadiques liées aux paquets suivantes :" - -#. type: deffn -#: doc/guix.texi:4940 -#, no-wrap -msgid "{Monadic Procedure} package-file @var{package} [@var{file}] @" -msgstr "{Procédure Monadique} package-file @var{package} [@var{file}] @" - -#. type: deffn -#: doc/guix.texi:4948 -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 "" -"[#:system (%current-system)] [#:target #f] @\n" -"[#:output \"out\"]\n" -"Renvoie une valeur monadique qui contient le nom de fichier absolu de @var{file} dans le répertoire @var{output} de @var{package}. Lorsque @var{file} est omis, renvoie le nom du répertoire @var{output} de @var{package}. Lorsque @var{target} est vrai, l'utilise comme un triplet de cible pour la compilation croisée." - -#. type: deffn -#: doc/guix.texi:4950 -#, no-wrap -msgid "{Monadic Procedure} package->derivation @var{package} [@var{system}]" -msgstr "{Procédure Monadique} package->derivation @var{package} [@var{system}]" - -#. type: deffnx -#: doc/guix.texi:4951 -#, no-wrap -msgid "{Monadic Procedure} package->cross-derivation @var{package} @" -msgstr "{Procédure Monadique} package->cross-derivation @var{package} @" - -#. type: deffn -#: doc/guix.texi:4955 -msgid "@var{target} [@var{system}] Monadic version of @code{package-derivation} and @code{package-cross-derivation} (@pxref{Defining Packages})." -msgstr "" -"@var{target} [@var{system}]\n" -"Version monadique de @code{package-derivation} et @code{package-cross-derivation} (@pxref{Defining Packages})." - -#. type: cindex -#: doc/guix.texi:4961 -#, no-wrap -msgid "G-expression" -msgstr "G-expression" - -#. type: cindex -#: doc/guix.texi:4962 -#, no-wrap -msgid "build code quoting" -msgstr "quoting du code de construction" - -#. type: Plain text -#: doc/guix.texi:4968 -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 "On a donc des « dérivations » qui représentent une séquence d'actions de construction à effectuer pour produire un élément du dépôt (@pxref{Derivations}). Ces actions de construction sont effectuées lorsqu'on demande au démon de construire effectivement les dérivations ; elles sont lancées par le démon dans un conteneur (@pxref{Invoking guix-daemon})." - -#. type: cindex -#: doc/guix.texi:4969 -#, no-wrap -msgid "strata of code" -msgstr "strate de code" - -#. type: Plain text -#: doc/guix.texi:4981 -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 "Ça ne devrait pas vous surprendre, mais nous aimons écrire ces actions de construction en Scheme. Lorsqu'on fait ça, on fini avec deux @dfn{strates} de code Scheme@footnote{Le terme @dfn{strate} dans ce contexte a été inventé par Manuel Serrano et ses collaborateurs dans le contexte de leur travaux sur Hop. Oleg Kiselyov, qui a écrit des @url{http://okmij.org/ftp/meta-programming/#meta-scheme, essais perspicaces et du code sur le sujet}, utilise le terme de « mise en scène » pour ce genre de génération de code.} : le « code hôte » — le code qui défini les paquets, parle au démon, etc — et le « code côté construction » — le code qui effectue effectivement les actions de construction, comme créer des répertoires, invoquer @code{make}, etc." - -#. type: Plain text -#: doc/guix.texi:4988 -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 "Pour décrire une dérivation et ses actions de construction, on a typiquement besoin d'intégrer le code de construction dans le code hôte. Ça revient à manipuler le code de construction comme de la donnée, et l'homoiconicité de Scheme — le code a une représentation directe en tant que donnée — est très utile pour cela. Mais on a besoin de plus que le mécanisme de @code{quasiquote} en Scheme pour construire des expressions de construction." - -#. type: Plain text -#: doc/guix.texi:4997 -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 "Le module @code{(guix gexp)} implémente les @dfn{G-expressions}, une forme de S-expression adaptée aux expressions de construction. Les G-expression, ou @dfn{gexps}, consistent en gros en trois formes syntaxiques : @code{gexp}, @code{ungexp} et @code{ungexp-splicing} (ou plus simplement : @code{#~}, @code{#$} et @code{#$@@}), qui sont comparable à @code{quasiquote}, @code{unquote} ett @code{unquote-splicing} respectivement (@pxref{Expression Syntax, @code{quasiquote},, guile, GNU Guile Reference Manual}). Cependant il y a des différences majeures :" - -#. type: itemize -#: doc/guix.texi:5002 -msgid "Gexps are meant to be written to a file and run or manipulated by other processes." -msgstr "Les Gexps sont conçues pour être écrites dans un fichier et être lancées ou manipulées par d'autres processus." - -#. type: itemize -#: doc/guix.texi:5007 -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 "Lorsqu'un objet de haut-niveau comme un paquet ou une dérivation est unquotée dans une gexp, le résultat est comme si le nom de fichier de son résultat avait été introduit." - -#. type: itemize -#: doc/guix.texi:5012 -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 "Les gexps transportent des informatinos sur les paquets ou les dérivations auxquels elles se réfèrent, et ces dépendances sont automatiquement ajoutées comme des entrées du processus de construction qui les utilise." - -#. type: cindex -#: doc/guix.texi:5014 doc/guix.texi:5517 -#, no-wrap -msgid "lowering, of high-level objects in gexps" -msgstr "abaissement, des objets haut-niveau dans les gepxs" - -#. type: Plain text -#: doc/guix.texi:5024 -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 "Ce mécanisme n'est pas limité aux paquets et aux dérivations : on peut définir des @dfn{compilateurs} capable « d'abaisser » d'autres objets de haut-niveau ou des fichiers dans le dépôt, pour que ces objets puissent aussi être insérés dans des gexps. Par exemple, des objets haut-niveau utiles qui pourraient être insérées dans une gexp sont les « objets simili-fichiers », qui rendent facile l'ajout de fichiers dans le dépôt et les références vers eux dans les dérivations et autres (voir @code{local-file} et @code{plain-file} ci-dessous)." - -#. type: Plain text -#: doc/guix.texi:5026 -msgid "To illustrate the idea, here is an example of a gexp:" -msgstr "Pour illustrer cette idée, voici un exemple de gexp :" - -#. type: example -#: doc/guix.texi:5034 -#, no-wrap +"\n" +" -u, --upgrade[=REGEXP] mettre à jour tous les paquets installés correspondant à REGEXP" + +#: guix/scripts/package.scm:351 msgid "" -"(define build-exp\n" -" #~(begin\n" -" (mkdir #$output)\n" -" (chdir #$output)\n" -" (symlink (string-append #$coreutils \"/bin/ls\")\n" -" \"list-files\")))\n" +"\n" +" -m, --manifest=FILE create a new profile generation with the manifest\n" +" from FILE" msgstr "" -"(define build-exp\n" -" #~(begin\n" -" (mkdir #$output)\n" -" (chdir #$output)\n" -" (symlink (string-append #$coreutils \"/bin/ls\")\n" -" \"list-files\")))\n" - -#. type: Plain text -#: doc/guix.texi:5039 -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 "Cette gexp peut être passée à @code{gexp->derivation} ; on obtient une dérivation qui construit une répertoire contenant exactement un lien symbolique à @file{/gnu/store/@dots{}-coreutils-8.22/bin/ls} :" - -#. type: example -#: doc/guix.texi:5042 -#, no-wrap -msgid "(gexp->derivation \"the-thing\" build-exp)\n" -msgstr "(gexp->derivation \"the-thing\" build-exp)\n" - -#. type: Plain text -#: doc/guix.texi:5050 -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 "Comme on pourrait s'y attendre, la chaîne @code{\"/gnu/store/@dots{}-coreutils-8.22\"} est substituée à la place de la référence au paquet @var{coreutils} dans le code de construction final, et @var{coreutils} est automatiquement devenu une entrée de la dérivation. De même, @code{#$output} (équivalent à @code{(ungexp output)}) est remplacé par une chaîne de caractères contenant le nom du répertoire de la sortie de la dérivation." - -#. type: cindex -#: doc/guix.texi:5051 -#, no-wrap -msgid "cross compilation" -msgstr "compilation croisée" - -#. type: Plain text -#: doc/guix.texi:5057 -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 "Dans le contexte d'une compilation croisée, il est utile de distinguer entre des références à la construction @emph{native} d'un paquet — qui peut être lancé par l'hôte — et des références à la construction croisée d'un paquet. Pour cela, @code{#+} joue le même rôle que @code{#$}, mais référence une construction native d'un paquet :" - -#. type: example -#: doc/guix.texi:5067 -#, no-wrap +"\n" +" -m, --manifest=FICHIER créer une nouvelle génération de profil avec le\n" +" manifeste dans FICHIER" + +#: guix/scripts/package.scm:354 msgid "" -"(gexp->derivation \"vi\"\n" -" #~(begin\n" -" (mkdir #$output)\n" -" (system* (string-append #+coreutils \"/bin/ln\")\n" -" \"-s\"\n" -" (string-append #$emacs \"/bin/emacs\")\n" -" (string-append #$output \"/bin/vi\")))\n" -" #:target \"mips64el-linux-gnu\")\n" +"\n" +" --do-not-upgrade[=REGEXP] do not upgrade any packages matching REGEXP" msgstr "" -"(gexp->derivation \"vi\"\n" -" #~(begin\n" -" (mkdir #$output)\n" -" (system* (string-append #+coreutils \"/bin/ln\")\n" -" \"-s\"\n" -" (string-append #$emacs \"/bin/emacs\")\n" -" (string-append #$output \"/bin/vi\")))\n" -" #:target \"mips64el-linux-gnu\")\n" - -#. type: Plain text -#: doc/guix.texi:5073 -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 "Dans l'exemple ci-dessus, la construction native de @var{coreutils} est utilisée, pour que @command{ln} puisse effectivement être lancé sur l'hôte ; mais ensuite la construction croisée d'@var{emacs} est utilisée." - -#. type: cindex -#: doc/guix.texi:5074 -#, no-wrap -msgid "imported modules, for gexps" -msgstr "modules importés, pour les gexps" - -#. type: findex -#: doc/guix.texi:5075 -#, no-wrap -msgid "with-imported-modules" -msgstr "with-imported-modules" - -#. type: Plain text -#: doc/guix.texi:5080 -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 "Une autre fonctionnalité, ce sont les @dfn{modules importés} : parfois vous voudriez pouvoir utiliser certains modules Guile de « l'environnement hôte » dans la gexp, donc ces modules devraient être importés dans « l'environnement de construction ». La forme @code{with-imported-modules} vous permet d'exprimer ça :" - -#. type: example -#: doc/guix.texi:5091 -#, no-wrap +"\n" +" --do-not-upgrade[=REGEXP] ne pas mettre à jour les paquets correspondant à REGEXP" + +#: guix/scripts/package.scm:356 msgid "" -"(let ((build (with-imported-modules '((guix build utils))\n" -" #~(begin\n" -" (use-modules (guix build utils))\n" -" (mkdir-p (string-append #$output \"/bin\"))))))\n" -" (gexp->derivation \"empty-dir\"\n" -" #~(begin\n" -" #$build\n" -" (display \"success!\\n\")\n" -" #t)))\n" +"\n" +" --roll-back roll back to the previous generation" msgstr "" -"(let ((build (with-imported-modules '((guix build utils))\n" -" #~(begin\n" -" (use-modules (guix build utils))\n" -" (mkdir-p (string-append #$output \"/bin\"))))))\n" -" (gexp->derivation \"empty-dir\"\n" -" #~(begin\n" -" #$build\n" -" (display \"success!\\n\")\n" -" #t)))\n" - -#. type: Plain text -#: doc/guix.texi:5097 -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 "Dans cet exemple, le module @code{(guix build utils)} est automatiquement récupéré dans l'environnement de construction isolé de notre gexp, pour que @code{(use-modules (guix build utils))} fonctionne comme on s'y attendrait." - -#. type: cindex -#: doc/guix.texi:5098 -#, no-wrap -msgid "module closure" -msgstr "closure de module" - -#. type: findex -#: doc/guix.texi:5099 -#, no-wrap -msgid "source-module-closure" -msgstr "source-module-closure" - -#. type: Plain text -#: doc/guix.texi:5106 -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 "Typiquement, vous voudriez que la @emph{closure} complète du mondule soit importé — c.-à-d.@: le module lui-même et tous les modules dont il dépend — plutôt que seulement le module ; sinon, une tentative de chargement du module échouera à cause des modules dépendants manquants. La procédure @code{source-module-closure} calcule la closure d'un module en cherchant dans ses en-têtes sources, ce qui est pratique dans ce cas :" - -#. type: example -#: doc/guix.texi:5109 -#, no-wrap +"\n" +" --roll-back revenir à la génération antérieure" + +#: guix/scripts/package.scm:358 msgid "" -"(use-modules (guix modules)) ;for 'source-module-closure'\n" "\n" +" --search-paths[=KIND]\n" +" display needed environment variable definitions" msgstr "" -"(use-modules (guix modules)) ;pour 'source-module-closure'\n" "\n" +" --search-paths=[GENRE]\n" +" afficher les définitions de variables d'environnement requises" -#. type: example -#: doc/guix.texi:5118 -#, no-wrap +#: guix/scripts/package.scm:361 guix/scripts/pull.scm:113 msgid "" -"(with-imported-modules (source-module-closure\n" -" '((guix build utils)\n" -" (gnu build vm)))\n" -" (gexp->derivation \"something-with-vms\"\n" -" #~(begin\n" -" (use-modules (guix build utils)\n" -" (gnu build vm))\n" -" @dots{})))\n" +"\n" +" -l, --list-generations[=PATTERN]\n" +" list generations matching PATTERN" msgstr "" -"(with-imported-modules (source-module-closure\n" -" '((guix build utils)\n" -" (gnu build vm)))\n" -" (gexp->derivation \"something-with-vms\"\n" -" #~(begin\n" -" (use-modules (guix build utils)\n" -" (gnu build vm))\n" -" @dots{})))\n" - -#. type: cindex -#: doc/guix.texi:5120 -#, no-wrap -msgid "extensions, for gexps" -msgstr "extensions, des gexps" - -#. type: findex -#: doc/guix.texi:5121 -#, no-wrap -msgid "with-extensions" -msgstr "with-extensions" - -#. type: Plain text -#: doc/guix.texi:5126 -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 "Dans la même idée, parfois vous pouvez souhaiter importer non seulement des modules en Scheme pur, mais aussi des « extensions » comme des liaisons Guile de bibliothèques C ou d'autres paquet « complets ». Disons que vous voulez utiliser le paquet @code{guile-json} du côté de la construction, voici comme procéder :" - -#. type: example -#: doc/guix.texi:5129 -#, no-wrap +"\n" +" -l, --list-generations[=MOTIF]\n" +" lister les générations correspondant à MOTIF" + +#: guix/scripts/package.scm:364 msgid "" -"(use-modules (gnu packages guile)) ;for 'guile-json'\n" "\n" +" -d, --delete-generations[=PATTERN]\n" +" delete generations matching PATTERN" msgstr "" -"(use-modules (gnu packages guile)) ;pour 'guile-json'\n" "\n" +" -d, --delete-generations[=MOTIF]\n" +" supprimer les générations correspondant à MOTIF" -#. type: example -#: doc/guix.texi:5135 -#, no-wrap +#: guix/scripts/package.scm:367 msgid "" -"(with-extensions (list guile-json)\n" -" (gexp->derivation \"something-with-json\"\n" -" #~(begin\n" -" (use-modules (json))\n" -" @dots{})))\n" +"\n" +" -S, --switch-generation=PATTERN\n" +" switch to a generation matching PATTERN" msgstr "" -"(with-extensions (list guile-json)\n" -" (gexp->derivation \"something-with-json\"\n" -" #~(begin\n" -" (use-modules (json))\n" -" @dots{})))\n" - -#. type: Plain text -#: doc/guix.texi:5138 -msgid "The syntactic form to construct gexps is summarized below." -msgstr "La forme syntaxique pour construire des gexps est résumée ci-dessous." - -#. type: deffn -#: doc/guix.texi:5139 -#, no-wrap -msgid "{Scheme Syntax} #~@var{exp}" -msgstr "{Syntaxe Scheme} #~@var{exp}" - -#. type: deffnx -#: doc/guix.texi:5140 -#, no-wrap -msgid "{Scheme Syntax} (gexp @var{exp})" -msgstr "{Syntaxe Scheme} (gexp @var{exp})" - -#. type: deffn -#: doc/guix.texi:5143 -msgid "Return a G-expression containing @var{exp}. @var{exp} may contain one or more of the following forms:" -msgstr "Renvoie une G-expression contenant @var{exp}. @var{exp} peut contenir une ou plusieurs de ces formes :" - -#. type: item -#: doc/guix.texi:5145 -#, no-wrap -msgid "#$@var{obj}" -msgstr "#$@var{obj}" - -#. type: itemx -#: doc/guix.texi:5146 -#, no-wrap -msgid "(ungexp @var{obj})" -msgstr "(ungexp @var{obj})" - -#. type: table -#: doc/guix.texi:5151 -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 "Introduit une référence à @var{obj}. @var{obj} peut être d'un des types supportés, par exemple un paquet ou une dérivation, auquel cas la forme @code{ungexp} est remplacée par le nom de fichier de sa sortie — p.@: ex.@: @code{\"/gnu/store/@dots{}-coreutils-8.22}." - -#. type: table -#: doc/guix.texi:5154 -msgid "If @var{obj} is a list, it is traversed and references to supported objects are substituted similarly." -msgstr "Si @var{boj} est une liste, elle est traversée et les références aux objets supportés sont substitués de manière similaire." - -#. type: table -#: doc/guix.texi:5157 -msgid "If @var{obj} is another gexp, its contents are inserted and its dependencies are added to those of the containing gexp." -msgstr "Si @var{obj} est une autre gexp, son contenu est inséré et ses dépendances sont ajoutées à celle de la gexp qui l'entoure." - -#. type: table -#: doc/guix.texi:5159 -msgid "If @var{obj} is another kind of object, it is inserted as is." -msgstr "Si @var{obj} est un autre type d'objet, il est inséré tel quel." - -#. type: item -#: doc/guix.texi:5160 -#, no-wrap -msgid "#$@var{obj}:@var{output}" -msgstr "#$@var{obj}:@var{output}" - -#. type: itemx -#: doc/guix.texi:5161 -#, no-wrap -msgid "(ungexp @var{obj} @var{output})" -msgstr "(ungexp @var{obj} @var{output})" - -#. type: table -#: doc/guix.texi:5165 -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 "Cette forme est similaire à la précédente, mais se réfère explicitement à la sortie @var{output} de l'objet @var{obj} — c'est utile lorsque @var{obj} produit plusieurs sorties (@pxref{Packages with Multiple Outputs})." - -#. type: item -#: doc/guix.texi:5166 -#, no-wrap -msgid "#+@var{obj}" -msgstr "#+@var{obj}" - -#. type: itemx -#: doc/guix.texi:5167 -#, no-wrap -msgid "#+@var{obj}:output" -msgstr "#+@var{obj}:output" - -#. type: itemx -#: doc/guix.texi:5168 -#, no-wrap -msgid "(ungexp-native @var{obj})" -msgstr "(ungexp-native @var{obj})" - -#. type: itemx -#: doc/guix.texi:5169 -#, no-wrap -msgid "(ungexp-native @var{obj} @var{output})" -msgstr "(ungexp-native @var{obj} @var{output})" - -#. type: table -#: doc/guix.texi:5172 -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 "Comme @code{ungexp}, mais produit une référence à la construction @emph{native} de @var{obj} lorsqu'elle est utilisée dans une compilation croisée." - -#. type: item -#: doc/guix.texi:5173 -#, no-wrap -msgid "#$output[:@var{output}]" -msgstr "#$output[:@var{output}]" - -#. type: itemx -#: doc/guix.texi:5174 -#, no-wrap -msgid "(ungexp output [@var{output}])" -msgstr "(ungexp output [@var{output}])" - -#. type: table -#: doc/guix.texi:5177 -msgid "Insert a reference to derivation output @var{output}, or to the main output when @var{output} is omitted." -msgstr "Insère une référence à la sortie @var{output} de la dérivation, ou à la sortie principale lorsque @var{output} est omis." - -#. type: table -#: doc/guix.texi:5179 -msgid "This only makes sense for gexps passed to @code{gexp->derivation}." -msgstr "Cela ne fait du sens que pour les gexps passées à @code{gexp->derivation}." - -#. type: item -#: doc/guix.texi:5180 -#, no-wrap -msgid "#$@@@var{lst}" -msgstr "#$@@@var{lst}" - -#. type: itemx -#: doc/guix.texi:5181 -#, no-wrap -msgid "(ungexp-splicing @var{lst})" -msgstr "(ungexp-splicing @var{lst})" - -#. type: table -#: doc/guix.texi:5184 -msgid "Like the above, but splices the contents of @var{lst} inside the containing list." -msgstr "Comme au dessus, mais recolle (@i{splice}) le contenu de @var{lst} dans la liste qui la contient." - -#. type: item -#: doc/guix.texi:5185 -#, no-wrap -msgid "#+@@@var{lst}" -msgstr "#+@@@var{lst}" - -#. type: itemx -#: doc/guix.texi:5186 -#, no-wrap -msgid "(ungexp-native-splicing @var{lst})" -msgstr "(ungexp-native-splicing @var{lst})" - -#. type: table -#: doc/guix.texi:5189 -msgid "Like the above, but refers to native builds of the objects listed in @var{lst}." -msgstr "Comme au dessus, mais se réfère à la construction native des objets listés dans @var{lst}." - -#. type: deffn -#: doc/guix.texi:5194 -msgid "G-expressions created by @code{gexp} or @code{#~} are run-time objects of the @code{gexp?} type (see below.)" -msgstr "Les G-expressions crées par @code{gexp} ou @code{#~} sont des objets à l'exécution du type @code{gexp?} (voir plus bas)." - -#. type: deffn -#: doc/guix.texi:5196 -#, no-wrap -msgid "{Scheme Syntax} with-imported-modules @var{modules} @var{body}@dots{}" -msgstr "{Syntaxe Scheme} with-imported-modules @var{modules} @var{body}@dots{}" - -#. type: deffn -#: doc/guix.texi:5199 -msgid "Mark the gexps defined in @var{body}@dots{} as requiring @var{modules} in their execution environment." -msgstr "Marque les gexps définies dans @var{body}@dots{} comme requérant @var{modules} dans leur environnement d'exécution." - -#. type: deffn -#: doc/guix.texi:5203 -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 "Chaque élément dans @var{module} peut être le nom d'un module, comme @code{(guix build utils)} ou le nom d'un module suivi d'une flêche, suivie d'un objet simili-fichier :" - -#. type: example -#: doc/guix.texi:5209 -#, no-wrap +"\n" +" -S, --switch-generation=MOTIF\n" +" basculer vers une génération correspondant à MOTIF" + +#: guix/scripts/package.scm:370 msgid "" -"`((guix build utils)\n" -" (guix gcrypt)\n" -" ((guix config) => ,(scheme-file \"config.scm\"\n" -" #~(define-module @dots{}))))\n" -msgstr "" -"`((guix build utils)\n" -" (guix gcrypt)\n" -" ((guix config) => ,(scheme-file \"config.scm\"\n" -" #~(define-module @dots{}))))\n" - -#. type: deffn -#: doc/guix.texi:5214 -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 "Dans l'exemple au dessus, les deux premiers modules sont récupérés dans le chemin de recherche, et le dernier est créé à partir d'un objet simili-fichier." - -#. type: deffn -#: doc/guix.texi:5218 -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 "Cette forme a une portée @emph{lexicale} : elle a un effet sur les gexp directement définies dans @var{body}@dots{}, mais pas sur celles définies dans des procédures appelées par @var{body}@dots{}." - -#. type: deffn -#: doc/guix.texi:5220 -#, no-wrap -msgid "{Scheme Syntax} with-extensions @var{extensions} @var{body}@dots{}" -msgstr "{Syntaxe Scheme} with-extensions @var{extensions} @var{body}@dots{}" - -#. type: deffn -#: doc/guix.texi:5225 -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 "Marque les gexps définies dans @var{body}@dots{} comme requérant @var{extensions} dans leur environnement de construction et d'exécution. @var{extensions} est typiquement une liste d'objets paquets comme définis dans le module @code{(gnu packages guile)}." - -#. type: deffn -#: doc/guix.texi:5230 -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 "Concrètement, les paquets listés dans @var{extensions} sont ajoutés au chemin de chargement lors de la compilation des modules importés dans @var{body}@dots{} ; ils sont aussi ajoutés au chemin de chargement de la gexp renvoyée par @var{body}@dots{}." - -#. type: deffn -#: doc/guix.texi:5232 -#, no-wrap -msgid "{Scheme Procedure} gexp? @var{obj}" -msgstr "{Procédure Scheme} gexp? @var{obj}" - -#. type: deffn -#: doc/guix.texi:5234 -msgid "Return @code{#t} if @var{obj} is a G-expression." -msgstr "Renvoie @code{#t} si @var{obj} est une G-expression." - -#. type: Plain text -#: doc/guix.texi:5240 -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 "Les G-expressions sont conçues pour être écrites sur le disque, soit en tant que code pour construire une dérivation, soit en tant que fichier normal dans le dépôt. Les procédure monadiques suivantes vous permettent de faire cela (@pxref{The Store Monad}, pour plus d'information sur les monads)." - -#. type: deffn -#: doc/guix.texi:5241 -#, no-wrap -msgid "{Monadic Procedure} gexp->derivation @var{name} @var{exp} @" -msgstr "{Procédure Monadique} gexp->derivation @var{name} @var{exp} @" - -#. type: deffn -#: doc/guix.texi:5258 -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] [#: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}." +"\n" +" -p, --profile=PROFILE use PROFILE instead of the user's default profile" msgstr "" -"[#:system (%current-system)] [#:target #f] [#:graft? #t] @\n" -"[#:hash #f] [#:hash-algo #f] @\n" -"[#:recursive? #f] [#:env-vars '()] [#:modules '()] @\n" -"[#:module-path @var{%load-path}] @\n" -"[#:effective-version \"2.2\"] @\n" -"[#:references-graphs #f] [#:allowed-references #f] @\n" -"[#:disallowed-references #f] @\n" -"[#:leaked-env-vars #f] @\n" -"[#:script-name (string-append @var{name} \"-builder\")] @\n" -"[#:deprecation-warnings #f] @\n" -"[#:local-build? #f] [#:substitutable? #t] [#:guile-for-build #f]\n" -"Renvoie une dérivation @var{name} qui lance @var{exp} (une gexp) avec @var{guile-for-build} (une dérivation) sur @var{system} ; @var{exp} est stocké dans un fichier appelé @var{script-name}. Lorsque @var{target} est vraie, elle est utilisée comme triplet de cible de compilation croisée pour les paquets référencés par @var{exp}." - -#. type: deffn -#: doc/guix.texi:5266 -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 "@var{modules} est devenu obsolète en faveur de @code{with-imported-modules}. Sa signification est de rendre @var{modules} disponibles dans le contexte d'évaluation de @var{exp} ; @var{modules} est une liste de noms de modules Guile qui sont cherchés dans @var{module-path} pour les copier dans le dépôt, les compiler et les rendre disponibles dans le chemin de chargement pendant l'exécution de @var{exp} — p.@: ex.@: @code{((guix build utils) (guix build gnu-build-system))}." - -#. type: deffn -#: doc/guix.texi:5269 -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 "@var{effective-version} détermine la chaîne à utiliser lors d'ajout d'extensions de @var{exp} (voir @code{with-extensions}) au chemin de recherche — p.@: ex.@: @code{\"2.2\"}." - -#. type: deffn -#: doc/guix.texi:5272 -msgid "@var{graft?} determines whether packages referred to by @var{exp} should be grafted when applicable." -msgstr "@var{graft?} détermine si les paquets référencés par @var{exp} devraient être greffés si possible." - -#. type: deffn -#: doc/guix.texi:5275 -msgid "When @var{references-graphs} is true, it must be a list of tuples of one of the following forms:" -msgstr "Lorsque @var{references-graphs} est vrai, il doit s'agir d'une liste de tuples de la forme suivante :" - -#. type: example -#: doc/guix.texi:5282 -#, no-wrap +"\n" +" -p, --profile=PROFIL utiliser PROFIL au lieu du profil par défaut de l'utilisateur" + +#: guix/scripts/package.scm:373 msgid "" -"(@var{file-name} @var{package})\n" -"(@var{file-name} @var{package} @var{output})\n" -"(@var{file-name} @var{derivation})\n" -"(@var{file-name} @var{derivation} @var{output})\n" -"(@var{file-name} @var{store-item})\n" +"\n" +" --allow-collisions do not treat collisions in the profile as an error" msgstr "" -"(@var{file-name} @var{package})\n" -"(@var{file-name} @var{package} @var{output})\n" -"(@var{file-name} @var{derivation})\n" -"(@var{file-name} @var{derivation} @var{output})\n" -"(@var{file-name} @var{store-item})\n" - -#. type: deffn -#: doc/guix.texi:5288 -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 "La partie droite des éléments de @var{references-graphs} est automatiquement transformée en une entrée du processus de construction @var{exp}. Dans l'environnement de construction, chaque @var{file-name} contient le graphe des références de l'élément correspondant, dans un format texte simple." - -#. type: deffn -#: doc/guix.texi:5294 -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 "@var{allowed-references} doit soit être @code{#f}, soit une liste de noms de sorties ou de paquets. Dans ce dernier cas, la liste dénote les éléments du dépôt auxquels le résultat a le droit de faire référence. Toute référence à un autre élément du dépôt conduira à une erreur à la construction. Comme pour @var{disallowed-references}, qui peut lister des éléments qui ne doivent pas être référencés par les sorties." - -#. type: deffn -#: doc/guix.texi:5297 -msgid "@var{deprecation-warnings} determines whether to show deprecation warnings while compiling modules. It can be @code{#f}, @code{#t}, or @code{'detailed}." -msgstr "@var{deprecation-warnings} détermine s'il faut afficher les avertissement d'obsolescence à la compilation de modules. Il peut valoir @code{#f}, @code{t} ou @code{'detailed}." - -#. type: deffn -#: doc/guix.texi:5299 -msgid "The other arguments are as for @code{derivation} (@pxref{Derivations})." -msgstr "Les autres arguments sont les mêmes que pour @code{derivation} (@pxref{Derivations})." - -#. type: cindex -#: doc/guix.texi:5301 -#, no-wrap -msgid "file-like objects" -msgstr "objets simili-fichiers" - -#. type: Plain text -#: doc/guix.texi:5306 -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 "Les procédures @code{local-file}, @code{plain-file}, @code{computed-file}, @code{program-file} et @code{scheme-file} ci-dessous renvoient des @dfn{objets simili-fichiers}. C'est-à-dire, lorsqu'ils sont unquotés dans une G-expression, ces objets donnent un fichier dans le dépôt. Considérez cette G-expression :" - -#. type: example -#: doc/guix.texi:5310 -#, no-wrap +"\n" +" --allow-collisions ne pas traiter les collisions dans le profil comme une erreur" + +#: guix/scripts/package.scm:375 msgid "" -"#~(system* #$(file-append glibc \"/sbin/nscd\") \"-f\"\n" -" #$(local-file \"/tmp/my-nscd.conf\"))\n" -msgstr "" -"#~(system* #$(file-append glibc \"/sbin/nscd\") \"-f\"\n" -" #$(local-file \"/tmp/my-nscd.conf\"))\n" - -#. type: Plain text -#: doc/guix.texi:5319 -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 "Ici, l'effet est « d'internaliser » @file{/tmp/my-nscd.conf} en le copiant dans le dépôt. Une fois étendu, par exemple via @code{gexp->derivation}, la G-expression se réfère à cette copie dans @file{/gnu/store} ; ainsi, modifier ou supprimer le fichier dans @file{/tmp} n'a aucun effet sur ce que fait la G-expression. @code{plain-file} peut être utilisé de la même manière ; elle est seulement différente par le fait que le contenu du fichier est passé directement par une chaîne de caractères." - -#. type: deffn -#: doc/guix.texi:5320 -#, no-wrap -msgid "{Scheme Procedure} local-file @var{file} [@var{name}] @" -msgstr "{Procédure Scheme} local-file @var{file} [@var{name}] @" - -#. type: deffn -#: doc/guix.texi:5326 -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 relative file name, it is looked up relative to the source file where this form appears. @var{file} will be added to the store under @var{name}--by default the base name of @var{file}." -msgstr "" -"[#:recursive? #f] [#:select? (const #t)]\n" -"Renvoie un objet représentant un fichier local @var{file} à ajouter au dépôt ; cet objet peut être utilisé dans une gexp. Si @var{file} est un nom de fichier relatif, il est récupéré à partir de la position du fichier source dans lequel il apparaît. @var{file} sera ajouté au dépôt sous le nom @var{name} — par défaut le nom de base de @var{file}." - -#. type: deffn -#: doc/guix.texi:5338 -msgid "This is the declarative counterpart of the @code{interned-file} monadic procedure (@pxref{The Store Monad, @code{interned-file}})." -msgstr "C'est la version déclarative de la procédure monadique @code{interned-file} (@pxref{The Store Monad, @code{interned-file}})." - -#. type: deffn -#: doc/guix.texi:5340 -#, no-wrap -msgid "{Scheme Procedure} plain-file @var{name} @var{content}" -msgstr "{Procédure Scheme} plain-file @var{name} @var{content}" - -#. type: deffn -#: doc/guix.texi:5343 -msgid "Return an object representing a text file called @var{name} with the given @var{content} (a string) to be added to the store." -msgstr "Renvoie un objet représentant un fichier texte nommé @var{name} avec pour contenu @var{content} (une chaîne de caractères) à ajouter un dépôt." - -#. type: deffn -#: doc/guix.texi:5345 -msgid "This is the declarative counterpart of @code{text-file}." -msgstr "C'est la version déclarative de @code{text-file}." - -#. type: deffn -#: doc/guix.texi:5347 -#, no-wrap -msgid "{Scheme Procedure} computed-file @var{name} @var{gexp} @" -msgstr "{Procédure Scheme} computed-file @var{name} @var{gexp} @" - -#. type: deffn -#: doc/guix.texi:5352 -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 "" -"[#:options '(#:local-build? #t)]\n" -"Renvoie un objet représentant un élément du dépôt @var{name}, un fichier ou un répertoire calculé par @var{gexp}. @var{options} est une liste d'arguments supplémentaires à passer à @code{gexp->derivation}." - -#. type: deffn -#: doc/guix.texi:5354 -msgid "This is the declarative counterpart of @code{gexp->derivation}." -msgstr "C'est la version déclarative de @code{gexp->derivation}." - -#. type: deffn -#: doc/guix.texi:5356 -#, no-wrap -msgid "{Monadic Procedure} gexp->script @var{name} @var{exp} @" -msgstr "{Procédure monadique} gexp->script @var{name} @var{exp} @" - -#. type: deffn -#: doc/guix.texi:5361 -msgid "[#:guile (default-guile)] [#:module-path %load-path] 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}." +"\n" +" --bootstrap use the bootstrap Guile to build the profile" msgstr "" -"[#:guile (default-guile)] [#:module-path %load-path]\n" -"Renvoie un script exécutable @var{name} qui lance @var{exp} avec @var{guile}, avec les modules importés de @var{exp} dans son chemin de recherche. Cherche les modules de @var{exp} dans @var{module-path}." - -#. type: deffn -#: doc/guix.texi:5364 -msgid "The example below builds a script that simply invokes the @command{ls} command:" -msgstr "L'exemple ci-dessous construit un script qui invoque simplement la commande @command{ls} :" +"\n" +" --bootstrap utiliser le programme d'amorçage Guile pour compiler le profil" -#. type: example -#: doc/guix.texi:5367 -#, no-wrap +#: guix/scripts/package.scm:377 guix/scripts/pull.scm:105 msgid "" -"(use-modules (guix gexp) (gnu packages base))\n" "\n" +" --verbose produce verbose output" msgstr "" -"(use-modules (guix gexp) (gnu packages base))\n" "\n" +" --verbose produire une sortie verbeuse" -#. type: example -#: doc/guix.texi:5371 -#, no-wrap +#: guix/scripts/package.scm:380 msgid "" -"(gexp->script \"list-files\"\n" -" #~(execl #$(file-append coreutils \"/bin/ls\")\n" -" \"ls\"))\n" +"\n" +" -s, --search=REGEXP search in synopsis and description using REGEXP" msgstr "" -"(gexp->script \"list-files\"\n" -" #~(execl #$(file-append coreutils \"/bin/ls\")\n" -" \"ls\"))\n" - -#. type: deffn -#: doc/guix.texi:5376 -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 "Lorsqu'elle est « lancée » à travers le dépôt (@pxref{The Store Monad, @code{run-with-store}}), on obtient une dérivation qui produit une fichier exécutable @file{/gnu/store/@dots{}-list-files} qui ressemble à :" - -#. type: example -#: doc/guix.texi:5381 -#, no-wrap +"\n" +" -s, --search=REGEXP chercher dans le synopsis et la description en utilisant REGEXP" + +#: guix/scripts/package.scm:382 msgid "" -"#!/gnu/store/@dots{}-guile-2.0.11/bin/guile -ds\n" -"!#\n" -"(execl \"/gnu/store/@dots{}-coreutils-8.22\"/bin/ls\" \"ls\")\n" -msgstr "" -"#!/gnu/store/@dots{}-guile-2.0.11/bin/guile -ds\n" -"!#\n" -"(execl \"/gnu/store/@dots{}-coreutils-8.22\"/bin/ls\" \"ls\")\n" - -#. type: deffn -#: doc/guix.texi:5384 -#, no-wrap -msgid "{Scheme Procedure} program-file @var{name} @var{exp} @" -msgstr "{Procédure Scheme} program-file @var{name} @var{exp} @" - -#. type: deffn -#: doc/guix.texi:5389 -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 "" -"[#:guile #f] [#:module-path %load-path]\n" -"Renvoie un objet représentant un élément du dépôt @var{name} qui lance @var{gexp}. @var{guile} est le paquet Guile à utiliser pour exécuter le script. Les modules importés par @var{gexp} sont recherchés dans @var{module-path}." - -#. type: deffn -#: doc/guix.texi:5391 -msgid "This is the declarative counterpart of @code{gexp->script}." -msgstr "C'est la version déclarative de @code{gexp->script}." - -#. type: deffn -#: doc/guix.texi:5393 -#, no-wrap -msgid "{Monadic Procedure} gexp->file @var{name} @var{exp} @" -msgstr "{Procédure monadique} gexp->file @var{name} @var{exp} @" - -#. type: deffn -#: doc/guix.texi:5400 -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." +"\n" +" -I, --list-installed[=REGEXP]\n" +" list installed packages matching REGEXP" msgstr "" -"[#:set-load-path? #t] [#:module-path %load-path] @\n" -"[#:splice? #f] @\n" -"[#:guile (default-guile)]\n" -"Renvoie une dérivation qui construit un fichier @var{name} contenant @var{exp}. Lorsque @var{splice?} est vrai, @var{exp} est considéré comme une liste d'expressions qui seront splicée dans le fichier qui en résulte." - -#. type: deffn -#: doc/guix.texi:5405 -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 "Lorsque @var{set-load-path?} est vrai, émet du code dans le fichier de résultat pour initialiser @code{%load-path} et @code{%load-compiled-path} pour honorer les modules importés de @var{exp}. Les modules de @var{exp} sont trouvés dans @var{module-path}." - -#. type: deffn -#: doc/guix.texi:5408 -msgid "The resulting file holds references to all the dependencies of @var{exp} or a subset thereof." -msgstr "Le fichier qui en résulte retient les références à toutes les dépendances de @var{exp} ou un sous-ensemble." - -#. type: deffn -#: doc/guix.texi:5410 -#, no-wrap -msgid "{Scheme Procedure} scheme-file @var{name} @var{exp} [#:splice? #f]" -msgstr "{Procédure Scheme} scheme-file @var{name} @var{exp} [#:splice? #f]" - -#. type: deffn -#: doc/guix.texi:5413 -msgid "Return an object representing the Scheme file @var{name} that contains @var{exp}." -msgstr "Renvoie un objet représentant le fichier Scheme @var{name} qui contient @var{exp}." - -#. type: deffn -#: doc/guix.texi:5415 -msgid "This is the declarative counterpart of @code{gexp->file}." -msgstr "C'est la version déclarative de @code{gexp->file}." - -#. type: deffn -#: doc/guix.texi:5417 -#, no-wrap -msgid "{Monadic Procedure} text-file* @var{name} @var{text} @dots{}" -msgstr "{Procédure monadique} text-file* @var{name} @var{text} @dots{}" - -#. type: deffn -#: doc/guix.texi:5423 -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 "Renvoie une valeur monadique qui construit un ficher texte contenant @var{text}. @var{text} peut lister, en plus de chaînes de caractères, des objet de n'importe quel type qui peut être utilisé dans une gexp : des paquets, des dérivations, des fichiers objet locaux, etc. Le fichier du dépôt qui en résulte en retient toutes les références." - -#. type: deffn -#: doc/guix.texi:5428 -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 "Cette variante devrait être préférée à @code{text-file} lorsque vous souhaitez créer des fichiers qui référencent le dépôt. Cela est le cas typiquement lorsque vous construisez un fichier de configuration qui contient des noms de fichiers du dépôt, comme ceci :" - -#. type: example -#: doc/guix.texi:5436 -#, no-wrap +"\n" +" -I, --list-installed[=REGEXP]\n" +" lister les paquets installés correspondant à REGEXP" + +#: guix/scripts/package.scm:385 msgid "" -"(define (profile.sh)\n" -" ;; Return the name of a shell script in the store that\n" -" ;; initializes the 'PATH' environment variable.\n" -" (text-file* \"profile.sh\"\n" -" \"export PATH=\" coreutils \"/bin:\"\n" -" grep \"/bin:\" sed \"/bin\\n\"))\n" +"\n" +" -A, --list-available[=REGEXP]\n" +" list available packages matching REGEXP" msgstr "" -"(define (profile.sh)\n" -" ;; Renvoie le nom d'un script shell dans le dépôt qui initialise\n" -" ;; la variable d'environnement « PATH ».\n" -" (text-file* \"profile.sh\"\n" -" \"export PATH=\" coreutils \"/bin:\"\n" -" grep \"/bin:\" sed \"/bin\\n\"))\n" - -#. type: deffn -#: doc/guix.texi:5441 -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 "Dans cet exemple, le fichier @file{/gnu/store/@dots{}-profile.sh} qui en résulte référence @var{coreutils}, @var{grep} et @var{sed}, ce qui les empêche d'être glanés tant que le script est accessible." - -#. type: deffn -#: doc/guix.texi:5443 -#, no-wrap -msgid "{Scheme Procedure} mixed-text-file @var{name} @var{text} @dots{}" -msgstr "{Procédure Scheme} mixed-text-file @var{name} @var{text} @dots{}" - -#. type: deffn -#: doc/guix.texi:5447 -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 "Renvoie un objet représentant le fichier du dépôt @var{name} contenant @var{text}. @var{text} est une séquence de chaînes de caractères et de fichiers simili-objets, comme dans :" - -#. type: example -#: doc/guix.texi:5451 -#, no-wrap +"\n" +" -A, --list-available[=REGEXP]\n" +" lister les paquets disponibles correspondant à REGEXP" + +#: guix/scripts/package.scm:388 msgid "" -"(mixed-text-file \"profile\"\n" -" \"export PATH=\" coreutils \"/bin:\" grep \"/bin\")\n" +"\n" +" --show=PACKAGE show details about PACKAGE" msgstr "" -"(mixed-text-file \"profile\"\n" -" \"export PATH=\" coreutils \"/bin:\" grep \"/bin\")\n" - -#. type: deffn -#: doc/guix.texi:5454 -msgid "This is the declarative counterpart of @code{text-file*}." -msgstr "C'est la version déclarative de @code{text-file*}." - -#. type: deffn -#: doc/guix.texi:5456 -#, no-wrap -msgid "{Scheme Procedure} file-union @var{name} @var{files}" -msgstr "{Procédure Scheme} file-union @var{name} @var{files}" - -#. type: deffn -#: doc/guix.texi:5461 -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 "Renvoie un @code{} qui construit un répertoire qui contient tous les fichiers de @var{files}. Chaque élément de @var{files} doit être une paire où le premier élément est le nom de fichier à utiliser dans le nouveau répertoire et le second élément est une gexp dénotant le fichier cible. Voici un exemple :" - -#. type: example -#: doc/guix.texi:5468 -#, no-wrap +"\n" +" --show=PAQUET montrer des détails du PAQUET" + +#: guix/scripts/package.scm:440 +#, scheme-format +msgid "upgrade regexp '~a' looks like a command-line option~%" +msgstr "l'expression régulière « ~a » ressemble à une option de la ligne de commande~%" + +#: guix/scripts/package.scm:443 +#, scheme-format +msgid "is this intended?~%" +msgstr "est-ce intentionnel ?~%" + +#: guix/scripts/package.scm:488 +#, scheme-format +msgid "~a: unsupported kind of search path~%" +msgstr "~a : type de chemin de recherche non supporté~%" + +#: guix/scripts/package.scm:789 +#, scheme-format +msgid "cannot switch to generation '~a'~%" +msgstr "impossible de passer à la génération « ~a »~%" + +#: guix/scripts/package.scm:806 +#, scheme-format +msgid "would install new manifest from '~a' with ~d entries~%" +msgstr "installerait le nouveau manifeste depuis « ~a » avec ~d entrées~%" + +#: guix/scripts/package.scm:808 +#, scheme-format +msgid "installing new manifest from '~a' with ~d entries~%" +msgstr "installation du nouveau manifeste depuis « ~a » avec ~d entrées~%" + +#: guix/scripts/gc.scm:42 msgid "" -"(file-union \"etc\"\n" -" `((\"hosts\" ,(plain-file \"hosts\"\n" -" \"127.0.0.1 localhost\"))\n" -" (\"bashrc\" ,(plain-file \"bashrc\"\n" -" \"alias ls='ls --color'\"))))\n" +"Usage: guix gc [OPTION]... PATHS...\n" +"Invoke the garbage collector.\n" msgstr "" -"(file-union \"etc\"\n" -" `((\"hosts\" ,(plain-file \"hosts\"\n" -" \"127.0.0.1 localhost\"))\n" -" (\"bashrc\" ,(plain-file \"bashrc\"\n" -" \"alias ls='ls --color'\"))))\n" - -#. type: deffn -#: doc/guix.texi:5471 -msgid "This yields an @code{etc} directory containing these two files." -msgstr "Cela crée un répertoire @code{etc} contenant ces deux fichiers." - -#. type: deffn -#: doc/guix.texi:5473 -#, no-wrap -msgid "{Scheme Procedure} directory-union @var{name} @var{things}" -msgstr "{Procédure Scheme} directory-union @var{name} @var{things}" - -#. type: deffn -#: doc/guix.texi:5476 -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 "Renvoie un répertoire qui est l'union de @var{things}, où @var{things} est une liste d'objets simili-fichiers qui dénotent des répertoires. Par exemple :" - -#. type: example -#: doc/guix.texi:5479 -#, no-wrap -msgid "(directory-union \"guile+emacs\" (list guile emacs))\n" -msgstr "(directory-union \"guile+emacs\" (list guile emacs))\n" - -#. type: deffn -#: doc/guix.texi:5482 -msgid "yields a directory that is the union of the @code{guile} and @code{emacs} packages." -msgstr "crée un répertoire qui est l'union des paquets @code{guile} et @code{emacs}." - -#. type: deffn -#: doc/guix.texi:5484 -#, no-wrap -msgid "{Scheme Procedure} file-append @var{obj} @var{suffix} @dots{}" -msgstr "{Procédure Scheme} file-append @var{obj} @var{suffix} @dots{}" - -#. type: deffn -#: doc/guix.texi:5488 -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 "Renvoie un objet simili-fichier qui correspond à la concaténation de @var{obj} et @var{suffix} où @var{obj} est un objet abaissable et chaque @var{suffix} est une chaîne de caractères." - -#. type: deffn -#: doc/guix.texi:5490 -msgid "As an example, consider this gexp:" -msgstr "Par exemple, considérez cette gexp :" - -#. type: example -#: doc/guix.texi:5495 -#, no-wrap +"Usage : guix gc [OPTION]... CHEMINS...\n" +"Appeler le ramasse-miettes (GC).\n" + +#: guix/scripts/gc.scm:44 msgid "" -"(gexp->script \"run-uname\"\n" -" #~(system* #$(file-append coreutils\n" -" \"/bin/uname\")))\n" +"\n" +" -C, --collect-garbage[=MIN]\n" +" collect at least MIN bytes of garbage" msgstr "" -"(gexp->script \"run-uname\"\n" -" #~(system* #$(file-append coreutils\n" -" \"/bin/uname\")))\n" - -#. type: deffn -#: doc/guix.texi:5498 -msgid "The same effect could be achieved with:" -msgstr "On peut obtenir le même effet avec :" - -#. type: example -#: doc/guix.texi:5503 -#, no-wrap +"\n" +" -C, --collect-garbage[=MIN]\n" +" collecter au moins MIN octets dans le ramasse-miettes" + +#: guix/scripts/gc.scm:47 msgid "" -"(gexp->script \"run-uname\"\n" -" #~(system* (string-append #$coreutils\n" -" \"/bin/uname\")))\n" -msgstr "" -"(gexp->script \"run-uname\"\n" -" #~(system* (string-append #$coreutils\n" -" \"/bin/uname\")))\n" - -#. type: deffn -#: doc/guix.texi:5509 -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 "Il y a une différence cependant : dans le cas @code{file-append}, le script qui en résulte contient le nom de fichier absolu comme une chaîne de caractère alors que dans le deuxième cas, le script contient une expression @code{(string-append @dots{})} pour construire le nom de fichier @emph{à l'exécution}." - -#. type: Plain text -#: doc/guix.texi:5516 -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 "Bien sûr, en plus de gexps inclues dans le code « hôte », certains modules contiennent des outils de construction. Pour savoir facilement qu'ils sont à utiliser dans la strate de construction, ces modules sont gardés dans l'espace de nom @code{(guix build @dots{})}." - -#. type: Plain text -#: doc/guix.texi:5522 -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 "En interne, les objets de haut-niveau sont @dfn{abaissés}, avec leur compilateur, soit en des dérivations, soit en des objets du dépôt. Par exemple, abaisser un paquet crée une dérivation, et abaisser un @code{plain-file} crée un élément du dépôt. Cela est effectué par la procédure monadique @code{lower-object}." - -#. type: deffn -#: doc/guix.texi:5523 -#, no-wrap -msgid "{Monadic Procedure} lower-object @var{obj} [@var{system}] @" -msgstr "{Procédure Monadique} lower-object @var{obj} [@var{system}] @" - -#. type: deffn -#: doc/guix.texi:5529 -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{}." +"\n" +" -F, --free-space=FREE attempt to reach FREE available space in the store" msgstr "" -"[#:target #f]\n" -"Renvoie la dérivation ou l'élément du dépôt comme une valeur de @var{%store-monad} qui correspond à @var{obj} pour @var{system}, en compilant de manière croisée pour @var{target} si @var{target} est vrai. @var{obj} doit être un objet qui a un compilateur de gexp associé, comme un @code{}." - -#. type: Plain text -#: doc/guix.texi:5540 -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 "cette section décrit les utilitaires en ligne de commande de Guix. certains sont surtout faits pour les développeurs qui écrivent de nouvelles définitions de paquets tandis que d'autres sont plus utiles pour une utilisation générale. Ils complètent l'interface de programmation Scheme de Guix d'une manière pratique." - -#. type: cindex -#: doc/guix.texi:5562 -#, no-wrap -msgid "package building" -msgstr "construction de paquets" - -#. type: command{#1} -#: doc/guix.texi:5563 -#, no-wrap -msgid "guix build" -msgstr "guix build" - -#. type: Plain text -#: doc/guix.texi:5569 -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 "La commande @command{guix build} construit des paquets ou des dérivations et leurs dépendances et affiche les chemins du dépôt qui en résulte. Remarquez qu'elle ne modifie pas le profil de l'utilisateur — c'est le travail de la commande @command{guix package} (@pxref{Invoking guix package}). Ainsi, elle est surtout utile pour les développeurs de la distribution." - -#. type: Plain text -#: doc/guix.texi:5571 doc/guix.texi:6235 doc/guix.texi:6302 doc/guix.texi:6995 -#: doc/guix.texi:7333 doc/guix.texi:7663 doc/guix.texi:7968 doc/guix.texi:8034 -#: doc/guix.texi:8073 -msgid "The general syntax is:" -msgstr "La syntaxe générale est :" - -#. type: example -#: doc/guix.texi:5574 -#, no-wrap -msgid "guix build @var{options} @var{package-or-derivation}@dots{}\n" -msgstr "guix build @var{options} @var{package-or-derivation}@dots{}\n" - -#. type: Plain text -#: doc/guix.texi:5579 -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 "Par exemple, la commande suivante construit la dernière version d'Emacs et de Guile, affiche leur journaux de construction et enfin affiche les répertoires des résultats :" - -#. type: example -#: doc/guix.texi:5582 -#, no-wrap -msgid "guix build emacs guile\n" -msgstr "guix build emacs guile\n" - -#. type: Plain text -#: doc/guix.texi:5585 -msgid "Similarly, the following command builds all the available packages:" -msgstr "De même, la commande suivante construit tous les paquets disponibles :" - -#. type: example -#: doc/guix.texi:5589 -#, no-wrap +"\n" +" -F, --free-space=LIBRE essayer d'atteindre LIBRE espace dans le dépôt" + +#: guix/scripts/gc.scm:49 msgid "" -"guix build --quiet --keep-going \\\n" -" `guix package -A | cut -f1,2 --output-delimiter=@@`\n" +"\n" +" -d, --delete attempt to delete PATHS" msgstr "" -"guix build --quiet --keep-going \\\n" -" `guix package -A | cut -f1,2 --output-delimiter=@@`\n" - -#. type: Plain text -#: doc/guix.texi:5597 -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 "@var{package-or-derivation} peut être soit le nom d'un paquet trouvé dans la distribution logicielle comme @code{coreutils}, soit @code{coreutils@@8.20}, soit une dérivation comme @file{/gnu/store/@dots{}-coreutils-8.19.drv}. Dans le premier cas, la commande cherchera un paquet avec le nom correspondant (et éventuellement la version) dans les modules de la distribution GNU (@pxref{Package Modules})." - -#. type: Plain text -#: doc/guix.texi:5602 -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 "Autrement, l'option @code{--expression} peut être utilisée pour spécifier une expression Scheme qui s'évalue en un paquet ; c'est utile pour différencier des paquets avec le même nom ou des variantes de paquets." - -#. type: Plain text -#: doc/guix.texi:5605 -msgid "There may be zero or more @var{options}. The available options are described in the subsections below." -msgstr "Il peut y avoir aucune, une ou plusieurs @var{options}. Les options disponibles sont décrites dans les sous-sections ci-dessous." - -#. type: Plain text -#: doc/guix.texi:5620 -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 "Un certain nombre d'options qui contrôlent le processus de construction sont communes avec @command{guix build} et les autres commandes qui peuvent générer des constructions, comme @command{guix package} ou @command{guix archive}. Voici ces options :" - -#. type: item -#: doc/guix.texi:5623 -#, no-wrap -msgid "--load-path=@var{directory}" -msgstr "--load-path=@var{répertoire}" - -#. type: itemx -#: doc/guix.texi:5624 -#, no-wrap -msgid "-L @var{directory}" -msgstr "-L @var{répertoire}" - -#. type: table -#: doc/guix.texi:5627 -msgid "Add @var{directory} to the front of the package module search path (@pxref{Package Modules})." -msgstr "Ajoute @var{répertoire} au début du chemin de recherche de module de paquets (@pxref{Package Modules})." - -#. type: table -#: doc/guix.texi:5630 -msgid "This allows users to define their own packages and make them visible to the command-line tools." -msgstr "Cela permet à des utilisateurs de définir leur propres paquets et les rendre disponibles aux outils en ligne de commande." - -#. type: item -#: doc/guix.texi:5631 -#, no-wrap -msgid "--keep-failed" -msgstr "--keep-failed" - -#. type: itemx -#: doc/guix.texi:5632 -#, no-wrap -msgid "-K" -msgstr "-K" - -#. type: table -#: doc/guix.texi:5638 -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 "Garde l'arborescence de construction des constructions en échec. Ainsi, si une construction échoue, son arborescence de construction est préservée dans @file{/tmp}, dans un répertoire dont le nom est affiché à la fin du journal de construction. Cela est utile pour déboguer des échecs de construction. @xref{Debugging Build Failures}, pour des astuces sur la manière de déboguer des problèmes de construction." - -#. type: item -#: doc/guix.texi:5639 -#, no-wrap -msgid "--keep-going" -msgstr "--keep-going" - -#. type: itemx -#: doc/guix.texi:5640 -#, no-wrap -msgid "-k" -msgstr "-k" - -#. type: table -#: doc/guix.texi:5643 -msgid "Keep going when some of the derivations fail to build; return only once all the builds have either completed or failed." -msgstr "Continue lorsque certaines dérivations échouent ; ne s'arrête que lorsque toutes les constructions ont soit réussies, soit échouées." - -#. type: table -#: doc/guix.texi:5646 -msgid "The default behavior is to stop as soon as one of the specified derivations has failed." -msgstr "Le comportement par défaut est de s'arrêter dès qu'une des dérivations spécifiées échoue." - -#. type: item -#: doc/guix.texi:5647 -#, no-wrap -msgid "--dry-run" -msgstr "--dry-run" - -#. type: itemx -#: doc/guix.texi:5648 -#, no-wrap -msgid "-n" -msgstr "-n" - -#. type: table -#: doc/guix.texi:5650 -msgid "Do not build the derivations." -msgstr "Ne pas construire les dérivations." - -#. type: anchor{#1} -#: doc/guix.texi:5652 -msgid "fallback-option" -msgstr "option de repli" - -#. type: item -#: doc/guix.texi:5652 -#, no-wrap -msgid "--fallback" -msgstr "--fallback" - -#. type: table -#: doc/guix.texi:5655 -msgid "When substituting a pre-built binary fails, fall back to building packages locally (@pxref{Substitution Failure})." -msgstr "Lorsque la substitution d'un binaire pré-compilé échoue, construit les paquets localement à la place (@pxref{Substitution Failure})." - -#. type: anchor{#1} -#: doc/guix.texi:5661 -msgid "client-substitute-urls" -msgstr "client-substitute-urls" - -#. type: table -#: doc/guix.texi:5661 -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 "Considère @var{urls} comme une liste d'URL de sources de substituts séparés par des espaces, et remplace la liste par défaut d'URL de @command{guix-daemon} (@pxref{daemon-substitute-urls,, @command{guix-daemon} URLs})." - -#. type: table -#: doc/guix.texi:5665 -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 "Cela signifie que les substituts peuvent être téléchargés depuis @var{urls}, tant qu'ils sont signés par une clef autorisée par l'administrateur système (@pxref{Substituts})." - -#. type: table -#: doc/guix.texi:5668 -msgid "When @var{urls} is the empty string, substitutes are effectively disabled." -msgstr "Lorsque @var{urls} est la chaîne vide, cela a pour effet de désactiver la substitution." - -#. type: item -#: doc/guix.texi:5674 -#, no-wrap -msgid "--no-grafts" -msgstr "--no-grafts" - -#. type: table -#: doc/guix.texi:5678 -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 "Ne par « greffer » les paquets. En pratique, cela signifie que les mises à jour des paquets disponibles comme des greffes ne sont pas appliquées. @xref{Security Updates}, pour plus d'information sur les greffes." - -#. type: item -#: doc/guix.texi:5679 -#, no-wrap -msgid "--rounds=@var{n}" -msgstr "--rounds=@var{n}" - -#. type: table -#: doc/guix.texi:5682 -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 "Construit chaque dérivation @var{n} fois d'affilé, et renvoie une erreur si les constructions consécutives ne sont pas identiques bit-à-bit." - -#. type: table -#: doc/guix.texi:5687 -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 "Cela est une manière utile pour détecter des processus de construction non déterministes. Les processus de construction non déterministes sont problématiques car ils rendent pratiquement impossible la @emph{vérification} par les utilisateurs de l'authenticité de binaires tiers. @xref{Invoking guix challenge}, pour plus d'informations." - -#. type: table -#: doc/guix.texi:5693 -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 "Remarquez que, les résultats qui diffèrent ne sont pas gardés, donc vous devrez inspecter manuellement chaque erreur — p.@: ex.@: en gardant l'un des résultats avec @code{guix archive --export} (@pxref{Invoking guix archive}), puis en reconstruisant, et enfin en comparant les deux résultats." - -#. type: table -#: doc/guix.texi:5698 -msgid "Do not attempt to offload builds @i{via} the ``build hook'' of the daemon (@pxref{Daemon Offload Setup}). That is, always build things locally instead of offloading builds to remote machines." -msgstr "N'essaye pas de décharger les constructions via le « crochet de construction » du démon (@pxref{Daemon Offload Setup}). C'est-à-dire que tout sera construit localement plutôt que de décharger les constructions à une machine distante." - -#. type: table -#: doc/guix.texi:5705 -msgid "By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, @code{--max-silent-time}})." -msgstr "Par défaut, les paramètres du démon sont pris en compte (@pxref{Invoking guix-daemon, @code{--max-silent-time}})." - -#. type: table -#: doc/guix.texi:5712 -msgid "By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, @code{--timeout}})." -msgstr "Par défaut, les paramètres du démon sont pris en compte (@pxref{Invoking guix-daemon, @code{--timeout}})." - -#. type: item -#: doc/guix.texi:5713 -#, no-wrap -msgid "--verbosity=@var{level}" -msgstr "--verbosity=@var{level}" - -#. type: table -#: doc/guix.texi:5717 -msgid "Use the given verbosity level. @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 "Utilise le niveau de verbosité donné. @var{level} doit être un entier entre 0 et 5 ; les entiers les plus hauts signifient une sortie plus verbeuse. Le mettre à 4 ou plus peut être utile pour déboguer des problèmes de configuration du démon de construction." - -#. type: table -#: doc/guix.texi:5722 -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 "Permet d'utiliser jusqu'à @var{n} cœurs du CPU pour la construction. La valeur spéciale @code{0} signifie autant de cœurs que possible." - -#. type: table -#: doc/guix.texi:5728 -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 "Permet au plus @var{n} travaux de construction en parallèle. @xref{Invoking guix-daemon, @code{--max-jobs}}, pour plus de détails sur cette option et l'option équivalente pour @command{guix-daemon}." - -#. type: Plain text -#: doc/guix.texi:5735 -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 "Sous le capot, @command{guix build} est surtout un interface à la procédure @code{package-derivation} du module @code{(guix packages)}, et à la procédure @code{build-derivations} du module @code{(guix derivations)}." - -#. type: Plain text -#: doc/guix.texi:5739 -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 "En plus des options passées explicitement par la ligne de commande, @command{guix build} et les autres commande @command{guix} qui peuvent effectuer des construction honorent la variable d'environnement @code{GUIX_BUILD_OPTIONS}." - -#. type: defvr -#: doc/guix.texi:5740 -#, no-wrap -msgid "{Environment Variable} GUIX_BUILD_OPTIONS" -msgstr "{Variable d'environnement} GUIX_BUILD_OPTIONS" - -#. type: defvr -#: doc/guix.texi:5745 -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 "Les utilisateurs peuvent définir cette variable à une liste d'options de la ligne de commande qui seront automatiquement utilisées par @command{guix build} et les autres commandes @command{guix} qui peuvent effectuer des constructions, comme dans l'exemple suivant :" - -#. type: example -#: doc/guix.texi:5748 -#, no-wrap -msgid "$ export GUIX_BUILD_OPTIONS=\"--no-substitutes -c 2 -L /foo/bar\"\n" -msgstr "$ export GUIX_BUILD_OPTIONS=\"--no-substitutes -c 2 -L /foo/bar\"\n" - -#. type: defvr -#: doc/guix.texi:5752 -msgid "These options are parsed independently, and the result is appended to the parsed command-line options." -msgstr "Ces options sont analysées indépendamment, et le résultat est ajouté aux options de la ligne de commande analysées." - -#. type: cindex -#: doc/guix.texi:5758 -#, no-wrap -msgid "package variants" -msgstr "variantes de paquets" - -#. type: Plain text -#: doc/guix.texi:5766 -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 "Un autre ensemble d'options de la ligne de commande supportés par @command{guix build} et aussi @command{guix package} sont les @dfn{options de transformation de paquets}. Ce sont des options qui rendent possible la définition de @dfn{variantes de paquets} — par exemple, des paquets construit à partir de sources différentes. C'est une manière simple de créer des paquets personnalisés à la volée sans avoir à taper les définitions de variantes de paquets (@pxref{Defining Packages})." - -#. type: item -#: doc/guix.texi:5769 -#, no-wrap -msgid "--with-source=@var{source}" -msgstr "--with-source=@var{source}" - -#. type: itemx -#: doc/guix.texi:5770 -#, no-wrap -msgid "--with-source=@var{package}=@var{source}" -msgstr "--with-source=@var{paquet}=@var{source}" - -#. type: itemx -#: doc/guix.texi:5771 -#, no-wrap -msgid "--with-source=@var{package}@@@var{version}=@var{source}" -msgstr "--with-source=@var{paquet}@@@var{version}=@var{source}" - -#. type: table -#: doc/guix.texi:5776 -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 "Utiles @var{source} comme la source de @var{paquet}, et @var{version} comme son numéro de version. @var{source} doit être un nom de fichier ou une URL, comme pour @command{guix download} (@pxref{Invoking guix download})." - -#. type: table -#: doc/guix.texi:5782 -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 "Lorsque @var{paquet} est omis, la commande utilisera le nom de paquet spécifié par la base de @var{source} — p.@: ex.@: si @var{source} est @code{/src/guix-2.0.10.tar.gz}, le paquet correspondant est @code{guile}." - -#. type: table -#: doc/guix.texi:5785 -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 "De même, lorsque @var{version} est omis, la chaîne de version est inférée à partir de @var{source} ; dans l'exemple précédent, il s'agit de @code{2.0.10}." - -#. type: table -#: doc/guix.texi:5790 -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 "Cette option permet aux utilisateurs d'essayer des version des paquets différentes de celles fournies par la distribution. L'exemple ci-dessous télécharge @file{ed-1.7.tar.g} depuis un mirroir GNU et l'utilise comme source pour le paquet @code{ed} :" - -#. type: example -#: doc/guix.texi:5793 -#, no-wrap -msgid "guix build ed --with-source=mirror://gnu/ed/ed-1.7.tar.gz\n" -msgstr "guix build ed --with-source=mirror://gnu/ed/ed-1.7.tar.gz\n" - -#. type: table -#: doc/guix.texi:5797 -msgid "As a developer, @code{--with-source} makes it easy to test release candidates:" -msgstr "En tant que développeur, @code{--with-source} permet de tester facilement des version bêta :" - -#. type: example -#: doc/guix.texi:5800 -#, no-wrap -msgid "guix build guile --with-source=../guile-2.0.9.219-e1bb7.tar.xz\n" -msgstr "guix build guile --with-source=../guile-2.0.9.219-e1bb7.tar.xz\n" - -#. type: table -#: doc/guix.texi:5803 -msgid "@dots{} or to build from a checkout in a pristine environment:" -msgstr "@dots{} ou pour construire un dépôt de gestion de version dans un environnement vierge :" - -#. type: example -#: doc/guix.texi:5807 -#, no-wrap +"\n" +" -d, --delete essayer de supprimer les CHEMINS" + +#: guix/scripts/gc.scm:51 msgid "" -"$ git clone git://git.sv.gnu.org/guix.git\n" -"$ guix build guix --with-source=guix@@1.0=./guix\n" +"\n" +" --optimize optimize the store by deduplicating identical files" msgstr "" -"$ git clone git://git.sv.gnu.org/guix.git\n" -"$ guix build guix --with-source=guix@@1.0=./guix\n" - -#. type: item -#: doc/guix.texi:5809 -#, no-wrap -msgid "--with-input=@var{package}=@var{replacement}" -msgstr "--with-input=@var{paquet}=@var{remplaçant}" - -#. type: table -#: doc/guix.texi:5814 -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 "Remplace la dépendance sur @var{paquet} par une dépendance à @var{remplaçant}. @var{paquet} doit être un nom de paquet et @var{remplaçant} doit être une spécification de paquet comme @code{guile} ou @code{guile@@1.8}." - -#. type: table -#: doc/guix.texi:5818 -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 "Par exemple, la commande suivante construit Guix, mais remplace sa dépendance à la version stable actuelle de Guile par une dépendance à une ancienne version de Guile, @code{guile@@2.0} :" - -#. type: example -#: doc/guix.texi:5821 -#, no-wrap -msgid "guix build --with-input=guile=guile@@2.0 guix\n" -msgstr "guix build --with-input=guile=guile@@2.0 guix\n" - -#. type: table -#: doc/guix.texi:5826 -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 "C'est un remplacement récursif profond. Donc dans cet exemple, à la fois @code{guix} et ses dépendances @code{guile-json} (qui dépend aussi de @code{guile}) sont reconstruits avec @code{guile@@2.0}." - -#. type: table -#: doc/guix.texi:5829 -msgid "This is implemented using the @code{package-input-rewriting} Scheme procedure (@pxref{Defining Packages, @code{package-input-rewriting}})." -msgstr "Cette option est implémentée avec la procédure Scheme @code{package-input-rewriting} (@pxref{Defining Packages, @code{package-input-rewriting}})." - -#. type: item -#: doc/guix.texi:5830 -#, no-wrap -msgid "--with-graft=@var{package}=@var{replacement}" -msgstr "--with-graft=@var{paquet}=@var{remplaçant}" - -#. type: table -#: doc/guix.texi:5836 -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 "Cette option est similaire à @code{--with-input} mais avec une différence importante : plutôt que de reconstruire la chaîne de dépendance complète, @var{remplaçant} est construit puis @dfn{greffé} sur les binaires qui référençaient initialement @var{paquet}. @xref{Security Updates}, pour plus d'information sur les greffes." - -#. type: table -#: doc/guix.texi:5840 -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 "Par exemple, la commande ci-dessous greffe la version 3.5.4 de GnuTLS sur Wget et toutes ses dépendances, en remplaçant les références à la version actuelle de GnuTLS à laquelle ils se réfèrent actuellement :" - -#. type: example -#: doc/guix.texi:5843 -#, no-wrap -msgid "guix build --with-graft=gnutls=gnutls@@3.5.4 wget\n" -msgstr "guix build --with-graft=gnutls=gnutls@@3.5.4 wget\n" - -#. type: table -#: doc/guix.texi:5852 -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 "Cela a l'avantage d'être bien plus rapide que de tout reconstruire. Mais il y a un piège : cela ne fonctionne que si @var{paquet} et @var{remplaçant} sont strictement compatibles — par exemple, s'ils fournissent une bibliothèque, l'interface binaire applicative (ABI) de ces bibliothèques doivent être compatibles. Si @var{remplaçant} est incompatible avec @var{paquet}, alors le paquet qui en résulte peut devenir inutilisable. À utilisez avec précaution !" - -#. type: Plain text -#: doc/guix.texi:5860 -msgid "The command-line options presented below are specific to @command{guix build}." -msgstr "Les options de la ligne de commande ci-dessous sont spécifiques à @command{guix build}." - -#. type: item -#: doc/guix.texi:5863 -#, no-wrap -msgid "--quiet" -msgstr "--quiet" - -#. type: itemx -#: doc/guix.texi:5864 -#, no-wrap -msgid "-q" -msgstr "-q" - -#. type: table -#: doc/guix.texi:5868 -msgid "Build quietly, without displaying the build log. Upon completion, the build log is kept in @file{/var} (or similar) and can always be retrieved using the @option{--log-file} option." -msgstr "Construire en silence, sans afficher les journaux de construction. À la fin, le journal de construction est gardé dans @file{/var} (ou similaire) et on peut toujours l'y trouver avec l'option @option{--log-file}." - -#. type: item -#: doc/guix.texi:5869 -#, no-wrap -msgid "--file=@var{file}" -msgstr "--file=@var{fichier}" - -#. type: table -#: doc/guix.texi:5874 -msgid "Build the package or derivation that the code within @var{file} evaluates to." -msgstr "Construit le paquet ou la dérivation en lequel le code dans @var{file} s'évalue." - -#. type: table -#: doc/guix.texi:5877 -msgid "As an example, @var{file} might contain a package definition like this (@pxref{Defining Packages}):" -msgstr "Par exemple, @var{file} peut contenir une définition de paquet comme ceci (@pxref{Defining Packages}) :" - -#. type: table -#: doc/guix.texi:5885 -msgid "Build the package or derivation @var{expr} evaluates to." -msgstr "Construit le paquet ou la dérivation en lequel @var{expr} s'évalue." - -#. type: table -#: doc/guix.texi:5889 -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 "Par exemple, @var{expr} peut être @code{(@@ (gnu packages guile) guile-1.8)}, qui désigne sans ambiguïté cette variante spécifique de la version 1.8 de Guile." - -#. type: table -#: doc/guix.texi:5893 -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 "Autrement, @var{exp} peut être une G-expression, auquel cas elle est utilisée comme un programme de construction passé à @code{gexp->derivation} (@pxref{G-Expressions})." - -#. type: table -#: doc/guix.texi:5897 -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 "Enfin, @var{expr} peut se référer à une procédure monadique à au moins un argument (@pxref{The Store Monad}). La procédure doit renvoyer une dérivation comme une valeur monadique, qui est ensuite lancée à travers @code{run-with-store}." - -#. type: item -#: doc/guix.texi:5898 -#, no-wrap -msgid "--source" -msgstr "--source" - -#. type: itemx -#: doc/guix.texi:5899 -#, no-wrap -msgid "-S" -msgstr "-S" - -#. type: table -#: doc/guix.texi:5902 -msgid "Build the source derivations of the packages, rather than the packages themselves." -msgstr "Construit les dérivation source des paquets, plutôt que des paquets eux-même." - -#. type: table -#: doc/guix.texi:5906 -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 "Par exemple, @code{guix build -S gcc} renvoie quelque chose comme @file{/gnu/store/@dots{}-gcc-4.7.2.tar.bz2}, qui est l'archive des sources de GCC." - -#. type: table -#: doc/guix.texi:5910 -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 "L'archive des sources renvoyée est le résultat de l'application des correctifs et des extraits de code éventuels spécifiés dans le champ @code{origin} du paquet (@pxref{Defining Packages})." - -#. type: item -#: doc/guix.texi:5911 -#, no-wrap -msgid "--sources" -msgstr "--sources" - -#. type: table -#: doc/guix.texi:5918 -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 "Récupère et renvoie la source de @var{package-or-derivation} et toute ses dépendances, récursivement. C'est pratique pour obtenir une copie locale de tous les codes sources requis pour construire @var{packages}, ce qui vous permet de les construire plus tard même sans accès réseau. C'est une extension de l'option @code{--source} et peut accepter l'un des arguments facultatifs suivants :" - -#. type: item -#: doc/guix.texi:5920 doc/guix.texi:7184 -#, no-wrap -msgid "package" -msgstr "package" - -#. type: table -#: doc/guix.texi:5923 -msgid "This value causes the @code{--sources} option to behave in the same way as the @code{--source} option." -msgstr "Cette valeur fait que l'option @code{--sources} se comporte comme l'option @code{--source}." - -#. type: item -#: doc/guix.texi:5924 doc/guix.texi:12103 -#, no-wrap -msgid "all" -msgstr "all" - -#. type: table -#: doc/guix.texi:5927 -msgid "Build the source derivations of all packages, including any source that might be listed as @code{inputs}. This is the default value." -msgstr "Construit les dérivations des sources de tous les paquets, dont les sources qui pourraient être listées dans @code{inputs}. C'est la valeur par défaut." - -#. type: example -#: doc/guix.texi:5933 -#, no-wrap +"\n" +" --optimize optimise le dépôt en supprimant les doublons des fichiers identiques" + +#: guix/scripts/gc.scm:53 msgid "" -"$ guix build --sources tzdata\n" -"The following derivations will be built:\n" -" /gnu/store/@dots{}-tzdata2015b.tar.gz.drv\n" -" /gnu/store/@dots{}-tzcode2015b.tar.gz.drv\n" +"\n" +" --list-dead list dead paths" msgstr "" -"$ guix build --sources tzdata\n" -"The following derivations will be built:\n" -" /gnu/store/@dots{}-tzdata2015b.tar.gz.drv\n" -" /gnu/store/@dots{}-tzcode2015b.tar.gz.drv\n" - -#. type: item -#: doc/guix.texi:5935 -#, no-wrap -msgid "transitive" -msgstr "transitive" - -#. type: table -#: doc/guix.texi:5939 -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 "Construit les dérivations des sources de tous les paquets, ainsi que toutes celles les entrées transitives des paquets. On peut utiliser cette option pour précharger les sources des paquets pour les construire plus tard hors ligne par exemple." - -#. type: example -#: doc/guix.texi:5950 -#, no-wrap +"\n" +" --list-dead lister les chemins non valides" + +#: guix/scripts/gc.scm:55 msgid "" -"$ guix build --sources=transitive tzdata\n" -"The following derivations will be built:\n" -" /gnu/store/@dots{}-tzcode2015b.tar.gz.drv\n" -" /gnu/store/@dots{}-findutils-4.4.2.tar.xz.drv\n" -" /gnu/store/@dots{}-grep-2.21.tar.xz.drv\n" -" /gnu/store/@dots{}-coreutils-8.23.tar.xz.drv\n" -" /gnu/store/@dots{}-make-4.1.tar.xz.drv\n" -" /gnu/store/@dots{}-bash-4.3.tar.xz.drv\n" -"@dots{}\n" +"\n" +" --list-live list live paths" msgstr "" -"$ guix build --sources=transitive tzdata\n" -"The following derivations will be built:\n" -" /gnu/store/@dots{}-tzcode2015b.tar.gz.drv\n" -" /gnu/store/@dots{}-findutils-4.4.2.tar.xz.drv\n" -" /gnu/store/@dots{}-grep-2.21.tar.xz.drv\n" -" /gnu/store/@dots{}-coreutils-8.23.tar.xz.drv\n" -" /gnu/store/@dots{}-make-4.1.tar.xz.drv\n" -" /gnu/store/@dots{}-bash-4.3.tar.xz.drv\n" -"@dots{}\n" - -#. type: quotation -#: doc/guix.texi:5963 -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 "Le drapeau @code{--system} est utilisé pour une compilation @emph{native} et ne doit pas être confondu avec une compilation croisée. Voir @code{--target} ci-dessous pour des informations sur la compilation croisée." - -#. type: table -#: doc/guix.texi:5970 -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 "Par exemple, passer @code{--system=i686-linux} sur un système @code{x86_64-linux} ou @code{--system=armhf-linux} sur un système @code{aarch64-linux} vous permet de construire des paquets dans un environnement entièrement 32-bits. C'est une exemple d'utilisation de cette option sur les systèmes Linux, qui peuvent émuler plusieurs personnalités." - -#. type: quotation -#: doc/guix.texi:5975 -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 "La possibilité de construire pour un système @code{armhf-linux} est activé sans condition sur les machines @code{aarch64-linux}, bien que certaines puces aarch64 n'en soient pas capables, comme les ThunderX." - -#. type: table -#: doc/guix.texi:5981 -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 "De même, lorsque l'émulation transparente avec QEMU et @code{binfnmt_misc} est activée (@pxref{Virtualization Services, @code{qemu-binfmt-service-type}}), vous pouvez construire pour n'importe quel système pour lequel un gestionnaire QEMU @code{binfmt_misc} est installé." - -#. type: table -#: doc/guix.texi:5985 -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 "Les constructions pour un autre système que celui de la machine que vous utilisez peuvent aussi être déchargées à une machine distante de la bonne architecture. @xref{Daemon Offload Setup}, pour plus d'information sur le déchargement." - -#. type: anchor{#1} -#: doc/guix.texi:5993 -msgid "build-check" -msgstr "vérification de la construction" - -#. type: item -#: doc/guix.texi:5993 -#, no-wrap -msgid "--check" -msgstr "--check" - -#. type: cindex -#: doc/guix.texi:5994 -#, no-wrap -msgid "determinism, checking" -msgstr "déterminisme, vérification" - -#. type: cindex -#: doc/guix.texi:5995 -#, no-wrap -msgid "reproducibility, checking" -msgstr "reproductibilité, vérification" - -#. type: table -#: doc/guix.texi:5999 -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 "Reconstruit les @var{package-or-derivation}, qui sont déjà disponibles dans le dépôt et lève une erreur si les résultats des constructions ne sont pas identiques bit-à-bit." - -#. type: table -#: doc/guix.texi:6004 -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 "Ce mécanisme vous permet de vérifier si les substituts précédemment installés sont authentiques (@pxref{Substituts}) ou si le résultat de la construction d'un paquet est déterministe. @xref{Invoking guix challenge} pour plus d'informations et pour les outils." - -#. type: item -#: doc/guix.texi:6009 -#, no-wrap -msgid "--repair" -msgstr "--repair" - -#. type: cindex -#: doc/guix.texi:6010 -#, no-wrap -msgid "repairing store items" -msgstr "réparer les éléments du dépôt" - -#. type: table -#: doc/guix.texi:6014 -msgid "Attempt to repair the specified store items, if they are corrupt, by re-downloading or rebuilding them." -msgstr "Essaye de réparer les éléments du dépôt spécifiés, s'ils sont corrompus, en les téléchargeant ou en les construisant à nouveau." - -#. type: table -#: doc/guix.texi:6016 -msgid "This operation is not atomic and thus restricted to @code{root}." -msgstr "Cette opération n'est pas atomique et donc restreinte à l'utilisateur @code{root}" - -#. type: item -#: doc/guix.texi:6017 -#, no-wrap -msgid "--derivations" -msgstr "--derivations" - -#. type: table -#: doc/guix.texi:6021 -msgid "Return the derivation paths, not the output paths, of the given packages." -msgstr "Renvoie les chemins de dérivation, et non les chemins de sortie, des paquets donnés." - -#. type: item -#: doc/guix.texi:6022 doc/guix.texi:7441 doc/guix.texi:21109 -#, no-wrap -msgid "--root=@var{file}" -msgstr "--root=@var{fichier}" - -#. type: itemx -#: doc/guix.texi:6023 doc/guix.texi:7442 doc/guix.texi:21110 -#, no-wrap -msgid "-r @var{file}" -msgstr "-r @var{fichier}" - -#. type: cindex -#: doc/guix.texi:6024 -#, no-wrap -msgid "GC roots, adding" -msgstr "racines du GC, ajout" - -#. type: cindex -#: doc/guix.texi:6025 -#, no-wrap -msgid "garbage collector roots, adding" -msgstr "ajout de racines au ramasse-miettes" - -#. type: table -#: doc/guix.texi:6028 doc/guix.texi:21113 -msgid "Make @var{file} a symlink to the result, and register it as a garbage collector root." -msgstr "Fait de @var{fichier} un lien symbolique vers le résultat, et l'enregistre en tant que racine du ramasse-miettes." - -#. type: table -#: doc/guix.texi:6034 -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 "En conséquence, les résultats de cette invocation de @command{guix build} sont protégés du ramasse-miettes jusqu'à ce que @var{fichier} soit supprimé. Lorsque cette option est omise, les constructions sont susceptibles d'être glanées." - -#. type: item -#: doc/guix.texi:6035 -#, no-wrap -msgid "--log-file" -msgstr "--log-file" - -#. type: cindex -#: doc/guix.texi:6036 -#, no-wrap -msgid "build logs, access" -msgstr "journaux de construction, accès" - -#. type: table -#: doc/guix.texi:6040 -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 "Renvoie les noms des journaux de construction ou les URL des @var{package-or-derivation} donnés ou lève une erreur si les journaux de construction sont absents." - -#. type: table -#: doc/guix.texi:6043 -msgid "This works regardless of how packages or derivations are specified. For instance, the following invocations are equivalent:" -msgstr "Cela fonctionne indépendamment de la manière dont les paquets ou les dérivations sont spécifiées. Par exemple, les invocations suivantes sont équivalentes :" - -#. type: example -#: doc/guix.texi:6049 -#, no-wrap +"\n" +" --list-live lister les chemins valides" + +#: guix/scripts/gc.scm:58 msgid "" -"guix build --log-file `guix build -d guile`\n" -"guix build --log-file `guix build guile`\n" -"guix build --log-file guile\n" -"guix build --log-file -e '(@@ (gnu packages guile) guile-2.0)'\n" +"\n" +" --references list the references of PATHS" msgstr "" -"guix build --log-file `guix build -d guile`\n" -"guix build --log-file `guix build guile`\n" -"guix build --log-file guile\n" -"guix build --log-file -e '(@@ (gnu packages guile) guile-2.0)'\n" - -#. type: table -#: doc/guix.texi:6054 -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 "Si un journal n'est pas disponible localement, à moins que @code{--no-substitutes} ne soit passé, la commande cherche un journal correspondant sur l'un des serveurs de substituts (tels que spécifiés avec @code{--substitute-urls}.)" - -#. type: table -#: doc/guix.texi:6057 -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 "Donc par exemple, imaginons que vous souhaitiez voir le journal de construction de GDB sur MIPS, mais que vous n'avez qu'une machine @code{x86_64} :" - -#. type: example -#: doc/guix.texi:6061 -#, no-wrap +"\n" +" --references lister les références de CHEMINS" + +#: guix/scripts/gc.scm:60 msgid "" -"$ guix build --log-file gdb -s mips64el-linux\n" -"https://hydra.gnu.org/log/@dots{}-gdb-7.10\n" +"\n" +" -R, --requisites list the requisites of PATHS" msgstr "" -"$ guix build --log-file gdb -s mips64el-linux\n" -"https://hydra.gnu.org/log/@dots{}-gdb-7.10\n" - -#. type: table -#: doc/guix.texi:6064 -msgid "You can freely access a huge library of build logs!" -msgstr "Vous pouvez accéder librement à un vaste bibliothèque de journaux de construction !" - -#. type: cindex -#: doc/guix.texi:6069 -#, no-wrap -msgid "build failures, debugging" -msgstr "échecs de construction, débogage" - -#. type: Plain text -#: doc/guix.texi:6075 -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 "Lors de la définition d'un nouveau paquet (@pxref{Defining Packages}), vous passerez probablement du temps à déboguer et modifier la construction jusqu'à ce que ça marche. Pour cela, vous devez effectuer les commandes de construction vous-même dans un environnement le plus proche possible de celui qu'utilise le démon de construction." - -#. type: Plain text -#: doc/guix.texi:6080 -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 "Pour cela, la première chose à faire est d'utiliser l'option @option{--keep-failed} ou @option{-K} de @command{guix build}, qui gardera l'arborescence de construction dans @file{/tmp} ou le répertoire spécifié par @code{TMPDIR} (@pxref{Invoking guix build, @code{--keep-failed}})." - -#. type: Plain text -#: doc/guix.texi:6086 -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 "À partir de là, vous pouvez vous déplacer dans l'arborescence de construction et sourcer le fichier @file{environment-variables}, qui contient toutes les variables d'environnement qui étaient définies lorsque la construction a échoué. Disons que vous déboguez un échec de construction dans le paquet @code{foo} ; une session typique ressemblerait à cela :" - -#. type: example -#: doc/guix.texi:6093 -#, no-wrap +"\n" +" -R, --requisites lister les prérequis de CHEMINS" + +#: guix/scripts/gc.scm:62 msgid "" -"$ guix build foo -K\n" -"@dots{} @i{build fails}\n" -"$ cd /tmp/guix-build-foo.drv-0\n" -"$ source ./environment-variables\n" -"$ cd foo-1.2\n" +"\n" +" --referrers list the referrers of PATHS" msgstr "" -"$ guix build foo -K\n" -"@dots{} @i{build fails}\n" -"$ cd /tmp/guix-build-foo.drv-0\n" -"$ source ./environment-variables\n" -"$ cd foo-1.2\n" - -#. type: Plain text -#: doc/guix.texi:6097 -msgid "Now, you can invoke commands as if you were the daemon (almost) and troubleshoot your build process." -msgstr "Maintenant, vous pouvez invoquer les commandes comme si vous étiez le démon (presque) et corriger le processus de construction." - -#. type: Plain text -#: doc/guix.texi:6103 -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 "Parfois il arrive que, par exemple, les tests d'un paquet réussissent lorsque vous les lancez manuellement mais échouent quand ils sont lancés par le démon. Cela peut arriver parce que le démon tourne dans un conteneur où, contrairement à notre environnement au-dessus, l'accès réseau est indisponible, @file{/bin/sh} n'existe pas, etc (@pxref{Build Environment Setup})." - -#. type: Plain text -#: doc/guix.texi:6106 -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 "Dans ce cas, vous pourriez avoir besoin de lancer le processus de construction dans un conteneur similaire à celui que le démon crée :" - -#. type: example -#: doc/guix.texi:6114 -#, no-wrap +"\n" +" --referrers lister les référents de CHEMINS" + +#: guix/scripts/gc.scm:64 msgid "" -"$ guix build -K foo\n" -"@dots{}\n" -"$ cd /tmp/guix-build-foo.drv-0\n" -"$ guix environment --no-grafts -C foo --ad-hoc strace gdb\n" -"[env]# source ./environment-variables\n" -"[env]# cd foo-1.2\n" +"\n" +" --derivers list the derivers of PATHS" msgstr "" -"$ guix build -K foo\n" -"@dots{}\n" -"$ cd /tmp/guix-build-foo.drv-0\n" -"$ guix environment --no-grafts -C foo --ad-hoc strace gdb\n" -"[env]# source ./environment-variables\n" -"[env]# cd foo-1.2\n" - -#. type: Plain text -#: doc/guix.texi:6123 -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 "Ici, @command{guix environment -C} crée un conteneur et démarre un nouveau shell dedans (@pxref{Invoking guix environment}). La partie @command{--ad-hoc strace gdb} ajoute les commandes @command{strace} et @command{gdb} dans le conteneur, ce qui pourrait s'avérer utile pour le débogage. L'option @option{--no-grafts} s'assure qu'on obtient le même environnement, avec des paquets non greffés (@pxref{Security Updates}, pour plus d'informations sur les greffes)." - -#. type: Plain text -#: doc/guix.texi:6126 -msgid "To get closer to a container like that used by the build daemon, we can remove @file{/bin/sh}:" -msgstr "Pour obtenir un conteneur plus proche de ce qui serait utilisé par le démon de construction, on peut enlever @file{/bin/sh} :" - -#. type: example -#: doc/guix.texi:6129 -#, no-wrap -msgid "[env]# rm /bin/sh\n" -msgstr "[env]# rm /bin/sh\n" - -#. type: Plain text -#: doc/guix.texi:6133 -msgid "(Don't worry, this is harmless: this is all happening in the throw-away container created by @command{guix environment}.)" -msgstr "Ne vous inquiétez pas, c'est sans danger : tout cela se passe dans un conteneur jetable créé par @command{guix environment}." - -#. type: Plain text -#: doc/guix.texi:6136 -msgid "The @command{strace} command is probably not in the search path, but we can run:" -msgstr "La commande @command{strace} n'est probablement pas dans le chemin de recherche, mais on peut lancer :" - -#. type: example -#: doc/guix.texi:6139 -#, no-wrap -msgid "[env]# $GUIX_ENVIRONMENT/bin/strace -f -o log make check\n" -msgstr "[env]# $GUIX_ENVIRONMENT/bin/strace -f -o log make check\n" - -#. type: Plain text -#: doc/guix.texi:6144 -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 "De cette manière, non seulement vous aurez reproduit les variables d'environnement utilisées par le démon, mais vous lancerez aussi le processus de construction dans un conteneur similaire à celui utilisé par le démon." - -#. type: section -#: doc/guix.texi:6147 -#, no-wrap -msgid "Invoking @command{guix edit}" -msgstr "Invoquer @command{guix edit}" - -#. type: command{#1} -#: doc/guix.texi:6149 -#, no-wrap -msgid "guix edit" -msgstr "guix edit" - -#. type: cindex -#: doc/guix.texi:6150 -#, no-wrap -msgid "package definition, editing" -msgstr "définition de paquets, modification" - -#. type: Plain text -#: doc/guix.texi:6155 -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 "Tant de paquets, tant de fichiers source ! La commande @command{guix edit} facilite la vie des utilisateurs et des packagers en plaçant leur éditeur sur le fichier source qui contient la définition des paquets spécifiés. Par exemple :" - -#. type: example -#: doc/guix.texi:6158 -#, no-wrap -msgid "guix edit gcc@@4.9 vim\n" -msgstr "guix edit gcc@@4.9 vim\n" - -#. type: Plain text -#: doc/guix.texi:6164 -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 "lance le programme spécifié dans la variable d'environnement @code{VISUAL} ou @code{EDITOR} pour visionner la recette de GCC@tie{}4.9.3 et cele de Vim." - -#. type: Plain text -#: doc/guix.texi:6170 -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{Defining Packages}), you will be able to edit the package recipes. Otherwise, you will be able to examine the read-only recipes for packages currently in the store." -msgstr "Si vous utilisez une copie du dépôt Git de Guix (@pxref{Building from Git}), ou que vous avez créé vos propres paquets dans @code{GUIX_PACKAGE_PATH} (@pxref{Defining Packages}), vous pourrez modifier les recettes des paquets. Sinon, vous pourrez examiner les recettes en lecture-seule des paquets actuellement dans le dépôt." - -#. type: section -#: doc/guix.texi:6173 -#, no-wrap -msgid "Invoking @command{guix download}" -msgstr "Invoquer @command{guix download}" - -#. type: command{#1} -#: doc/guix.texi:6175 -#, no-wrap -msgid "guix download" -msgstr "guix download" - -#. type: cindex -#: doc/guix.texi:6176 -#, no-wrap -msgid "downloading package sources" -msgstr "télécharger les sources des paquets" - -#. type: Plain text -#: doc/guix.texi:6183 -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 "En écrivant des définitions de paquets, les développeurs ont généralement besoin de télécharger une archive des sources, calculer son hash SHA256 et écrire ce hash dans la définition du paquet (@pxref{Defining Packages}). L'outil @command{guix download} aide à cette tâche : il télécharge un fichier à l'URL donné, l'ajoute au dépôt et affiche à la fois son nom dans le dépôt et son hash SHA56." - -#. type: Plain text -#: doc/guix.texi:6190 -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 "Le fait que le fichier téléchargé soit ajouté au dépôt préserve la bande passante : losque les développeurs finissent par construire le paquet nouvellement défini avec @command{guix build}, l'archive des sources n'aura pas besoin d'être téléchargée de nouveau puisqu'elle se trouvera déjà dans le dépôt. C'est aussi une manière pratique de garder des fichiers temporairement, qui pourront ensuite être supprimés (@pxref{Invoking guix gc})." - -#. type: Plain text -#: doc/guix.texi:6198 -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 "La commande @command{guix download} supporte les mêmes URI que celles utilisées dans les définitions de paquets. En particulier, elle supporte les URI @code {mirror://}. Les URI @code{http} (HTTP sur TLS) sont supportées @emph{si} les liaisons Guile de GnuTLS sont disponibles dans l'environnement de l'utilisateur ; si elle ne sont pas disponibles, une erreur est renvoyée. @xref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile}, pour plus d'informations." - -#. type: Plain text -#: doc/guix.texi:6203 -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 "@command{guix download} vérifie les certificats du serveur HTTPS en chargeant les autorités de certification X.509 depuis le répertoire vers lequel pointe la variable d'environnement @code{SSL_CERT_DIR} (@pxref{X.509 Certificates}), à moins que @option{--no-check-certificate} ne soit utilisé." - -#. type: Plain text -#: doc/guix.texi:6205 doc/guix.texi:7721 -msgid "The following options are available:" -msgstr "Les options suivantes sont disponibles :" - -#. type: item -#: doc/guix.texi:6207 doc/guix.texi:6246 -#, no-wrap -msgid "--format=@var{fmt}" -msgstr "--format=@var{fmt}" - -#. type: itemx -#: doc/guix.texi:6208 doc/guix.texi:6247 -#, no-wrap -msgid "-f @var{fmt}" -msgstr "-f @var{fmt}" - -#. type: table -#: doc/guix.texi:6211 -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 "Écrit le hash dans le format spécifié par @var{fmt}. Pour plus d'informations sur les valeurs valides pour @var{fmt}, @pxref{Invoking guix hash}." - -#. type: item -#: doc/guix.texi:6212 -#, no-wrap -msgid "--no-check-certificate" -msgstr "--no-check-certificate" - -#. type: table -#: doc/guix.texi:6214 -msgid "Do not validate the X.509 certificates of HTTPS servers." -msgstr "Ne pas valider les certificats HTTPS des serveurs." - -#. type: table -#: doc/guix.texi:6218 -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 "Lorsque vous utilisez cette option, vous n'avez @emph{absolument aucune garanti} que vous communiquez avec le serveur authentique responsable de l'URL donnée, ce qui vous rend vulnérable à des attaques de « l'homme du milieu »." - -#. type: item -#: doc/guix.texi:6219 -#, no-wrap -msgid "--output=@var{file}" -msgstr "--output=@var{fichier}" - -#. type: itemx -#: doc/guix.texi:6220 -#, no-wrap -msgid "-o @var{file}" -msgstr "-o @var{fichier}" - -#. type: table -#: doc/guix.texi:6223 -msgid "Save the downloaded file to @var{file} instead of adding it to the store." -msgstr "Enregistre le fichier téléchargé dans @var{fichier} plutôt que de l'ajouter au dépôt." - -#. type: section -#: doc/guix.texi:6226 -#, no-wrap -msgid "Invoking @command{guix hash}" -msgstr "Invoquer @command{guix hash}" - -#. type: command{#1} -#: doc/guix.texi:6228 -#, no-wrap -msgid "guix hash" -msgstr "guix hash" - -#. type: Plain text -#: doc/guix.texi:6233 -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 "La commande @command{guix hash} calcul le hash SHA256 d'un fichier. C'est surtout un outil pour simplifier la vie des contributeurs de la distribution : il calcul le hash cryptographique d'un fichier, qui peut être utilisé dans la définition d'un paquet (@pxref{Defining Packages})." - -#. type: example -#: doc/guix.texi:6238 -#, no-wrap -msgid "guix hash @var{option} @var{file}\n" -msgstr "guix hash @var{option} @var{fichier}\n" - -#. type: Plain text -#: doc/guix.texi:6243 -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 "Lorsque @var{fichier} est @code{-} (un tiret), @command{guix hash} calcul le hash des données lues depuis l'entrée standard. @command{guix hash} a les options suivantes :" - -#. type: table -#: doc/guix.texi:6249 -msgid "Write the hash in the format specified by @var{fmt}." -msgstr "Écrit le hash dans le format spécifié par @var{fmt}." - -#. type: table -#: doc/guix.texi:6252 -msgid "Supported formats: @code{nix-base32}, @code{base32}, @code{base16} (@code{hex} and @code{hexadecimal} can be used as well)." -msgstr "Les formats supportés sont : @code{nix-base32}, @code{base32}, @code{base16} (@code{hex} et @code{hexadecimal} peuvent aussi être utilisés)." - -#. type: table -#: doc/guix.texi:6256 -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 "Si l'option @option {--format} n'est pas spécifiée, @command{guix hash} affichera le hash en @code{nix-base32}. Cette représentation est utilisée dans les définitions des paquets." - -#. type: table -#: doc/guix.texi:6260 -msgid "Compute the hash on @var{file} recursively." -msgstr "Calcule le hash sur @var{fichier} récursivement." - -#. type: table -#: doc/guix.texi:6269 -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 "Dans ce cas, le hash est calculé sur une archive contenant @var{fichier}, dont ses enfants si c'est un répertoire. Certaines métadonnées de @var{fichier} fait partie de l'archive ; par exemple lorsque @var{fichier} est un fichier normal, le hash est différent que le @var{fichier} soit exécutable ou non. Les métadonnées comme un horodatage n'ont aucun impact sur le hash (@pxref{Invoking guix archive})." - -#. type: item -#: doc/guix.texi:6270 -#, no-wrap -msgid "--exclude-vcs" -msgstr "--exclude-vcs" - -#. type: itemx -#: doc/guix.texi:6271 -#, no-wrap -msgid "-x" -msgstr "-x" - -#. type: table -#: doc/guix.texi:6274 -msgid "When combined with @option{--recursive}, exclude version control system directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.)" -msgstr "Lorsqu'elle est combinée à @option{--recursive}, exclut les répertoires de système de contrôle de version (@file{.bzr}, @file{.git}, @file{.hg}, etc)." - -#. type: table -#: doc/guix.texi:6279 -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 "Par exemple, voici comment calculer le hash d'un dépôt Git, ce qui est utile avec la méthode @code{git-fetch} (@pxref{origin Reference}) :" - -#. type: example -#: doc/guix.texi:6284 -#, no-wrap +"\n" +" --derivers lister les dérivations menant à CHEMINS" + +#: guix/scripts/gc.scm:67 msgid "" -"$ git clone http://example.org/foo.git\n" -"$ cd foo\n" -"$ guix hash -rx .\n" +"\n" +" --verify[=OPTS] verify the integrity of the store; OPTS is a\n" +" comma-separated combination of 'repair' and\n" +" 'contents'" msgstr "" -"$ git clone http://example.org/foo.git\n" -"$ cd foo\n" -"$ guix hash -rx .\n" - -#. type: cindex -#: doc/guix.texi:6288 doc/guix.texi:6293 -#, no-wrap -msgid "Invoking @command{guix import}" -msgstr "Invoquer @command{guix import}" - -#. type: cindex -#: doc/guix.texi:6290 -#, no-wrap -msgid "importing packages" -msgstr "importer des paquets" - -#. type: cindex -#: doc/guix.texi:6291 -#, no-wrap -msgid "package import" -msgstr "paquets importés" - -#. type: cindex -#: doc/guix.texi:6292 -#, no-wrap -msgid "package conversion" -msgstr "conversion de paquets" - -#. type: Plain text -#: doc/guix.texi:6300 -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 "La commande @command{guix import} est utile pour les gens qui voudraient ajouter un paquet à la distribution avec aussi peu de travail que possible — une demande légitime. La commande connaît quelques dépôts logiciels d'où elle peut « importer » des métadonnées de paquets. Le résultat est une définition de paquet, ou un modèle de définition, dans le format reconnu par Guix (@pxref{Defining Packages})." - -#. type: example -#: doc/guix.texi:6305 -#, no-wrap -msgid "guix import @var{importer} @var{options}@dots{}\n" -msgstr "guix import @var{importer} @var{options}@dots{}\n" - -#. type: Plain text -#: doc/guix.texi:6311 -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}. Currently, the available ``importers'' are:" -msgstr "@var{importer} spécifie la source depuis laquelle importer des métadonnées de paquets, et @var{options} spécifie un identifiant de paquet et d'autres options spécifiques à @var{importer}. Actuellement les « importateurs » disponibles sont :" - -#. type: item -#: doc/guix.texi:6313 doc/guix.texi:6772 -#, no-wrap -msgid "gnu" -msgstr "gnu" - -#. type: table -#: doc/guix.texi:6317 -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 "Importe des métadonnées d'un paquet GNU donné. Cela fournit un modèle pour la dernière version de ce paquet GNU, avec le hash de son archive, le synopsis et la description canonique." - -#. type: table -#: doc/guix.texi:6320 -msgid "Additional information such as the package dependencies and its license needs to be figured out manually." -msgstr "Les informations supplémentaires comme les dépendances du paquet et sa licence doivent être renseignées manuellement." - -#. type: table -#: doc/guix.texi:6323 -msgid "For example, the following command returns a package definition for GNU@tie{}Hello:" -msgstr "Par exemple, la commande suivante renvoie une définition de paquets pour GNU@tie{}Hello :" - -#. type: example -#: doc/guix.texi:6326 -#, no-wrap -msgid "guix import gnu hello\n" -msgstr "guix import gnu hello\n" - -#. type: table -#: doc/guix.texi:6329 doc/guix.texi:6547 doc/guix.texi:6592 doc/guix.texi:6616 -msgid "Specific command-line options are:" -msgstr "Les options spécifiques sont :" - -#. type: item -#: doc/guix.texi:6331 doc/guix.texi:6873 -#, no-wrap -msgid "--key-download=@var{policy}" -msgstr "--key-download=@var{politique}" - -#. type: table -#: doc/guix.texi:6335 -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 "Comme pour @code{guix refresh}, spécifie la politique de gestion des clefs OpenPGP manquantes lors de la vérification de la signature d'un paquet. @xref{Invoking guix refresh, @code{--key-download}}." - -#. type: item -#: doc/guix.texi:6337 doc/guix.texi:6338 doc/guix.texi:6790 -#, no-wrap -msgid "pypi" -msgstr "pypi" - -#. type: table -#: doc/guix.texi:6346 -msgid "Import metadata from the @uref{https://pypi.python.org/, Python Package Index}@footnote{This functionality requires Guile-JSON to be installed. @xref{Requirements}.}. 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 "Importe des métadonnées depuis @uref{https://pypi.python.org/, l'index des paquets Python}@footnote{Cette fonctionnalité requiert l'installation de Guile-JSON. @xref{Requirements}.}. Les informations sont récupérées à partir de la description en JSON disponible sur @code{pypi.python.org} et inclus généralement toutes les informations utiles, dont les dépendances des paquets. Pour une efficacité maximale, il est recommandé d'installer l'utilitaire @command{unzip}, pour que l'importateur puisse dézipper les wheels Python et récupérer les informations contenues à l'intérieur." - -#. type: table -#: doc/guix.texi:6349 -msgid "The command below imports metadata for the @code{itsdangerous} Python package:" -msgstr "La commande ci-dessous importe les métadonnées du paquet Python @code{itsdangerous} :" - -#. type: example -#: doc/guix.texi:6352 -#, no-wrap -msgid "guix import pypi itsdangerous\n" -msgstr "guix import pypi itsdangerous\n" - -#. type: item -#: doc/guix.texi:6354 doc/guix.texi:6355 doc/guix.texi:6792 -#, no-wrap -msgid "gem" -msgstr "gem" - -#. type: table -#: doc/guix.texi:6366 -msgid "Import metadata from @uref{https://rubygems.org/, RubyGems}@footnote{This functionality requires Guile-JSON to be installed. @xref{Requirements}.}. 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 "Importe des métadonnées de @uref{https://rubygems.org/, RubyGems}@footnote{Cette fonctionnalité requiert l'installation de Guile-JSON. @xref{Requirements}.}. Les informations sont récupérées au format JSON disponible sur @code{rubygems.org} et inclut les informations les plus utiles, comme les dépendances à l'exécution. Il y a des pièges cependant. Les métadonnées ne distinguent pas synopsis et description, donc la même chaîne est utilisée pour les deux champs. En plus, les détails des dépendances non Ruby requises pour construire des extensions natives sont indisponibles et laissé en exercice au packager." - -#. type: table -#: doc/guix.texi:6368 -msgid "The command below imports metadata for the @code{rails} Ruby package:" -msgstr "La commande ci-dessous importe les métadonnées pour le paquet Ruby @code{rails} :" - -#. type: example -#: doc/guix.texi:6371 -#, no-wrap -msgid "guix import gem rails\n" -msgstr "guix import gem rails\n" - -#. type: item -#: doc/guix.texi:6373 doc/guix.texi:6788 -#, no-wrap -msgid "cpan" -msgstr "cpan" - -#. type: cindex -#: doc/guix.texi:6374 -#, no-wrap -msgid "CPAN" -msgstr "CPAN" - -#. type: table -#: doc/guix.texi:6384 -msgid "Import metadata from @uref{https://www.metacpan.org/, MetaCPAN}@footnote{This functionality requires Guile-JSON to be installed. @xref{Requirements}.}. 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 "Importe des métadonnées de @uref{https://www.metacpan.org/, MetaCPAN}@footnote{Cette fonctionnalité requiert l'installation de Guile-JSON. @xref{Requirements}.}. Les informations sont récupérées au format JSON disponible à travers @uref{https://fastapi.metacpan.org/, l'API de MetaCPAN} et inclus les informations les plus utiles, comme les dépendances des modules. L'information sur les licences doit être vérifiée avec attention. Si Perl est disponible dans le dépôt, alors l'utilitaire @code{corelist} sera utiliser pour exclure les modules du cœur de la distribution Perl de la liste des dépendances." - -#. type: table -#: doc/guix.texi:6387 -msgid "The command command below imports metadata for the @code{Acme::Boolean} Perl module:" -msgstr "La commande ci-dessous importe les métadonnées du module Perl @code{Acme::Boolean} :" - -#. type: example -#: doc/guix.texi:6390 -#, no-wrap -msgid "guix import cpan Acme::Boolean\n" -msgstr "guix import cpan Acme::Boolean\n" - -#. type: item -#: doc/guix.texi:6392 doc/guix.texi:6784 -#, no-wrap -msgid "cran" -msgstr "cran" - -#. type: cindex -#: doc/guix.texi:6393 -#, no-wrap -msgid "CRAN" -msgstr "CRAN" - -#. type: cindex -#: doc/guix.texi:6394 -#, no-wrap -msgid "Bioconductor" -msgstr "Bioconductor" - -#. type: table -#: doc/guix.texi:6398 -msgid "Import metadata from @uref{https://cran.r-project.org/, CRAN}, the central repository for the @uref{http://r-project.org, GNU@tie{}R statistical and graphical environment}." -msgstr "Importe des métadonnées de @uref{https://cran.r-project.org/, CRAN}, le dépôt central de @uref{http://r-project.org, l'environnement statistique et graphique GUN@tie{}R}." - -#. type: table -#: doc/guix.texi:6400 -msgid "Information is extracted from the @code{DESCRIPTION} file of the package." -msgstr "Les informations sont extraites du fichier @file{DESCRIPTION} du paquet." - -#. type: table -#: doc/guix.texi:6403 -msgid "The command command below imports metadata for the @code{Cairo} R package:" -msgstr "La commande ci-dessous importe les métadonnées du paquet R @code{Cairo} :" - -#. type: example -#: doc/guix.texi:6406 -#, no-wrap -msgid "guix import cran Cairo\n" -msgstr "guix import cran Cairo\n" - -#. type: table -#: doc/guix.texi:6411 -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 "Lorsque l'option @code{--recursive} est utilisée, l'importateur traversera le graphe des dépendances du paquet amont récursivement et générera des expressions de paquets pour tous ceux qui ne sont pas déjà dans Guix." - -#. type: table -#: doc/guix.texi:6416 -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 "Lorsque l'option @code{--archive=bioconductor} est utilisée, les métadonnées sont importées de @uref{https://www.bioconductor.org/, Bioconductor}, un répertoire de paquets R pour l'analyse et la compréhension de données génomiques volumineuses en bioinformatique." - -#. type: table -#: doc/guix.texi:6419 -msgid "Information is extracted from the @code{DESCRIPTION} file of a package published on the web interface of the Bioconductor SVN repository." -msgstr "Les informations sont extraites du fichier @file{DESCRIPTION} d'un paquet publié sur l'interface web du dépôt SVN de Bioconductor." - -#. type: table -#: doc/guix.texi:6422 -msgid "The command below imports metadata for the @code{GenomicRanges} R package:" -msgstr "La commande ci-dessous importe les métadonnées du paquet R @code{GenomicRanges} :" - -#. type: example -#: doc/guix.texi:6425 -#, no-wrap -msgid "guix import cran --archive=bioconductor GenomicRanges\n" -msgstr "guix import cran --archive=bioconductor GenomicRanges\n" - -#. type: item -#: doc/guix.texi:6427 -#, no-wrap -msgid "texlive" -msgstr "texlive" - -#. type: cindex -#: doc/guix.texi:6428 -#, no-wrap -msgid "TeX Live" -msgstr "TeX Live" - -#. type: cindex -#: doc/guix.texi:6429 -#, no-wrap -msgid "CTAN" -msgstr "CTAN" - -#. type: table -#: doc/guix.texi:6433 -msgid "Import metadata from @uref{http://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 "Importe les métadonnées de @uref{http://www.ctan.org/, CTAN}, l'archive TeX réseau complète pour les paquets TeX qui font partie de la @uref{https://www.tug.org/texlive/, distribution TeX Live}." - -#. type: table -#: doc/guix.texi:6438 -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 "Les informations sur les paquets sont obtenues à travers l'API XML fournie par CTAN, tandis que le code source est téléchargé depuis le dépôt SVN du projet Tex Live. Cette méthode est utilisée parce que CTAN ne garde pas d'archives versionnées." - -#. type: table -#: doc/guix.texi:6441 -msgid "The command command below imports metadata for the @code{fontspec} TeX package:" -msgstr "La commande ci-dessous importe les métadonnées du paquet TeX @code{fontspec} :" - -#. type: example -#: doc/guix.texi:6444 -#, no-wrap -msgid "guix import texlive fontspec\n" -msgstr "guix import texlive fontspec\n" - -#. type: table -#: doc/guix.texi:6450 -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 "Lorsque l'option @code{--archive=DIRECTORY} est utilisée, le code source n'est pas téléchargé depuis le sous-répertoire @file{latex} du l'arborescence @file{texmf-dist/source} dans le dépôt SVN de TeX Live, mais depuis le répertoire voisin spécifié sous la même racine." - -#. type: table -#: doc/guix.texi:6454 -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 "La commande ci-dessous importe les métadonnées du paquet @code{ifxetex} depuis CTAN en récupérant les sources depuis le répertoire @file{texmf/source/generic} :" - -#. type: example -#: doc/guix.texi:6457 -#, no-wrap -msgid "guix import texlive --archive=generic ifxetex\n" -msgstr "guix import texlive --archive=generic ifxetex\n" - -#. type: item -#: doc/guix.texi:6459 -#, no-wrap -msgid "json" -msgstr "json" - -#. type: cindex -#: doc/guix.texi:6460 -#, no-wrap -msgid "JSON, import" -msgstr "JSON, import" - -#. type: table -#: doc/guix.texi:6465 -msgid "Import package metadata from a local JSON file@footnote{This functionality requires Guile-JSON to be installed. @xref{Requirements}.}. Consider the following example package definition in JSON format:" -msgstr "Importe des métadonnées d'un fichier JSON local@footnote{Cette fonctionnalité requiert l'installation de Guile-JSON. @xref{Requirements}.}. Considérez l'exemple suivant d'une définition de paquet au format JSON :" - -#. type: example -#: doc/guix.texi:6478 -#, no-wrap +"\n" +" --verify[=OPTS] vérifier l'intégrité du stockage. OPTS est une\n" +" combinaison de « repair » et « contents » séparés\n" +" par une virgule" + +#: guix/scripts/gc.scm:71 msgid "" -"@{\n" -" \"name\": \"hello\",\n" -" \"version\": \"2.10\",\n" -" \"source\": \"mirror://gnu/hello/hello-2.10.tar.gz\",\n" -" \"build-system\": \"gnu\",\n" -" \"home-page\": \"https://www.gnu.org/software/hello/\",\n" -" \"synopsis\": \"Hello, GNU world: An example GNU package\",\n" -" \"description\": \"GNU Hello prints a greeting.\",\n" -" \"license\": \"GPL-3.0+\",\n" -" \"native-inputs\": [\"gcc@@6\"]\n" -"@}\n" +"\n" +" --list-failures list cached build failures" msgstr "" -"@{\n" -" \"name\": \"hello\",\n" -" \"version\": \"2.10\",\n" -" \"source\": \"mirror://gnu/hello/hello-2.10.tar.gz\",\n" -" \"build-system\": \"gnu\",\n" -" \"home-page\": \"https://www.gnu.org/software/hello/\",\n" -" \"synopsis\": \"Hello, GNU world: An example GNU package\",\n" -" \"description\": \"GNU Hello prints a greeting.\",\n" -" \"license\": \"GPL-3.0+\",\n" -" \"native-inputs\": [\"gcc@@6\"]\n" -"@}\n" - -#. type: table -#: doc/guix.texi:6484 -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 "Les noms des champs sont les mêmes que pour les enregistrements de @code{} (@xref{Defining Packages}). Les référence à d'autres paquets sont fournies comme des listes JSON de chaînes de spécifications de paquets comme @code{guile} ou @code{guile@@2.0}." - -#. type: table -#: doc/guix.texi:6487 -msgid "The importer also supports a more explicit source definition using the common fields for @code{} records:" -msgstr "L'importateur supporte aussi une définition plus explicite des sources avec les champs habituels pour les enregistrements @code{} :" - -#. type: example -#: doc/guix.texi:6500 -#, no-wrap +"\n" +" --list-failures lister les échecs de compilation en cache" + +#: guix/scripts/gc.scm:73 msgid "" -"@{\n" -" @dots{}\n" -" \"source\": @{\n" -" \"method\": \"url-fetch\",\n" -" \"uri\": \"mirror://gnu/hello/hello-2.10.tar.gz\",\n" -" \"sha256\": @{\n" -" \"base32\": \"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i\"\n" -" @}\n" -" @}\n" -" @dots{}\n" -"@}\n" -msgstr "" -"@{\n" -" @dots{}\n" -" \"source\": @{\n" -" \"method\": \"url-fetch\",\n" -" \"uri\": \"mirror://gnu/hello/hello-2.10.tar.gz\",\n" -" \"sha256\": @{\n" -" \"base32\": \"0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i\"\n" -" @}\n" -" @}\n" -" @dots{}\n" -"@}\n" - -#. type: table -#: doc/guix.texi:6504 -msgid "The command below reads metadata from the JSON file @code{hello.json} and outputs a package expression:" -msgstr "La commande ci-dessous lit les métadonnées du fichier JSON @code{hello.json} et renvoie une expression de paquet :" - -#. type: example -#: doc/guix.texi:6507 -#, no-wrap -msgid "guix import json hello.json\n" -msgstr "guix import json hello.json\n" - -#. type: item -#: doc/guix.texi:6509 -#, no-wrap -msgid "nix" -msgstr "nix" - -#. type: table -#: doc/guix.texi:6518 -msgid "Import metadata from a local copy of the source of the @uref{http://nixos.org/nixpkgs/, Nixpkgs distribution}@footnote{This relies on the @command{nix-instantiate} command of @uref{http://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 "Importe les métadonnées d'une copie locale des source de @uref{http://nixos.org/nixpkgs/, la distribution Nixpkgs}@footnote{Cela repose sur la commande @command{nix-instantiate} de @uref{http://nixos.org/nix/, Nix}.}. Les définitions de paquets dans Nixpkgs sont habituellement écrites en un mélange entre le langage Nix et Bash. Cette commande n'importe que la structure de haut-niveau du paquet qui est écrite dans le langage Nix. Elle inclut normalement tous les champs de base de la définition d'un paquet." - -#. type: table -#: doc/guix.texi:6521 -msgid "When importing a GNU package, the synopsis and descriptions are replaced by their canonical upstream variant." -msgstr "Lorsque vous importez un paquet GNU, le synopsis et la description sont replacés par la version canonique en amont." - -#. type: table -#: doc/guix.texi:6523 -msgid "Usually, you will first need to do:" -msgstr "Normalement, vous devrez d'abord faire :" - -#. type: example -#: doc/guix.texi:6526 -#, no-wrap -msgid "export NIX_REMOTE=daemon\n" -msgstr "export NIX_REMOTE=daemon\n" - -#. type: table -#: doc/guix.texi:6530 -msgid "so that @command{nix-instantiate} does not try to open the Nix database." -msgstr "pour que @command{nix-instantiate} n'essaye pas d'ouvrir la base de données de Nix." - -#. type: table -#: doc/guix.texi:6534 -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 "Par exemple, la commande ci-dessous importe la définition du paquet de LibreOffice (plus précisément, elle importe la définition du paquet lié à l'attribut de plus haut-niveau @code{libreoffice}) :" - -#. type: example -#: doc/guix.texi:6537 -#, no-wrap -msgid "guix import nix ~/path/to/nixpkgs libreoffice\n" -msgstr "guix import nix ~/path/to/nixpkgs libreoffice\n" - -#. type: item -#: doc/guix.texi:6539 doc/guix.texi:6540 doc/guix.texi:6796 -#, no-wrap -msgid "hackage" -msgstr "hackage" - -#. type: table -#: doc/guix.texi:6545 -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 "Importe les métadonnées de l'archive de paquets centrale de la communauté Haskell, @uref{https://hackage.haskell.org/, Hackage}. Les informations sont récupérées depuis les fichiers Cabal et incluent toutes les informations utiles, dont les dépendances des paquets." - -#. type: item -#: doc/guix.texi:6549 -#, no-wrap -msgid "--stdin" -msgstr "--stdin" - -#. type: itemx -#: doc/guix.texi:6550 -#, no-wrap -msgid "-s" -msgstr "-s" - -#. type: table -#: doc/guix.texi:6552 -msgid "Read a Cabal file from standard input." -msgstr "Lit un fichier Cabal depuis l'entrée standard." - -#. type: item -#: doc/guix.texi:6552 doc/guix.texi:6594 -#, no-wrap -msgid "--no-test-dependencies" -msgstr "--no-test-dependencies" - -#. type: itemx -#: doc/guix.texi:6553 doc/guix.texi:6595 -#, no-wrap -msgid "-t" -msgstr "-t" - -#. type: table -#: doc/guix.texi:6555 doc/guix.texi:6597 -msgid "Do not include dependencies required only by the test suites." -msgstr "N'inclut pas les dépendances requises uniquement par les suites de tests." - -#. type: item -#: doc/guix.texi:6555 -#, no-wrap -msgid "--cabal-environment=@var{alist}" -msgstr "--cabal-environment=@var{alist}" - -#. type: itemx -#: doc/guix.texi:6556 -#, no-wrap -msgid "-e @var{alist}" -msgstr "-e @var{alist}" - -#. type: table -#: doc/guix.texi:6565 -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 "@var{alist} est une alist Scheme qui définie l'environnement dans lequel les conditions de Cabal sont évaluées. Les clefs acceptées sont : @code{os}, @code{arch}, @code{impl} et une représentation sous forme de chaîne de caractères du nom d'un drapeau. La valeur associée à un drapeau doit être le symbole @code{true} ou @code{false}. La valeur associée aux autres clefs doivent se conformer avec la définition du format de fichiers Cabal. La valeur par défaut associée avec les clefs @code{os}, @code{arch} et @code{impl} sont respectivement @samp{linux}, @samp{x86_64} et @samp{ghc}." - -#. type: table -#: doc/guix.texi:6570 -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 "La commande ci-dessous importe les métadonnées de la dernière version du paquet Haskell @code{HTTP} sans inclure les dépendances des tests et en spécifiant la valeur du drapeau @samp{network-uri} comme étant @code{false} :" - -#. type: example -#: doc/guix.texi:6573 -#, no-wrap -msgid "guix import hackage -t -e \"'((\\\"network-uri\\\" . false))\" HTTP\n" -msgstr "guix import hackage -t -e \"'((\\\"network-uri\\\" . false))\" HTTP\n" - -#. type: table -#: doc/guix.texi:6577 -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 "Une version spécifique du paquet peut éventuellement être spécifiée en faisant suivre le nom du paquet par un arobase et un numéro de version comme dans l'exemple suivant :" - -#. type: example -#: doc/guix.texi:6580 -#, no-wrap -msgid "guix import hackage mtl@@2.1.3.1\n" -msgstr "guix import hackage mtl@@2.1.3.1\n" - -#. type: item -#: doc/guix.texi:6582 doc/guix.texi:6583 doc/guix.texi:6798 -#, no-wrap -msgid "stackage" -msgstr "stackage" - -#. type: table -#: doc/guix.texi:6590 -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 "L'importateur @code{stackage} est une enveloppe autour de l'importateur @code{hackage}. Il prend un nom de paquet, recherche la version incluse dans une version au support étendu (LTS) de @uref{https://www.stackage.org, Stackage} et utilise l'importateur @code{hackage} pour récupérer les métadonnées. Remarquez que c'est à vous de choisir une version LTS compatible avec le compilateur GHC utilisé par Guix." - -#. type: item -#: doc/guix.texi:6597 -#, no-wrap -msgid "--lts-version=@var{version}" -msgstr "--lts-version=@var{version}" - -#. type: itemx -#: doc/guix.texi:6598 -#, no-wrap -msgid "-r @var{version}" -msgstr "-r @var{version}" - -#. type: table -#: doc/guix.texi:6601 -msgid "@var{version} is the desired LTS release version. If omitted the latest release is used." -msgstr "@var{version} est la version LTS désirée. Si elle est omise, la dernière version est utilisée." - -#. type: table -#: doc/guix.texi:6605 -msgid "The command below imports metadata for the @code{HTTP} Haskell package included in the LTS Stackage release version 7.18:" -msgstr "La commande ci-dessous importe les métadonnées du paquet Haskell @code{HTTP} inclus dans la version LTS 7.18 de Stackage :" - -#. type: example -#: doc/guix.texi:6608 -#, no-wrap -msgid "guix import stackage --lts-version=7.18 HTTP\n" -msgstr "guix import stackage --lts-version=7.18 HTTP\n" - -#. type: item -#: doc/guix.texi:6610 doc/guix.texi:6611 doc/guix.texi:6782 -#, no-wrap -msgid "elpa" -msgstr "elpa" - -#. type: table -#: doc/guix.texi:6614 -msgid "Import metadata from an Emacs Lisp Package Archive (ELPA) package repository (@pxref{Packages,,, emacs, The GNU Emacs Manual})." -msgstr "Importe les métadonnées du dépôt de paquets ELPA (Emacs Lisp Package Archive) (@pxref{Packages,,, emacs, The GNU Emacs Manual})." - -#. type: item -#: doc/guix.texi:6618 -#, no-wrap -msgid "--archive=@var{repo}" -msgstr "--archive=@var{repo}" - -#. type: itemx -#: doc/guix.texi:6619 -#, no-wrap -msgid "-a @var{repo}" -msgstr "-a @var{repo}" - -#. type: table -#: doc/guix.texi:6623 -msgid "@var{repo} identifies the archive repository from which to retrieve the information. Currently the supported repositories and their identifiers are:" -msgstr "@var{repo} identifie le dépôt d'archive depuis lequel récupérer les informations. Actuellement les dépôts supportés et leurs identifiants sont :" - -#. type: itemize -#: doc/guix.texi:6627 -msgid "@uref{http://elpa.gnu.org/packages, GNU}, selected by the @code{gnu} identifier. This is the default." -msgstr "@uref{http://elpa.gnu.org/packages, GNU}, qu'on peut choisir avec l'identifiant @code{gnu}. C'est la valeur par défaut." - -#. type: itemize -#: doc/guix.texi:6633 -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 "Les paquets de @code{elpa.gnu.org} avec l'une des clefs contenues dans le porte-clef GnuPG @file{share/emacs/25.1/etc/package-keyring.gpg} (ou similaire) dans le paquet @code{emacs} (@pxref{Package Installation, ELPA package signatures,, emacs, The GNU Emacs Manual})." - -#. type: itemize -#: doc/guix.texi:6637 -msgid "@uref{http://stable.melpa.org/packages, MELPA-Stable}, selected by the @code{melpa-stable} identifier." -msgstr "@uref{http://stable.melpa.org/packages, MELPA-Stable}, qu'on peut sélectionner avec l'identifiant @code{melpa-stable}." - -#. type: itemize -#: doc/guix.texi:6641 -msgid "@uref{http://melpa.org/packages, MELPA}, selected by the @code{melpa} identifier." -msgstr "@uref{http://melpa.org/packages, MELPA}, qu'on peut sélectionner avec l'identifiant @code{melpa}." - -#. type: table -#: doc/guix.texi:6648 -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 "Traverse le graphe des dépendances du paquet amont donné et génère les expressions de paquets de tous ceux qui ne sont pas déjà dans Guix." - -#. type: item -#: doc/guix.texi:6650 doc/guix.texi:6651 doc/guix.texi:6800 -#, no-wrap -msgid "crate" -msgstr "crate" - -#. type: table -#: doc/guix.texi:6654 -msgid "Import metadata from the crates.io Rust package repository @uref{https://crates.io, crates.io}." -msgstr "Importe les métadonnées du répertoire des paquets Rust @uref{https://crates.io, crates.io}." - -#. type: Plain text -#: doc/guix.texi:6659 -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 "La structure du code de @command{guix import} est modulaire. Il serait utile d'avoir plus d'importateurs pour d'autres formats de paquets et votre aide est la bienvenue sur ce sujet (@pxref{Contributing})." - -#. type: section -#: doc/guix.texi:6661 -#, no-wrap -msgid "Invoking @command{guix refresh}" -msgstr "Invoquer @command{guix refresh}" - -#. type: command{#1} -#: doc/guix.texi:6663 -#, no-wrap -msgid "guix refresh" -msgstr "guix refresh" - -#. type: Plain text -#: doc/guix.texi:6668 -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 "L'audience première de la commande @command{guix refresh} est l'ensemble des développeurs de la distribution logicielle GNU. Par défaut, elle rapporte les paquets fournis par la distribution qui sont en retard par rapport aux dernières versions disponibles en amont, comme ceci :" - -#. type: example -#: doc/guix.texi:6673 -#, no-wrap -msgid "" -"$ guix refresh\n" -"gnu/packages/gettext.scm:29:13: gettext would be upgraded from 0.18.1.1 to 0.18.2.1\n" -"gnu/packages/glib.scm:77:12: glib would be upgraded from 2.34.3 to 2.37.0\n" -msgstr "" -"$ guix refresh\n" -"gnu/packages/gettext.scm:29:13: gettext serait mis à jour de 0.18.1.1 à 0.18.2.1\n" -"gnu/packages/glib.scm:77:12: glib serait mis à jour de 2.34.3 à 2.37.0\n" - -#. type: Plain text -#: doc/guix.texi:6677 -msgid "Alternately, one can specify packages to consider, in which case a warning is emitted for packages that lack an updater:" -msgstr "Autrement, on peut spécifier les paquets à considérer, auquel cas un avertissement est émis pour les paquets qui n'ont pas de gestionnaire de mise à jour associé :" - -#. type: example -#: doc/guix.texi:6682 -#, no-wrap -msgid "" -"$ guix refresh coreutils guile guile-ssh\n" -"gnu/packages/ssh.scm:205:2: warning: no updater for guile-ssh\n" -"gnu/packages/guile.scm:136:12: guile would be upgraded from 2.0.12 to 2.0.13\n" -msgstr "" -"$ guix refresh coreutils guile guile-ssh\n" -"gnu/packages/ssh.scm:205:2 : avertissement : aucun gestionnaire de mise à jour pour guile-ssh\n" -"gnu/packages/guile.scm:136:12 : guile serait mis à jour de 2.0.12 à 2.0.13\n" - -#. type: Plain text -#: doc/guix.texi:6691 -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 "@command{guix refresh} navigue le dépôt amont de chaque paquet et détermine le numéro de version le plus élevé parmi les versions publiées. La commande sait comment mettre à jour certains types de paquets : les paquets GNU, les paquets ELPA, etc. — voir la documentation pour @option{--type} ci-dessous. Il y a beaucoup de paquet cependant pour lesquels il manque une méthode pour déterminer si une nouvelle version est disponible en amont. Cependant, le mécanisme est extensible, alors n'hésitez pas à nous contacter pour ajouter une nouvelle méthode !" - -#. type: Plain text -#: doc/guix.texi:6696 -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 "Parfois les noms en amont diffèrent du nom de paquet utilisé par Guix et @command{guix refresh} a besoin d'un peu d'aide. La plupart des gestionnaires de mise à jour honorent la propriété @code{upstream-name} dans les définitions de paquets, ce qui peut être utilisé à cette fin :" - -#. type: example -#: doc/guix.texi:6703 -#, no-wrap -msgid "" -"(define-public network-manager\n" -" (package\n" -" (name \"network-manager\")\n" -" ;; @dots{}\n" -" (properties '((upstream-name . \"NetworkManager\")))))\n" -msgstr "" -"(define-public network-manager\n" -" (package\n" -" (name \"network-manager\")\n" -" ;; @dots{}\n" -" (properties '((upstream-name . \"NetworkManager\")))))\n" - -#. type: Plain text -#: doc/guix.texi:6715 -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{gpg}, and finally computing its hash. 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 "Lorsque l'option @code{--update} est utilisée, elle modifie les fichiers source de la distribution pour mettre à jour le numéro de version et le hash de l'archive source de ces recettes de paquets (@pxref{Defining Packages}). Cela est effectué en téléchargeant la dernière version de l'archive des sources de chaque paquet et des signatures associées, en authentifiant l'archive téléchargée avec sa signature en utilisant @command{gpg} puis en calculant son hash. Lorsque la clef publique utilisée pour signer l'archive manque du porte-clefs de l'utilisateur, le gestionnaire tente de la récupérer automatiquement d'un serveur de clef public ; si cela réussi, la clef est ajoutée au porte-clefs de l'utilisateur, sinon @command{guix refresh} rapporte une erreur." - -#. type: Plain text -#: doc/guix.texi:6717 -msgid "The following options are supported:" -msgstr "Les options suivantes sont supportées :" - -#. type: table -#: doc/guix.texi:6725 doc/guix.texi:7312 -msgid "This is useful to precisely refer to a package, as in this example:" -msgstr "C'est utile pour précisément se référer à un paquet, comme dans cet exemple :" - -#. type: example -#: doc/guix.texi:6728 -#, no-wrap -msgid "guix refresh -l -e '(@@@@ (gnu packages commencement) glibc-final)'\n" -msgstr "guix refresh -l -e '(@@@@ (gnu packages commencement) glibc-final)'\n" - -#. type: table -#: doc/guix.texi:6732 -msgid "This command lists the dependents of the ``final'' libc (essentially all the packages.)" -msgstr "Cette commande liste les paquets qui dépendent de la libc « finale » (en gros tous les paquets)." - -#. type: item -#: doc/guix.texi:6733 -#, no-wrap -msgid "--update" -msgstr "--update" - -#. type: itemx -#: doc/guix.texi:6734 -#, no-wrap -msgid "-u" -msgstr "-u" - -#. type: table -#: doc/guix.texi:6738 -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 "Met à jour les fichiers source de la distribution (les recettes de paquets) en place. Cette option est généralement utilisée depuis une copie du dépôt git de Guix (@pxref{Running Guix Before It Is Installed}) :" - -#. type: example -#: doc/guix.texi:6741 -#, no-wrap -msgid "$ ./pre-inst-env guix refresh -s non-core -u\n" -msgstr "$ ./pre-inst-env guix refresh -s non-core -u\n" - -#. type: table -#: doc/guix.texi:6744 -msgid "@xref{Defining Packages}, for more information on package definitions." -msgstr "@xref{Defining Packages}, pour plus d'information sur les définitions des paquets." - -#. type: item -#: doc/guix.texi:6745 -#, no-wrap -msgid "--select=[@var{subset}]" -msgstr "--select=[@var{subset}]" - -#. type: itemx -#: doc/guix.texi:6746 -#, no-wrap -msgid "-s @var{subset}" -msgstr "-s @var{subset}" - -#. type: table -#: doc/guix.texi:6749 -msgid "Select all the packages in @var{subset}, one of @code{core} or @code{non-core}." -msgstr "Choisi tous les paquets dans @var{subset}, entre @code{core} et @code{non-core}." - -#. type: table -#: doc/guix.texi:6756 -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 "Le sous-ensemble @code{core} se réfère à tous les paquets du cœur de la distribution — c.-à-d.@: les paquets qui sont utilisés pour construire « tout le rest ». Cela comprend GCC, libc, Binutils, Bash, etc. Habituellement, changer l'un de ces paquets dans la distribution implique de reconstruire tous les autres. Ainsi, ces mises à jour sont une nuisance pour les utilisateurs, en terme de temps de compilation et de bande passante utilisés pour effectuer la mise à jour." - -#. type: table -#: doc/guix.texi:6760 -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 "Le sous-ensemble @code{non-core} se réfère au reste des paquets. C'est habituellement utile dans les cas où une mise à jour des paquets du cœur serait dérangeante." - -#. type: table -#: doc/guix.texi:6765 -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 "Choisi tous les paquets du manifeste dans @var{file}. C'est utile pour vérifier qu'aucun des paquets du manifeste utilisateur ne peut être mis à jour." - -#. type: item -#: doc/guix.texi:6766 -#, no-wrap -msgid "--type=@var{updater}" -msgstr "--type=@var{updater}" - -#. type: itemx -#: doc/guix.texi:6767 -#, no-wrap -msgid "-t @var{updater}" -msgstr "-t @var{updater}" - -#. type: table -#: doc/guix.texi:6770 -msgid "Select only packages handled by @var{updater} (may be a comma-separated list of updaters). Currently, @var{updater} may be one of:" -msgstr "Chois uniquement les paquets pris en charge par @var{updater} (éventuellement une liste de gestionnaires de mise à jour séparés par des virgules). Actuellement, @var{updater} peut être l'une des valeurs suivantes :" - -#. type: table -#: doc/guix.texi:6774 -msgid "the updater for GNU packages;" -msgstr "le gestionnaire de mise à jour pour les paquets GNU ;" - -#. type: item -#: doc/guix.texi:6774 -#, no-wrap -msgid "gnome" -msgstr "gnome" - -#. type: table -#: doc/guix.texi:6776 -msgid "the updater for GNOME packages;" -msgstr "le gestionnaire de mise à jour pour les paquets GNOME ;" - -#. type: item -#: doc/guix.texi:6776 -#, no-wrap -msgid "kde" -msgstr "kde" - -#. type: table -#: doc/guix.texi:6778 -msgid "the updater for KDE packages;" -msgstr "le gestionnaire de mise à jour pour les paquets KDE ;" - -#. type: item -#: doc/guix.texi:6778 -#, no-wrap -msgid "xorg" -msgstr "xorg" - -#. type: table -#: doc/guix.texi:6780 -msgid "the updater for X.org packages;" -msgstr "le gestionnaire de mise à jour pour les paquets X.org ;" - -#. type: item -#: doc/guix.texi:6780 -#, no-wrap -msgid "kernel.org" -msgstr "kernel.org" - -#. type: table -#: doc/guix.texi:6782 -msgid "the updater for packages hosted on kernel.org;" -msgstr "le gestionnaire de mise à jour pour les paquets hébergés sur kernel.org ;" - -#. type: table -#: doc/guix.texi:6784 -msgid "the updater for @uref{http://elpa.gnu.org/, ELPA} packages;" -msgstr "le gestionnaire de mise à jour pour les paquets @uref{http://elpa.gnu.org/, ELPA} ;" - -#. type: table -#: doc/guix.texi:6786 -msgid "the updater for @uref{https://cran.r-project.org/, CRAN} packages;" -msgstr "le gestionnaire de mise à jour pour les paquets @uref{https://cran.r-project.org/, CRAN} ;" - -#. type: item -#: doc/guix.texi:6786 -#, no-wrap -msgid "bioconductor" -msgstr "bioconductor" - -#. type: table -#: doc/guix.texi:6788 -msgid "the updater for @uref{https://www.bioconductor.org/, Bioconductor} R packages;" -msgstr "le gestionnaire de mise à jour pour les paquets @uref{https://www.bioconductor.org/, Bioconductor} ;" - -#. type: table -#: doc/guix.texi:6790 -msgid "the updater for @uref{http://www.cpan.org/, CPAN} packages;" -msgstr "le gestionnaire de mise à jour pour les paquets @uref{http://www.cpan.org/, CPAN} ;" - -#. type: table -#: doc/guix.texi:6792 -msgid "the updater for @uref{https://pypi.python.org, PyPI} packages." -msgstr "le gestionnaire de mise à jour pour les paquets @uref{https://pypi.python.org, PyPI} ;" - -#. type: table -#: doc/guix.texi:6794 -msgid "the updater for @uref{https://rubygems.org, RubyGems} packages." -msgstr "le gestionnaire de mise à jour pour les paquets @uref{https://rubygems.org, RubyGems} ;" - -#. type: item -#: doc/guix.texi:6794 -#, no-wrap -msgid "github" -msgstr "github" - -#. type: table -#: doc/guix.texi:6796 -msgid "the updater for @uref{https://github.com, GitHub} packages." -msgstr "le gestionnaire de mise à jour pour les paquets @uref{https://github.com, GitHub} ;" - -#. type: table -#: doc/guix.texi:6798 -msgid "the updater for @uref{https://hackage.haskell.org, Hackage} packages." -msgstr "le gestionnaire de mise à jour pour les paquets @uref{https://hackage.haskell.org, Hackage} ;" - -#. type: table -#: doc/guix.texi:6800 -msgid "the updater for @uref{https://www.stackage.org, Stackage} packages." -msgstr "le gestionnaire de mise à jour pour les paquets @uref{https://www.stackage.org, Stackage} ;" - -#. type: table -#: doc/guix.texi:6802 -msgid "the updater for @uref{https://crates.io, Crates} packages." -msgstr "le gestionnaire de mise à jour pour les paquets @uref{https://crates.io, Crates} ;" - -#. type: table -#: doc/guix.texi:6806 -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 "Par exemple, la commande suivante ne vérifie que les mises à jour des paquets Emacs hébergés sur @code{elpa.gnu.org} et les paquets CRAN :" - -#. type: example -#: doc/guix.texi:6811 -#, no-wrap -msgid "" -"$ guix refresh --type=elpa,cran\n" -"gnu/packages/statistics.scm:819:13: r-testthat would be upgraded from 0.10.0 to 0.11.0\n" -"gnu/packages/emacs.scm:856:13: emacs-auctex would be upgraded from 11.88.6 to 11.88.9\n" -msgstr "" -"$ guix refresh --type=elpa,cran\n" -"gnu/packages/statistics.scm:819:13 : r-testthat serait mis à jour de 0.10.0 à 0.11.0\n" -"gnu/packages/emacs.scm:856:13 : emacs-auctex serait mis à jour de 11.88.6 à 11.88.9\n" - -#. type: Plain text -#: doc/guix.texi:6817 -msgid "In addition, @command{guix refresh} can be passed one or more package names, as in this example:" -msgstr "En plus, on peut passer à @command{guix refresh} un ou plusieurs noms de paquets, comme dans cet exemple :" - -#. type: example -#: doc/guix.texi:6820 -#, no-wrap -msgid "$ ./pre-inst-env guix refresh -u emacs idutils gcc@@4.8\n" -msgstr "$ ./pre-inst-env guix refresh -u emacs idutils gcc@@4.8\n" - -#. type: Plain text -#: doc/guix.texi:6826 -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 "La commande au-dessus met à jour spécifiquement les paquets @code{emacs} et @code{idutils}. L'option @code{--select} n'aurait aucun effet dans ce cas." - -#. type: Plain text -#: doc/guix.texi:6831 -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 "Pour déterminer s'il faut mettre à jour un paquet, il est parfois pratique de savoir quels paquets seraient affectés par la mise à jour pour pouvoir vérifier la compatibilité. Pour cela l'option suivante peut être utilisée avec un ou plusieurs noms de paquets passés à @command{guix refresh} :" - -#. type: item -#: doc/guix.texi:6834 -#, no-wrap -msgid "--list-updaters" -msgstr "--list-updaters" - -#. type: itemx -#: doc/guix.texi:6835 -#, no-wrap -msgid "-L" -msgstr "-L" - -#. type: table -#: doc/guix.texi:6837 -msgid "List available updaters and exit (see @option{--type} above.)" -msgstr "Liste les gestionnaires de mise à jour et quitte (voir l'option @option{--type} plus haut)." - -#. type: table -#: doc/guix.texi:6840 -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 "Pour chaque gestionnaire, affiche le pourcentage de paquets qu'il couvre ; à la fin, affiche le pourcentage de paquets couverts par tous les gestionnaires." - -#. type: item -#: doc/guix.texi:6841 -#, no-wrap -msgid "--list-dependent" -msgstr "--list-dependent" - -#. type: itemx -#: doc/guix.texi:6842 doc/guix.texi:7005 -#, no-wrap -msgid "-l" -msgstr "-l" - -#. type: table -#: doc/guix.texi:6845 -msgid "List top-level dependent packages that would need to be rebuilt as a result of upgrading one or more packages." -msgstr "Liste les paquets de plus haut-niveau qui devraient être reconstruits après la mise à jour d'un ou plusieurs paquets." - -#. type: table -#: doc/guix.texi:6849 -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 "@xref{Invoking guix graph, le type @code{reverse-package} de @command{guix graph}}, pour des informations sur la manière de visualiser la liste des paquets dépendant d'un autre." - -#. type: Plain text -#: doc/guix.texi:6855 -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 "Soyez conscients que l'option @code{--list-dependent} ne fait @emph{qu'approximer} les reconstructions qui seraient requises par une mise à jour. Plus de reconstructions pourraient être requises dans certaines circonstances." - -#. type: example -#: doc/guix.texi:6860 -#, no-wrap -msgid "" -"$ guix refresh --list-dependent flex\n" -"Building the following 120 packages would ensure 213 dependent packages are rebuilt:\n" -"hop@@2.4.0 geiser@@0.4 notmuch@@0.18 mu@@0.9.9.5 cflow@@1.4 idutils@@4.6 @dots{}\n" -msgstr "" -"$ guix refresh --list-dependent flex\n" -"Building the following 120 packages would ensure 213 dependent packages are rebuilt:\n" -"hop@@2.4.0 geiser@@0.4 notmuch@@0.18 mu@@0.9.9.5 cflow@@1.4 idutils@@4.6 @dots{}\n" - -#. type: Plain text -#: doc/guix.texi:6864 -msgid "The command above lists a set of packages that could be built to check for compatibility with an upgraded @code{flex} package." -msgstr "La commande ci-dessus liste un ensemble de paquets qui peuvent être construits pour vérifier la compatibilité d'une mise à jour de @code{flex}." - -#. type: Plain text -#: doc/guix.texi:6866 -msgid "The following options can be used to customize GnuPG operation:" -msgstr "Les options suivante peuvent être utilisées pour personnaliser les opérations avec GnuPG :" - -#. type: item -#: doc/guix.texi:6869 -#, no-wrap -msgid "--gpg=@var{command}" -msgstr "--gpg=@var{commande}" - -#. type: table -#: doc/guix.texi:6872 -msgid "Use @var{command} as the GnuPG 2.x command. @var{command} is searched for in @code{$PATH}." -msgstr "Utilise @var{commande} comme la commande de GnuPG 2.x. @var{commande} est recherchée dans @code{PATH}." - -#. type: table -#: doc/guix.texi:6876 -msgid "Handle missing OpenPGP keys according to @var{policy}, which may be one of:" -msgstr "Gère les clefs OpenPGP manquantes d'après la @var{politique}, qui peut être l'une des suivantes :" - -#. type: item -#: doc/guix.texi:6878 doc/guix.texi:14077 -#, no-wrap -msgid "always" -msgstr "always" - -#. type: table -#: doc/guix.texi:6881 -msgid "Always download missing OpenPGP keys from the key server, and add them to the user's GnuPG keyring." -msgstr "Toujours télécharger les clefs manquantes depuis un serveur de clefs et les ajouter au porte-clefs de l'utilisateur." - -#. type: item -#: doc/guix.texi:6882 doc/guix.texi:14079 -#, no-wrap -msgid "never" -msgstr "never" - -#. type: table -#: doc/guix.texi:6884 -msgid "Never try to download missing OpenPGP keys. Instead just bail out." -msgstr "Ne jamais essayer de télécharger les clefs OpenPGP manquante. Quitter à la place." - -#. type: item -#: doc/guix.texi:6885 -#, no-wrap -msgid "interactive" -msgstr "interactive" - -#. type: table -#: doc/guix.texi:6888 -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 "Lorsqu'on rencontre un paquet signé par une clef OpenPGP inconnue, demander à l'utilisateur s'il souhaite la télécharger ou non. C'est le comportement par défaut." - -#. type: item -#: doc/guix.texi:6890 -#, no-wrap -msgid "--key-server=@var{host}" -msgstr "--key-server=@var{host}" - -#. type: table -#: doc/guix.texi:6892 -msgid "Use @var{host} as the OpenPGP key server when importing a public key." -msgstr "Utiliser @var{host} comme serveur de clefs OpenPGP lors de l'importe d'une clef publique." - -#. type: Plain text -#: doc/guix.texi:6905 -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 "Le gestionnaire de mises à jour @code{github} utilise @uref{https://developer.github.com/v3/, l'API de GitHub} pour faire des requêtes sur les nouvelles versions. Lorsqu'elle est utilisé de manière répétée, p.@: ex.@: lorsque vous vérifiez tous les paquets, GitHub finira par refuser de répondre à d'autres requêtes de l'API. Par défaut 60 requêtes à l'heure sont autorisées, et une vérification complète de tous les paquets GitHub dans Guix requiert bien plus que cela. L'authentification avec GitHub à travers l'utilisation d'un jeton d'API lève ces limites. Pour utiliser un jeton de l'API, initialisez la variable d'environnement @code{GUIX_GITHUB_TOKEN} avec un jeton que vous vous serez procuré sur @uref{https://github.com/settings/tokens} ou autrement." - -#. type: section -#: doc/guix.texi:6908 -#, no-wrap -msgid "Invoking @command{guix lint}" -msgstr "Invoquer @command{guix lint}" - -#. type: command{#1} -#: doc/guix.texi:6910 -#, no-wrap -msgid "guix lint" -msgstr "guix lint" - -#. type: cindex -#: doc/guix.texi:6911 -#, no-wrap -msgid "package, checking for errors" -msgstr "paquets, chercher des erreurs" - -#. type: Plain text -#: doc/guix.texi:6917 -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 "La commande @command{guix lint} est conçue pour aider les développeurs à éviter des erreurs commune et à utiliser un style cohérent lors de l'écriture de recettes de paquets. Elle lance des vérifications sur un ensemble de paquets donnés pour trouver des erreurs communes dans leur définition. Les @dfn{vérifieurs} disponibles comprennent (voir @code{--list-checkers} pour une liste complète) :" - -#. type: table -#: doc/guix.texi:6923 -msgid "Validate certain typographical and stylistic rules about package descriptions and synopses." -msgstr "Vérifie certaines règles typographiques et stylistiques dans les descriptions et les synopsis." - -#. type: item -#: doc/guix.texi:6924 -#, no-wrap -msgid "inputs-should-be-native" -msgstr "inputs-should-be-native" - -#. type: table -#: doc/guix.texi:6926 -msgid "Identify inputs that should most likely be native inputs." -msgstr "Identifie les entrées qui devraient sans doute plutôt être des entrées natives." - -#. type: itemx -#: doc/guix.texi:6929 -#, no-wrap -msgid "mirror-url" -msgstr "mirror-url" - -#. type: itemx -#: doc/guix.texi:6930 -#, no-wrap -msgid "source-file-name" -msgstr "source-file-name" - -#. type: table -#: doc/guix.texi:6936 -msgid "Probe @code{home-page} and @code{source} URLs and report those that are invalid. Suggest a @code{mirror://} URL when applicable. 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 "Sonde les URL @code{home-page} et @code{source} et rapporte celles qui sont invalides. Suggère une URL en @code{mirror://} lorsque c'est possible. Vérifie que le nom du fichier source a un sens, p.@: ex.@: qu'il ne s'agisse pas juste d'un numéro de version ou « git-checkou », sans avoir déclaré un @code{file-name} (@pxref{origin Reference})." - -#. type: item -#: doc/guix.texi:6937 -#, no-wrap -msgid "cve" -msgstr "cve" - -#. type: cindex -#: doc/guix.texi:6938 doc/guix.texi:21969 -#, no-wrap -msgid "security vulnerabilities" -msgstr "vulnérabilités" - -#. type: cindex -#: doc/guix.texi:6939 -#, no-wrap -msgid "CVE, Common Vulnerabilities and Exposures" -msgstr "CVE, Common Vulnerabilities and Exposures" - -#. type: table -#: doc/guix.texi:6944 -msgid "Report known vulnerabilities found in the Common Vulnerabilities and Exposures (CVE) databases of the current and past year @uref{https://nvd.nist.gov/download.cfm#CVE_FEED, published by the US NIST}." -msgstr "Rapporte les vulnérabilités connues trouvées dans les bases de données CVE (Common Vulnerabilities and Exposures) de l'année en cours et des années précédentes @uref{https://nvd.nist.gov/download.cfm#CVE_FEED, publié par le NIST américain}." - -#. type: table -#: doc/guix.texi:6946 -msgid "To view information about a particular vulnerability, visit pages such as:" -msgstr "Pour voir les informations sur une vulnérabilité en particulier, visitez les pages :" - -#. type: indicateurl{#1} -#: doc/guix.texi:6950 -msgid "https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-YYYY-ABCD" -msgstr "https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-ANNÉE-ABCD" - -#. type: indicateurl{#1} -#: doc/guix.texi:6952 -msgid "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-YYYY-ABCD" -msgstr "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-ANNÉE-ABCD" - -#. type: table -#: doc/guix.texi:6957 -msgid "where @code{CVE-YYYY-ABCD} is the CVE identifier---e.g., @code{CVE-2015-7554}." -msgstr "où @code{CVE-ANNÉE-ABCD} est l'identifiant CVE — p.@: ex.@: @code{CVE-2015-7554}." - -#. type: table -#: doc/guix.texi:6962 -msgid "Package developers can specify in package recipes the @uref{https://nvd.nist.gov/cpe.cfm,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 "Les développeurs de paquets peuvent spécifier dans les recettes des paquets le nom @uref{https://nvd.nist.gov/cpe.cfm,CPE (Common Platform Enumeration)} et la version du paquet s'ils diffèrent du nom et de la version que Guix utilise, comme dans cet exemple :" - -#. type: example -#: doc/guix.texi:6970 -#, no-wrap -msgid "" -"(package\n" -" (name \"grub\")\n" -" ;; @dots{}\n" -" ;; CPE calls this package \"grub2\".\n" -" (properties '((cpe-name . \"grub2\")\n" -" (cpe-version . \"2.3\")))\n" -msgstr "" -"(package\n" -" (name \"grub\")\n" -" ;; @dots{}\n" -" ;; CPE calls this package \"grub2\".\n" -" (properties '((cpe-name . \"grub2\")\n" -" (cpe-version . \"2.3\")))\n" - -#. type: table -#: doc/guix.texi:6977 -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 "Certaines entrées dans la base de données CVE ne spécifient pas la version du paquet auquel elles s'appliquent et lui restera donc attachée pour toujours. Les développeurs qui trouvent des alertes CVE et ont vérifiés qu'elles peuvent être ignorées peuvent les déclarer comme dans cet exemple :" - -#. type: example -#: doc/guix.texi:6987 -#, no-wrap -msgid "" -"(package\n" -" (name \"t1lib\")\n" -" ;; @dots{}\n" -" ;; These CVEs no longer apply and can be safely ignored.\n" -" (properties `((lint-hidden-cve . (\"CVE-2011-0433\"\n" -" \"CVE-2011-1553\"\n" -" \"CVE-2011-1554\"\n" -" \"CVE-2011-5244\")))))\n" -msgstr "" -"(package\n" -" (name \"t1lib\")\n" -" ;; @dots{}\n" -" ;; Ces CVE ne s'appliquent plus et peuvent être ignorée sans problème.\n" -" (properties `((lint-hidden-cve . (\"CVE-2011-0433\"\n" -" \"CVE-2011-1553\"\n" -" \"CVE-2011-1554\"\n" -" \"CVE-2011-5244\")))))\n" - -#. type: item -#: doc/guix.texi:6989 -#, no-wrap -msgid "formatting" -msgstr "formatting" - -#. type: table -#: doc/guix.texi:6992 -msgid "Warn about obvious source code formatting issues: trailing white space, use of tabulations, etc." -msgstr "Avertit le développeurs lorsqu'il y a des problèmes de formatage du code source évident : des espaces en fin de ligne, des tabulations, etc." - -#. type: example -#: doc/guix.texi:6998 -#, no-wrap -msgid "guix lint @var{options} @var{package}@dots{}\n" -msgstr "guix lint @var{options} @var{package}@dots{}\n" - -#. type: Plain text -#: doc/guix.texi:7002 -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 "Si aucun paquet n'est donné par la ligne de commande, tous les paquets seront vérifiés. Les @var{options} peuvent contenir aucune ou plus des options suivantes :" - -#. type: item -#: doc/guix.texi:7004 -#, no-wrap -msgid "--list-checkers" -msgstr "--list-checkers" - -#. type: table -#: doc/guix.texi:7008 -msgid "List and describe all the available checkers that will be run on packages and exit." -msgstr "Liste et décrit tous les vérificateurs disponibles qui seront lancés sur les paquets puis quitte." - -#. type: item -#: doc/guix.texi:7009 -#, no-wrap -msgid "--checkers" -msgstr "--checkers" - -#. type: itemx -#: doc/guix.texi:7010 -#, no-wrap -msgid "-c" -msgstr "-c" - -#. type: table -#: doc/guix.texi:7013 -msgid "Only enable the checkers specified in a comma-separated list using the names returned by @code{--list-checkers}." -msgstr "N'active que les vérificateurs spécifiés dans une liste de noms séparés par des virgules parmi la liste renvoyée par @code{--list-checkers}." - -#. type: section -#: doc/guix.texi:7017 -#, no-wrap -msgid "Invoking @command{guix size}" -msgstr "Invoquer @command{guix size}" - -#. type: cindex -#: doc/guix.texi:7019 -#, no-wrap -msgid "size" -msgstr "taille" - -#. type: cindex -#: doc/guix.texi:7020 -#, no-wrap -msgid "package size" -msgstr "paquet, taille" - -#. type: command{#1} -#: doc/guix.texi:7022 -#, no-wrap -msgid "guix size" -msgstr "guix size" - -#. type: Plain text -#: doc/guix.texi:7029 -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 "La commande @command{guix size} aide les développeurs à dresser un profil de l'utilisation du disque que font les paquets. C'est facile de négliger l'impact d'une dépendance supplémentaire ajoutée à un paquet, ou l'impact de l'utilisation d'une sortie unique pour un paquet qui pourrait être facilement séparé (@pxref{Packages with Multiple Outputs}). Ce sont les problèmes que @command{guix size} peut typiquement mettre en valeur." - -#. type: Plain text -#: doc/guix.texi:7034 -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 "On peut passer un ou plusieurs spécifications de paquets à la commande, comme @code{gcc@@4.8} ou @code{guile:debug}, ou un nom de fichier dans le dépôt. Regardez cet exemple :" - -#. type: example -#: doc/guix.texi:7047 -#, no-wrap -msgid "" -"$ guix size coreutils\n" -"store item total self\n" -"/gnu/store/@dots{}-gcc-5.5.0-lib 60.4 30.1 38.1%\n" -"/gnu/store/@dots{}-glibc-2.27 30.3 28.8 36.6%\n" -"/gnu/store/@dots{}-coreutils-8.28 78.9 15.0 19.0%\n" -"/gnu/store/@dots{}-gmp-6.1.2 63.1 2.7 3.4%\n" -"/gnu/store/@dots{}-bash-static-4.4.12 1.5 1.5 1.9%\n" -"/gnu/store/@dots{}-acl-2.2.52 61.1 0.4 0.5%\n" -"/gnu/store/@dots{}-attr-2.4.47 60.6 0.2 0.3%\n" -"/gnu/store/@dots{}-libcap-2.25 60.5 0.2 0.2%\n" -"total: 78.9 MiB\n" -msgstr "" -"$ guix size coreutils\n" -"store item total self\n" -"/gnu/store/@dots{}-gcc-5.5.0-lib 60.4 30.1 38.1%\n" -"/gnu/store/@dots{}-glibc-2.27 30.3 28.8 36.6%\n" -"/gnu/store/@dots{}-coreutils-8.28 78.9 15.0 19.0%\n" -"/gnu/store/@dots{}-gmp-6.1.2 63.1 2.7 3.4%\n" -"/gnu/store/@dots{}-bash-static-4.4.12 1.5 1.5 1.9%\n" -"/gnu/store/@dots{}-acl-2.2.52 61.1 0.4 0.5%\n" -"/gnu/store/@dots{}-attr-2.4.47 60.6 0.2 0.3%\n" -"/gnu/store/@dots{}-libcap-2.25 60.5 0.2 0.2%\n" -"total: 78.9 MiB\n" - -#. type: Plain text -#: doc/guix.texi:7053 -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 "Les éléments du dépôt listés ici constituent la @dfn{cloture transitive} de Coreutils — c.-à-d.@: Coreutils et toutes ses dépendances, récursivement — comme ce qui serait renvoyé par :" - -#. type: example -#: doc/guix.texi:7056 -#, no-wrap -msgid "$ guix gc -R /gnu/store/@dots{}-coreutils-8.23\n" -msgstr "$ guix gc -R /gnu/store/@dots{}-coreutils-8.23\n" - -#. type: Plain text -#: doc/guix.texi:7064 -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 "Ici, la sortie possède trois colonnes à côté de chaque élément du dépôt. La première colonne, nommée « total », montre la taille en mébioctet (Mio) de la cloture de l'élément du dépôt — c'est-à-dire sa propre taille plus la taille de ses dépendances. La colonne suivante, nommée « lui-même », montre la taille de l'élément lui-même. La dernière colonne montre le ration de la taille de l'élément lui-même par rapport à celle de tous les éléments montrés." - -#. type: Plain text -#: doc/guix.texi:7070 -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 "Dans cet exemple, on voit que la cloture de Coreutils pèse 79@tie{}Mio, dont la plupart est dû à la libc et aux bibliothèques à l'exécution de GCC (ce n'est pas un problème en soit que la libc et les bibliothèques de GCC représentent une grande part de la cloture parce qu'elles sont toujours disponibles sur le système de toute façon)." - -#. type: Plain text -#: doc/guix.texi:7079 -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 "Lorsque les paquets passés à @command{guix size} sont disponibles dans le dépôt@footnote{Plus précisément, @command{guix size} cherche les variantes @emph{non greffées} des paquets donnés, tels qu'ils sont renvoyés par @code{guix build @var{paquet} --no-graft}. @xref{Security Updates} pour des informations sur les greffes}, @command{guix size} demande au démon de déterminer ses dépendances, et mesure sa taille dans le dépôt, comme avec @command{du -ms --apparent-size} (@pxref{du invocation,,, coreutils, GNU Coreutils})." - -#. type: Plain text -#: doc/guix.texi:7084 -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 "Lorsque les paquets donnés ne sont @emph{pas} dans le dépôt, @command{guix size} rapporte les informations en se basant sur les substituts disponibles (@pxref{Substituts}). Cela permet de profiler l'utilisation du disque des éléments du dépôt même s'ils ne sont pas sur le disque, mais disponibles à distance." - -#. type: Plain text -#: doc/guix.texi:7086 -msgid "You can also specify several package names:" -msgstr "Vous pouvez aussi spécifier plusieurs noms de paquets :" - -#. type: example -#: doc/guix.texi:7096 -#, no-wrap -msgid "" -"$ guix size coreutils grep sed bash\n" -"store item total self\n" -"/gnu/store/@dots{}-coreutils-8.24 77.8 13.8 13.4%\n" -"/gnu/store/@dots{}-grep-2.22 73.1 0.8 0.8%\n" -"/gnu/store/@dots{}-bash-4.3.42 72.3 4.7 4.6%\n" -"/gnu/store/@dots{}-readline-6.3 67.6 1.2 1.2%\n" -"@dots{}\n" -"total: 102.3 MiB\n" -msgstr "" -"$ guix size coreutils grep sed bash\n" -"store item total self\n" -"/gnu/store/@dots{}-coreutils-8.24 77.8 13.8 13.4%\n" -"/gnu/store/@dots{}-grep-2.22 73.1 0.8 0.8%\n" -"/gnu/store/@dots{}-bash-4.3.42 72.3 4.7 4.6%\n" -"/gnu/store/@dots{}-readline-6.3 67.6 1.2 1.2%\n" -"@dots{}\n" -"total: 102.3 MiB\n" - -#. type: Plain text -#: doc/guix.texi:7102 -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 "Dans cet exemple on voit que la combinaison des quatre paquets prent 102.3@tie{}Mio en tout, ce qui est bien moins que la somme des clotures puisqu'ils ont beaucoup de dépendances en commun." - -#. type: Plain text -#: doc/guix.texi:7104 -msgid "The available options are:" -msgstr "Les options disponibles sont :" - -#. type: table -#: doc/guix.texi:7110 -msgid "Use substitute information from @var{urls}. @xref{client-substitute-urls, the same option for @code{guix build}}." -msgstr "Utilise les informations de substituts de @var{urls}. @xref{client-substitute-urls, the same option for @code{guix build}}." - -#. type: item -#: doc/guix.texi:7111 -#, no-wrap -msgid "--sort=@var{key}" -msgstr "--sort=@var{clef}" - -#. type: table -#: doc/guix.texi:7113 -msgid "Sort lines according to @var{key}, one of the following options:" -msgstr "Trie les lignes en fonction de la @var{clef}, l'une des optinos suivantes :" - -#. type: item -#: doc/guix.texi:7115 -#, no-wrap -msgid "self" -msgstr "self" - -#. type: table -#: doc/guix.texi:7117 -msgid "the size of each item (the default);" -msgstr "la taille de chaque élément (par défaut) ;" - -#. type: table -#: doc/guix.texi:7119 -msgid "the total size of the item's closure." -msgstr "la taille totale de la cloture de l'élémente." - -#. type: item -#: doc/guix.texi:7121 -#, no-wrap -msgid "--map-file=@var{file}" -msgstr "--map-file=@var{fichier} " - -#. type: table -#: doc/guix.texi:7123 -msgid "Write a graphical map of disk usage in PNG format to @var{file}." -msgstr "Écrit un schéma de l'utilisation du disque au format PNG dans @var{fichier}." - -#. type: table -#: doc/guix.texi:7125 -msgid "For the example above, the map looks like this:" -msgstr "Pour l'exemple au-dessus, le schéma ressemble à ceci :" - -#. type: table -#: doc/guix.texi:7128 -msgid "@image{images/coreutils-size-map,5in,, map of Coreutils disk usage produced by @command{guix size}}" -msgstr "@image{images/coreutils-size-map,5in,, schéma de l'utilisation du disque de Coreutils produit par @command{guix size}}" - -#. type: table -#: doc/guix.texi:7133 -msgid "This option requires that @uref{http://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 "Cette option requiert l'installation de @uref{http://wingolog.org/software/guile-charting/, Guile-Charting} et qu'il soit visible dans le chemin de recherche des modules Guile. Lorsque ce n'est pas le cas, @command{guix size} plante en essayant de le charger." - -#. type: table -#: doc/guix.texi:7137 -msgid "Consider packages for @var{system}---e.g., @code{x86_64-linux}." -msgstr "Considère les paquets pour @var{système} — p.@: ex.@: @code{x86_64-linux}." - -#. type: section -#: doc/guix.texi:7141 -#, no-wrap -msgid "Invoking @command{guix graph}" -msgstr "Invoque @command{guix graph}" - -#. type: cindex -#: doc/guix.texi:7143 -#, no-wrap -msgid "DAG" -msgstr "DAG" - -#. type: command{#1} -#: doc/guix.texi:7144 -#, no-wrap -msgid "guix graph" -msgstr "guix graph" - -#. type: Plain text -#: doc/guix.texi:7158 -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{http://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{http://www.opencypher.org/, openCypher} query language. The general syntax is:" -msgstr "Les paquets et leurs dépendances forment un @dfn{graphe}, plus précisément un graphe orienté acyclique (DAG). Il peut vite devenir difficile d'avoir une représentation mentale du DAG d'un paquet, donc la commande @command{guix graph} fournit une représentation visuelle du DAG. Par défaut, @command{guix graph} émet un représentation du DAG dans le format d'entrée de @uref{http://www.graphviz.org/, Graphviz}, pour que sa sortie puisse être passée directement à la commande @command{dot} de Graphviz. Elle peut aussi émettre une page HTML avec du code Javascript pour afficher un « digramme d'accords » dans un navigateur Web, grâce à la bibliothèque @uref{https://d3js.org/, d3.js}, ou émettre des requêtes Cypher pour construire un graphe dans une base de donnée de graphes supportant le langage de requêtes @uref{http://www.opencypher.org/, openCypher}. La syntaxe générale est :" - -#. type: example -#: doc/guix.texi:7161 -#, no-wrap -msgid "guix graph @var{options} @var{package}@dots{}\n" -msgstr "guix graph @var{options} @var{paquet}@dots{}\n" - -#. type: Plain text -#: doc/guix.texi:7166 -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 "Par exemple, la commande suivante génère un fichier PDF représentant le DAG du paquet pour GNU@tie{}Core Utilities, qui montre ses dépendances à la compilation :" - -#. type: example -#: doc/guix.texi:7169 -#, no-wrap -msgid "guix graph coreutils | dot -Tpdf > dag.pdf\n" -msgstr "guix graph coreutils | dot -Tpdf > dag.pdf\n" - -#. type: Plain text -#: doc/guix.texi:7172 -msgid "The output looks like this:" -msgstr "La sortie ressemble à ceci :" - -#. type: Plain text -#: doc/guix.texi:7174 -msgid "@image{images/coreutils-graph,2in,,Dependency graph of the GNU Coreutils}" -msgstr "@image{images/coreutils-graph,2in,,Graphe de dépendance de GNU Coreutils}" - -#. type: Plain text -#: doc/guix.texi:7176 -msgid "Nice little graph, no?" -msgstr "Joli petit graphe, non ?" - -#. type: Plain text -#: doc/guix.texi:7182 -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 "Mais il y a plus qu'un seul graphe ! Celui au-dessus est concis : c'est le graphe des objets paquets, en omettant les entrées implicites comme GCC, libc, grep, etc. Il est souvent utile d'avoir ces graphes concis, mais parfois on veut voir plus de détails. @command{guix graph} supporte plusieurs types de graphes, qui vous permettent de choisir le niveau de détails :" - -#. type: table -#: doc/guix.texi:7188 -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 "C'est le type par défaut utilisé dans l'exemple plus haut. Il montre le DAG des objets paquets, sans les dépendances implicites. C'est concis, mais omet pas mal de détails." - -#. type: item -#: doc/guix.texi:7189 -#, no-wrap -msgid "reverse-package" -msgstr "reverse-package" - -#. type: table -#: doc/guix.texi:7191 -msgid "This shows the @emph{reverse} DAG of packages. For example:" -msgstr "Cela montre le DAG @emph{inversé} des paquets. Par exemple :" - -#. type: example -#: doc/guix.texi:7194 -#, no-wrap -msgid "guix graph --type=reverse-package ocaml\n" -msgstr "guix graph --type=reverse-package ocaml\n" - -#. type: table -#: doc/guix.texi:7197 -msgid "... yields the graph of packages that depend on OCaml." -msgstr "… montre le graphe des paquets qui dépendent de OCaml." - -#. type: table -#: doc/guix.texi:7202 -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 "Remarquez que pour les paquets du cœur de la distribution, cela crée des graphes énormes. Si vous voulez seulement voir le nombre de paquets qui dépendent d'un paquet donnés, utilisez @command{guix refresh --list-dependent} (@pxref{Invoking guix refresh, @option{--list-dependent}})." - -#. type: item -#: doc/guix.texi:7203 -#, no-wrap -msgid "bag-emerged" -msgstr "bag-emerged" - -#. type: table -#: doc/guix.texi:7205 -msgid "This is the package DAG, @emph{including} implicit inputs." -msgstr "C'est le DAG du paquet, @emph{avec} les entrées implicites." - -#. type: table -#: doc/guix.texi:7207 -msgid "For instance, the following command:" -msgstr "Par exemple, la commande suivante :" - -#. type: example -#: doc/guix.texi:7210 -#, no-wrap -msgid "guix graph --type=bag-emerged coreutils | dot -Tpdf > dag.pdf\n" -msgstr "guix graph --type=bag-emerged coreutils | dot -Tpdf > dag.pdf\n" - -#. type: table -#: doc/guix.texi:7213 -msgid "... yields this bigger graph:" -msgstr "… montre ce graphe plus gros :" - -#. type: table -#: doc/guix.texi:7215 -msgid "@image{images/coreutils-bag-graph,,5in,Detailed dependency graph of the GNU Coreutils}" -msgstr "@image{images/coreutils-bag-graph,,5in,Graphe des dépendances détaillé de GNU Coreutils}" - -#. type: table -#: doc/guix.texi:7218 -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 "En bas du graphe, on voit toutes les entrées implicites de @var{gnu-build-system} (@pxref{Build Systems, @code{gnu-build-system}})." - -#. type: table -#: doc/guix.texi:7222 -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 "Maintenant, remarquez que les dépendances de ces entrées implicites — c'est-à-dire les @dfn{dépendances de bootstrap} (@pxref{Bootstrapping}) — ne sont pas affichées, pour rester concis." - -#. type: item -#: doc/guix.texi:7223 -#, no-wrap -msgid "bag" -msgstr "bag" - -#. type: table -#: doc/guix.texi:7226 -msgid "Similar to @code{bag-emerged}, but this time including all the bootstrap dependencies." -msgstr "Comme @code{bag-emerged} mais cette fois inclus toutes les dépendances de bootstrap." - -#. type: item -#: doc/guix.texi:7227 -#, no-wrap -msgid "bag-with-origins" -msgstr "bag-with-origins" - -#. type: table -#: doc/guix.texi:7229 -msgid "Similar to @code{bag}, but also showing origins and their dependencies." -msgstr "Comme @code{bag}, mais montre aussi les origines et leurs dépendances." - -#. type: table -#: doc/guix.texi:7235 -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 "C'est la représentation lu plus détaillée : elle montre le DAG des dérivations (@pxref{Derivations}) et des éléments du dépôt. Comparé à la représentation ci-dessus, beaucoup plus de nœuds sont visibles, dont les scripts de construction, les correctifs, les modules Guile, etc." - -#. type: table -#: doc/guix.texi:7238 -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 "Pour ce type de graphe, il est aussi possible de passer un nom de fichier @file{.drv} à la place d'un nom de paquet, comme dans :" - -#. type: example -#: doc/guix.texi:7241 -#, no-wrap -msgid "guix graph -t derivation `guix system build -d my-config.scm`\n" -msgstr "guix graph -t derivation `guix system build -d my-config.scm`\n" - -#. type: item -#: doc/guix.texi:7243 -#, no-wrap -msgid "module" -msgstr "module" - -#. type: table -#: doc/guix.texi:7247 -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 "C'est le graphe des @dfn{modules de paquets} (@pxref{Package Modules}). Par exemple, la commande suivante montre le graphe des modules de paquets qui définissent le paquet @code{guile} :" - -#. type: example -#: doc/guix.texi:7250 -#, no-wrap -msgid "guix graph -t module guile | dot -Tpdf > module-graph.pdf\n" -msgstr "guix graph -t module guile | dot -Tpdf > module-graph.pdf\n" - -#. type: Plain text -#: doc/guix.texi:7255 -msgid "All the types above correspond to @emph{build-time dependencies}. The following graph type represents the @emph{run-time dependencies}:" -msgstr "Tous les types ci-dessus correspondent aux @emph{dépendances à la construction}. Le type de graphe suivant représente les @emph{dépendances à l'exécution} :" - -#. type: item -#: doc/guix.texi:7257 -#, no-wrap -msgid "references" -msgstr "references" - -#. type: table -#: doc/guix.texi:7260 -msgid "This is the graph of @dfn{references} of a package output, as returned by @command{guix gc --references} (@pxref{Invoking guix gc})." -msgstr "C'est le graphe des @dfn{references} d'une sortie d'un paquet, telles que renvoyées par @command{guix gc --references} (@pxref{Invoking guix gc})." - -#. type: table -#: doc/guix.texi:7263 -msgid "If the given package output is not available in the store, @command{guix graph} attempts to obtain dependency information from substitutes." -msgstr "Si la sortie du paquet donnée n'est pas disponible dans le dépôt, @command{guix graph} essayera d'obtenir les informations sur les dépendances à travers les substituts." - -#. type: table -#: doc/guix.texi:7267 -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 "Vous pouvez aussi passer un nom de fichier du dépôt plutôt qu'un nom de paquet. Par exemple, la commande ci-dessous produit le graphe des références de votre profile (qui peut être gros !) :" - -#. type: example -#: doc/guix.texi:7270 -#, no-wrap -msgid "guix graph -t references `readlink -f ~/.guix-profile`\n" -msgstr "guix graph -t references `readlink -f ~/.guix-profile`\n" - -#. type: item -#: doc/guix.texi:7272 -#, no-wrap -msgid "referrers" -msgstr "referrers" - -#. type: table -#: doc/guix.texi:7275 -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 "C'est le graphe des @dfn{référents} d'un élément du dépôt, tels que renvoyés par @command{guix gc --referrers} (@pxref{Invoking guix gc})." - -#. type: table -#: doc/guix.texi:7281 -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 "Cela repose exclusivement sur les informations de votre dépôt. Par exemple, supposons que Inkscape est actuellement disponible dans 10 profils sur votre machine ; @command{guix graph -t referrers inkscape} montrera le graphe dont la racine est Inkscape avec 10 profils qui y sont liés." - -#. type: table -#: doc/guix.texi:7284 -msgid "It can help determine what is preventing a store item from being garbage collected." -msgstr "Cela peut aider à déterminer ce qui empêche un élément du dépôt d'être glané." - -#. type: Plain text -#: doc/guix.texi:7288 -msgid "The available options are the following:" -msgstr "Les options disponibles sont les suivante :" - -#. type: item -#: doc/guix.texi:7290 -#, no-wrap -msgid "--type=@var{type}" -msgstr "--type=@var{type}" - -#. type: itemx -#: doc/guix.texi:7291 doc/guix.texi:21087 -#, no-wrap -msgid "-t @var{type}" -msgstr "-t @var{type}" - -#. type: table -#: doc/guix.texi:7294 -msgid "Produce a graph output of @var{type}, where @var{type} must be one of the values listed above." -msgstr "Produit un graphe en sortie de type @var{type} où @var{type} doit être l'un des types au-dessus." - -#. type: item -#: doc/guix.texi:7295 -#, no-wrap -msgid "--list-types" -msgstr "--list-types" - -#. type: table -#: doc/guix.texi:7297 -msgid "List the supported graph types." -msgstr "Liste les types de graphes supportés." - -#. type: item -#: doc/guix.texi:7298 -#, no-wrap -msgid "--backend=@var{backend}" -msgstr "--backend=@var{moteur}" - -#. type: itemx -#: doc/guix.texi:7299 -#, no-wrap -msgid "-b @var{backend}" -msgstr "-b @var{moteur}" - -#. type: table -#: doc/guix.texi:7301 -msgid "Produce a graph using the selected @var{backend}." -msgstr "Produit un graphe avec le @var{moteur} choisi." - -#. type: item -#: doc/guix.texi:7302 -#, no-wrap -msgid "--list-backends" -msgstr "--list-backends" - -#. type: table -#: doc/guix.texi:7304 -msgid "List the supported graph backends." -msgstr "Liste les moteurs de graphes supportés." - -#. type: table -#: doc/guix.texi:7306 -msgid "Currently, the available backends are Graphviz and d3.js." -msgstr "Actuellement les moteurs disponibles sont Graphviz et d3.js." - -#. type: example -#: doc/guix.texi:7315 -#, no-wrap -msgid "guix graph -e '(@@@@ (gnu packages commencement) gnu-make-final)'\n" -msgstr "guix graph -e '(@@@@ (gnu packages commencement) gnu-make-final)'\n" - -#. type: section -#: doc/guix.texi:7320 -#, no-wrap -msgid "Invoking @command{guix environment}" -msgstr "Invoquer @command{guix environment}" - -#. type: cindex -#: doc/guix.texi:7322 -#, no-wrap -msgid "reproducible build environments" -msgstr "environnements de construction reproductibles" - -#. type: cindex -#: doc/guix.texi:7323 -#, no-wrap -msgid "development environments" -msgstr "environnement de développement" - -#. type: command{#1} -#: doc/guix.texi:7324 -#, no-wrap -msgid "guix environment" -msgstr "guix environment" - -#. type: cindex -#: doc/guix.texi:7325 -#, no-wrap -msgid "environment, package build environment" -msgstr "environnement de construction de paquets" - -#. type: Plain text -#: doc/guix.texi:7331 -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 "Le but de @command{guix environment} est d'assister les hackers dans la création d'environnements de développement reproductibles sans polluer leur profil de paquets. L'outil @command{guix environment} prend un ou plusieurs paquets, construit leurs entrées et crée un environnement shell pour pouvoir les utiliser." - -#. type: example -#: doc/guix.texi:7336 -#, no-wrap -msgid "guix environment @var{options} @var{package}@dots{}\n" -msgstr "guix environment @var{options} @var{paquet}@dots{}\n" - -#. type: Plain text -#: doc/guix.texi:7340 -msgid "The following example spawns a new shell set up for the development of GNU@tie{}Guile:" -msgstr "L'exemple suivant crée un nouveau shell préparé pour le développement de GNU@tie{}Guile :" - -#. type: example -#: doc/guix.texi:7343 -#, no-wrap -msgid "guix environment guile\n" -msgstr "guix environment guile\n" - -#. type: Plain text -#: doc/guix.texi:7360 -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 "Si les dépendances requises ne sont pas déjà construites, @command{guix environment} les construit automatiquement. L'environnement du nouveau shell est une version améliorée de l'environnement dans lequel @command{guix environment} a été lancé. Il contient les chemins de recherche nécessaires à la construction du paquet donné en plus des variables d'environnement existantes. Pour créer un environnement « pur », dans lequel les variables d'environnement de départ ont été nettoyées, utilisez l'option @code{--pure}@footnote{Les utilisateurs ajoutent parfois à tord des valeurs supplémentaires dans les variables comme @code{PATH} dans leur @file{~/.bashrc}. En conséquence, lorsque @code{guix environment} le lance, Bash peut lire @file{~/.bashrc}, ce qui produit des « impuretés » dans ces variables d'environnement. C'est une erreur de définir ces variables d'environnement dans @file{.bashrc} ; à la place, elles devraient être définie dans @file{.bash_profile}, qui est sourcé uniquement par les shells de connexion. @xref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}, pour des détails sur les fichiers de démarrage de Bash.}." - -#. type: vindex -#: doc/guix.texi:7361 -#, no-wrap -msgid "GUIX_ENVIRONMENT" -msgstr "GUIX_ENVIRONMENT" - -#. type: Plain text -#: doc/guix.texi:7367 -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} définie la variable @code{GUIX_ENVIRONMENT} dans le shell qu'il crée ; sa valeur est le nom de fichier du profil de cet environnement. Cela permet aux utilisateur, disons, de définir un prompt spécifique pour les environnement de développement dans leur @file{.bashrc} (@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}) :" - -#. type: example -#: doc/guix.texi:7373 -#, no-wrap -msgid "" -"if [ -n \"$GUIX_ENVIRONMENT\" ]\n" -"then\n" -" export PS1=\"\\u@@\\h \\w [dev]\\$ \"\n" -"fi\n" -msgstr "" -"if [ -n \"$GUIX_ENVIRONMENT\" ]\n" -"then\n" -" export PS1=\"\\u@@\\h \\w [dev]\\$ \"\n" -"fi\n" - -#. type: Plain text -#: doc/guix.texi:7377 -msgid "... or to browse the profile:" -msgstr "… ou de naviguer dans le profil :" - -#. type: example -#: doc/guix.texi:7380 -#, no-wrap -msgid "$ ls \"$GUIX_ENVIRONMENT/bin\"\n" -msgstr "$ ls \"$GUIX_ENVIRONMENT/bin\"\n" - -#. type: Plain text -#: doc/guix.texi:7386 -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 "En plus, plus d'un paquet peut être spécifié, auquel cas l'union des entrées des paquets données est utilisée. Par exemple, la commande ci-dessous crée un shell où toutes les dépendances de Guile et Emacs sont disponibles :" - -#. type: example -#: doc/guix.texi:7389 -#, no-wrap -msgid "guix environment guile emacs\n" -msgstr "guix environment guile emacs\n" - -#. type: Plain text -#: doc/guix.texi:7394 -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 "Parfois, une session shell interactive est inutile. On peut invoquer une commande arbitraire en plaçant le jeton @code{--} pour séparer la commande du reste des arguments :" - -#. type: example -#: doc/guix.texi:7397 -#, no-wrap -msgid "guix environment guile -- make -j4\n" -msgstr "guix environment guile -- make -j4\n" - -#. type: Plain text -#: doc/guix.texi:7403 -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 "Dans d'autres situations, il est plus pratique de spécifier la liste des paquets requis dans l'environnement. Par exemple, la commande suivante lance @command{python} dans un environnement contenant Python@tie{}2.7 et NumPy :" - -#. type: example -#: doc/guix.texi:7406 -#, 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:7417 -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 "En plus, on peut vouloir les dépendance d'un paquet et aussi des paquets supplémentaires qui ne sont pas des dépendances à l'exécution ou à la construction, mais qui sont utiles au développement tout de même. À cause de cela, le drapeau @code{--ad-hoc} est positionnel. Les paquets qui apparaissent avant @code{--ad-hoc} sont interprétés comme les paquets dont les dépendances seront ajoutées à l'environnement. Les paquets qui apparaissent après @code{--ad-hoc} sont interprétés comme les paquets à ajouter à l'environnement directement. Par exemple, la commande suivante crée un environnement de développement pour Guix avec les paquets Git et strace en plus :" - -#. type: example -#: doc/guix.texi:7420 -#, no-wrap -msgid "guix environment guix --ad-hoc git strace\n" -msgstr "guix environment guix --ad-hoc git strace\n" - -#. type: Plain text -#: doc/guix.texi:7429 -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 GuixSD, 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 "Parfois il est souhaitable d'isoler l'environnement le plus possible, pour une pureté et une reproductibilité maximale. En particulier, lorsque vous utilisez Guix sur une distribution hôte qui n'est pas GuixSD, il est souhaitable d'éviter l'accès à @file{/usr/bin} et d'autres ressources du système depuis les environnements de développement. Par exemple, la commande suivante crée un REPL Guile dans un « conteneur » où seuls le dépôt et le répertoire de travail actuel sont montés :" - -#. type: example -#: doc/guix.texi:7432 -#, 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:7436 -msgid "The @code{--container} option requires Linux-libre 3.19 or newer." -msgstr "L'option @code{--container} requiert Linux-libre 3.19 ou supérieur." - -#. type: Plain text -#: doc/guix.texi:7439 -msgid "The available options are summarized below." -msgstr "Les options disponibles sont résumées ci-dessous." - -#. type: cindex -#: doc/guix.texi:7443 -#, no-wrap -msgid "persistent environment" -msgstr "environnement persistent" - -#. type: cindex -#: doc/guix.texi:7444 -#, no-wrap -msgid "garbage collector root, for environments" -msgstr "racine du ramasse-miettes, pour les environnements" - -#. type: table -#: doc/guix.texi:7447 -msgid "Make @var{file} a symlink to the profile for this environment, and register it as a garbage collector root." -msgstr "Fait de @var{fichier} un lien symbolique vers le profil de cet environnement, et l'enregistre comme une racine du ramasse-miettes." - -#. type: table -#: doc/guix.texi:7450 -msgid "This is useful if you want to protect your environment from garbage collection, to make it ``persistent''." -msgstr "C'est utile si vous souhaitez protéger votre environnement du ramasse-miettes, pour le rendre « persistent »." - -#. type: table -#: doc/guix.texi:7456 -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 "Lorsque cette option est omise, l'environnement n'est protégé du ramasse-miettes que le temps de la session @command{guix environment}. Cela signifie que la prochaine fois que vous créerez le même environnement, vous pourriez avoir à reconstruire ou télécharger des paquets. @xref{Invoking guix gc}, pour plus d'informations sur les racines du GC." - -#. type: table -#: doc/guix.texi:7461 -msgid "Create an environment for the package or list of packages that @var{expr} evaluates to." -msgstr "Crée un environnement pour le paquet ou la liste de paquets en lesquels s'évalue @var{expr}." - -#. type: table -#: doc/guix.texi:7463 -msgid "For example, running:" -msgstr "Par exemple, lancer :" - -#. type: example -#: doc/guix.texi:7466 -#, 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:7470 -msgid "starts a shell with the environment for this specific variant of the PETSc package." -msgstr "démarre un shell avec l'environnement pour cette variante spécifique du paquet PETSc." - -#. type: table -#: doc/guix.texi:7472 -msgid "Running:" -msgstr "Lancer :" - -#. type: example -#: doc/guix.texi:7475 -#, 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:7478 -msgid "starts a shell with all the GuixSD base packages available." -msgstr "démarre un shell où tous les paquets de base de GuixSD sont disponibles." - -#. type: table -#: doc/guix.texi:7481 -msgid "The above commands only use the default output of the given packages. To select other outputs, two element tuples can be specified:" -msgstr "Les commande au-dessus n'utilisent que les sorties par défaut des paquets donnés. Pour choisir d'autres sorties, on peut spécifier des pairs :" - -#. type: example -#: doc/guix.texi:7484 -#, 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:7486 -#, no-wrap -msgid "--load=@var{file}" -msgstr "--load=@var{fichier}" - -#. type: itemx -#: doc/guix.texi:7487 -#, no-wrap -msgid "-l @var{file}" -msgstr "-l @var{fichier}" - -#. type: table -#: doc/guix.texi:7490 -msgid "Create an environment for the package or list of packages that the code within @var{file} evaluates to." -msgstr "Crée un environnement pour le paquet ou la liste de paquets en lesquels @var{fichier} s'évalue." - -#. type: example -#: doc/guix.texi:7496 -#, no-wrap -msgid "@verbatiminclude environment-gdb.scm\n" -msgstr "@verbatiminclude environment-gdb.scm\n" - -#. type: table -#: doc/guix.texi:7502 -msgid "Create an environment for the packages contained in the manifest object returned by the Scheme code in @var{file}." -msgstr "Crée un environnement pour les paquets contenus dans l'objet manifeste renvoyé par le code Scheme dans @var{fichier}." - -#. type: table -#: doc/guix.texi:7506 -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 "C'est similaire à l'option de même nom de @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) et utilise les même fichiers manifestes." - -#. type: item -#: doc/guix.texi:7507 -#, no-wrap -msgid "--ad-hoc" -msgstr "--ad-hoc" - -#. type: table -#: doc/guix.texi:7512 -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 "Inclut tous les paquets spécifiés dans l'environnement qui en résulte, comme si un paquet @i{ad hoc} était spécifié, avec ces paquets comme entrées. Cette option est utile pour créer un environnement rapidement sans avoir à écrire une expression de paquet contenant les entrées désirées." - -#. type: table -#: doc/guix.texi:7514 -msgid "For instance, the command:" -msgstr "Par exemple la commande :" - -#. type: example -#: doc/guix.texi:7517 -#, 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:7521 -msgid "runs @command{guile} in an environment where Guile and Guile-SDL are available." -msgstr "lance @command{guile} dans un environnement où Guile et Guile-SDDL sont disponibles." - -#. type: table -#: doc/guix.texi:7526 -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 "Remarquez que cet exemple demande implicitement la sortie par défaut de @code{guile} et @code{guile-sdl}, mais il est possible de demander une sortie spécifique — p.@: ex.@: @code{glib:bin} demande la sortie @code{bin} de @code{glib} (@pxref{Packages with Multiple Outputs})." - -#. type: table -#: doc/guix.texi:7532 -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 "Cette option peut être composée avec le comportement par défaut de @command{guix environment}. Les paquets qui apparaissent avant @code{--ad-hoc} sont interprétés comme les paquets dont les dépendances seront ajoutées à l'environnement, le comportement par défaut. Les paquets qui apparaissent après @code{--ad-hoc} sont interprétés comme les paquets à ajouter à l'environnement directement." - -#. type: item -#: doc/guix.texi:7533 -#, no-wrap -msgid "--pure" -msgstr "--pure" - -#. type: table -#: doc/guix.texi:7537 -msgid "Unset existing environment variables when building the new environment. This has the effect of creating an environment in which search paths only contain package inputs." -msgstr "Nettoie les variables d'environnement existantes lors de la construction du nouvel environnement. Cela a pour effet de créer un environnement dans lequel les chemins de recherche ne contiennent que des entrées de paquets." - -#. type: item -#: doc/guix.texi:7538 -#, no-wrap -msgid "--search-paths" -msgstr "--search-paths" - -#. type: table -#: doc/guix.texi:7541 -msgid "Display the environment variable definitions that make up the environment." -msgstr "Affiche les définitions des variables d'environnement qui composent l'environnement." - -#. type: table -#: doc/guix.texi:7545 -msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}." -msgstr "Essaye de construire pour @var{système} — p.@: ex.@: @code{i686-linux}." - -#. type: item -#: doc/guix.texi:7546 -#, no-wrap -msgid "--container" -msgstr "--container" - -#. type: itemx -#: doc/guix.texi:7547 -#, no-wrap -msgid "-C" -msgstr "-C" - -#. type: item -#: doc/guix.texi:7548 doc/guix.texi:8059 doc/guix.texi:21036 -#, no-wrap -msgid "container" -msgstr "conteneur" - -#. type: table -#: doc/guix.texi:7556 -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. The spawned process runs as the current user outside the container, but has root privileges in the context of the container." -msgstr "Lance @var{commande} dans un conteneur isolé. Le répertoire de travail actuel en dehors du conteneur est monté dans le conteneur. En plus, à moins de le changer avec @code{--user}, un répertoire personnel fictif est créé pour correspondre à celui de l'utilisateur actuel et @file{/etc/passwod} est configuré en conséquence. Le processus est lancé en tant que l'utilisateur actuel en dehors du conteneur, mais a les privilèges root dans le contexte du conteneur." - -#. type: item -#: doc/guix.texi:7557 -#, no-wrap -msgid "--network" -msgstr "--network" - -#. type: itemx -#: doc/guix.texi:7558 -#, no-wrap -msgid "-N" -msgstr "-N" - -#. type: table -#: doc/guix.texi:7562 -msgid "For containers, share the network namespace with the host system. Containers created without this flag only have access to the loopback device." -msgstr "Pour les conteneurs, partage l'espace de nom du réseau avec le système hôte. Les conteneurs créés sans cette option n'ont accès qu'à l'interface de boucle locale." - -#. type: item -#: doc/guix.texi:7563 -#, no-wrap -msgid "--link-profile" -msgstr "--link-profile" - -#. type: itemx -#: doc/guix.texi:7564 -#, no-wrap -msgid "-P" -msgstr "-P" - -#. type: table -#: doc/guix.texi:7571 -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 "Pour les conteneurs, lie le profil de l'environnement à @file{~/.guix-profile} dans le conteneur. C'est équivalent à lance la commande @command{ln -s $GUIX_ENVIRONMENT ~/.guix-profile} dans le conteneur. La liaison échouera et annulera l'environnement si le répertoire existe déjà, ce qui sera sans doute le cas si @command{guix environment} est invoqué dans le répertoire personnel de l'utilisateur." - -#. type: table -#: doc/guix.texi:7578 -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 "Certains paquets sont configurés pour chercher des fichiers de configuration et des données dans @code{~/.guix-profile}@footnote{Par exemple, le paquet @code{fontconfig} inspecte @file{~/.guix-profile/share/fonts} pour trouver des polices supplémentaires.} ; @code{--link-profile} permet à ces programmes de se comporter comme attendu dans l'environnement." - -#. type: item -#: doc/guix.texi:7579 doc/guix.texi:7731 -#, no-wrap -msgid "--user=@var{user}" -msgstr "--user=@var{utilisateur}" - -#. type: itemx -#: doc/guix.texi:7580 doc/guix.texi:7732 -#, no-wrap -msgid "-u @var{user}" -msgstr "-u @var{utilisateur}" - -#. type: table -#: doc/guix.texi:7586 -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/USER}; and no user GECOS data will be copied. @var{user} need not exist on the system." -msgstr "Pour les conteneurs, utilise le nom d'utilisateur @var{utilisateur} à la place de l'utilisateur actuel. L'entrée générée dans @file{/etc/passwod} dans le conteneur contiendra le nom @var{utilisateur} ; le répertoire personnel sera @file{/home/UTILISATEUR} ; et aucune donnée GECOS ne sera copiée. @var{utilisateur} n'a pas besoin d'exister sur le système." - -#. type: table -#: doc/guix.texi:7591 -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 "En plus, tous les chemins partagés ou exposés (voir @code{--share} et @code{--expose} respectivement) dont la cible est dans le répertoire personnel de l'utilisateur seront remontés relativement à @file{/home/UTILISATEUR} ; cela comprend le montage automatique du répertoire de travail actuel." - -#. type: example -#: doc/guix.texi:7598 -#, no-wrap -msgid "" -"# will expose paths as /home/foo/wd, /home/foo/test, and /home/foo/target\n" -"cd $HOME/wd\n" -"guix environment --container --user=foo \\\n" -" --expose=$HOME/test \\\n" -" --expose=/tmp/target=$HOME/target\n" -msgstr "" -"# exposera les chemins comme /home/foo/wd, /home/foo/test et /home/foo/target\n" -"cd $HOME/wd\n" -"guix environment --container --user=foo \\\n" -" --expose=$HOME/test \\\n" -" --expose=/tmp/target=$HOME/target\n" - -#. type: table -#: doc/guix.texi:7603 -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 "Bien que cela limite la fuite de l'identité de l'utilisateur à travers le chemin du répertoire personnel et des champs de l'utilisateur, ce n'est qu'un composant utile pour une solution d'anonymisation ou de préservation de la vie privée — pas une solution en elle-même." - -#. type: item -#: doc/guix.texi:7604 -#, no-wrap -msgid "--expose=@var{source}[=@var{target}]" -msgstr "--expose=@var{source}[=@var{cible}]" - -#. type: table -#: doc/guix.texi:7609 -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." -msgstr "Pour les conteneurs, expose le système de fichiers @var{source} du système hôte comme un système de fichiers en lecture seule @var{cible} dans le conteneur. Si @var{cible} n'est pas spécifiée, @var{source} est utilisé comme point de montage dans le conteneur." - -#. type: table -#: doc/guix.texi:7613 -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 "L'exemple ci-dessous crée un REPL Guile dans un conteneur dans lequel le répertoire personnel de l'utilisateur est accessible en lecture-seule via le répertoire @file{/exchange} :" - -#. type: example -#: doc/guix.texi:7616 -#, 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:7618 -#, no-wrap -msgid "--share=@var{source}[=@var{target}]" -msgstr "--share=@var{source}[=@var{cible}]" - -#. type: table -#: doc/guix.texi:7623 -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 "Pour les conteneurs, partage le système de fichiers @var{soruce} du système hôte comme un système de fichiers en lecture-écriture @var{cible} dans le conteneur. Si @var{cible} n'est pas spécifiée, @var{source} est utilisée comme point de montage dans le conteneur." - -#. type: table -#: doc/guix.texi:7627 -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 "L'exemple ci-dessous crée un REPL Guile dans un conteneur dans lequel le répertoire personnel de l'utilisateur est accessible en lecture-écriture via le répertoire @file{/exchange} :" - -#. type: example -#: doc/guix.texi:7630 -#, 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:7636 -msgid "@command{guix environment} also supports all of the common build options that @command{guix build} supports (@pxref{Common Build Options})." -msgstr "@command{guix environment} supporte aussi toutes les options de construction que @command{guix build} supporte (@pxref{Common Build Options})." - -#. type: section -#: doc/guix.texi:7639 -#, no-wrap -msgid "Invoking @command{guix publish}" -msgstr "Invoquer @command{guix publish}" - -#. type: command{#1} -#: doc/guix.texi:7641 -#, no-wrap -msgid "guix publish" -msgstr "guix publish" - -#. type: Plain text -#: doc/guix.texi:7645 -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 "Le but de @command{guix publish} est de vous permettre de partager facilement votre dépôt avec d'autres personnes qui peuvent ensuite l'utiliser comme serveur de substituts (@pxref{Substituts})." - -#. type: Plain text -#: doc/guix.texi:7651 -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 Hydra, the software behind the @code{hydra.gnu.org} build farm." -msgstr "Lorsque @command{guix publish} est lancé, il crée un serveur HTTP qui permet à n'importe qui avec un accès réseau d'y récupérer des substituts. Cela signifie que toutes les machines qui font tourner Guix peuvent aussi agir comme une ferme de construction, puisque l'interface HTTP est compatible avec Hydra, le logiciel derrière la ferme de construction @code{hydra.gnu.org}." - -#. type: Plain text -#: doc/guix.texi:7657 -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 "Pour des raisons de sécurité, chaque substitut est signé, ce qui permet aux destinataires de vérifier leur authenticité et leur intégrité (@pxref{Substituts}). Comme @command{guix publish} utilise la clef de signature du système, qui n'est lisible que par l'administrateur système, il doit être lancé en root ; l'option @code{--user} lui fait baisser ses privilèges le plus tôt possible." - -#. type: Plain text -#: doc/guix.texi:7661 -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 "La pair de clefs pour les signatures doit être générée avant de lancer @command{guix publish}, avec @command{guix archive --generate-key} (@pxref{Invoking guix archive})." - -#. type: example -#: doc/guix.texi:7666 -#, no-wrap -msgid "guix publish @var{options}@dots{}\n" -msgstr "guix publish @var{options}@dots{}\n" - -#. type: Plain text -#: doc/guix.texi:7670 -msgid "Running @command{guix publish} without any additional arguments will spawn an HTTP server on port 8080:" -msgstr "Lancer @command{guix publish} sans arguments supplémentaires lancera un serveur HTTP sur le port 8080 :" - -#. type: example -#: doc/guix.texi:7673 -#, no-wrap -msgid "guix publish\n" -msgstr "guix publish\n" - -#. type: Plain text -#: doc/guix.texi:7677 -msgid "Once a publishing server has been authorized (@pxref{Invoking guix archive}), the daemon may download substitutes from it:" -msgstr "Une fois qu'un serveur de publication a été autorisé (@pxref{Invoking guix archive}), le démon peut télécharger des substituts à partir de lui :" - -#. type: example -#: doc/guix.texi:7680 -#, no-wrap -msgid "guix-daemon --substitute-urls=http://example.org:8080\n" -msgstr "guix-daemon --substitute-urls=http://example.org:8080\n" - -#. type: Plain text -#: doc/guix.texi:7689 -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 "Par défaut, @command{guix publish} compresse les archives à la volée quand il les sert. Ce mode « à la volée » est pratique puisqu'il ne demande aucune configuration et est disponible immédiatement. Cependant, lorsqu'il s'agit de servir beaucoup de clients, nous recommandons d'utiliser l'option @option{--cache}, qui active le cache des archives avant de les envoyer aux clients — voir les détails plus bas. La commande @command{guix weather} fournit un manière pratique de vérifier ce qu'un serveur fournit (@pxref{Invoking guix weather})." - -#. type: Plain text -#: doc/guix.texi:7696 -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 "En bonus, @command{guix publish} sert aussi un miroir adressé par le contenu des fichiers source référencées dans les enregistrements @code{origin} (@pxref{origin Reference}). Par exemple, en supposant que @command{guix publish} tourne sur @code{example.org}, l'URL suivante renverra le fichie brut @file{hello-2.10.tar.gz} avec le hash SHA256 donné (représenté sous le format @code{nix-base32}, @pxref{Invoking guix hash}) :" - -#. type: example -#: doc/guix.texi:7699 -#, no-wrap -msgid "http://example.org/file/hello-2.10.tar.gz/sha256/0ssi1@dots{}ndq1i\n" -msgstr "http://example.org/file/hello-2.10.tar.gz/sha256/0ssi1@dots{}ndq1i\n" - -#. type: Plain text -#: doc/guix.texi:7703 -msgid "Obviously, these URLs only work for files that are in the store; in other cases, they return 404 (``Not Found'')." -msgstr "Évidemment, ces URL ne fonctionnent que pour des fichiers dans le dépôt ; dans les autres cas, elles renvoie une erreur 404 (« Introuvable »)." - -#. type: cindex -#: doc/guix.texi:7704 -#, no-wrap -msgid "build logs, publication" -msgstr "journaux de construction, publication" - -#. type: Plain text -#: doc/guix.texi:7706 -msgid "Build logs are available from @code{/log} URLs like:" -msgstr "Les journaux de construction sont disponibles à partir des URL @code{/log} comme ceci :" - -#. type: example -#: doc/guix.texi:7709 -#, no-wrap -msgid "http://example.org/log/gwspk@dots{}-guile-2.2.3\n" -msgstr "http://example.org/log/gwspk@dots{}-guile-2.2.3\n" - -#. type: Plain text -#: doc/guix.texi:7719 -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 "Lorsque @command{guix-daemon} est configuré pour sauvegarder les journaux de construction compressés, comme c'est le cas par défaut (@pxref{Invoking guix-daemon}), les URL @code{/log} renvoient le journal compressé tel-quel, avec un en-tête @code{Content-Type} ou @code{Content-Encoding} approprié. Nous recommandons de lancer @command{guix-daemon} avec @code{--log-compression=gzip} pace que les navigateurs web les décompressent automatiquement, ce qui n'est pas le cas avec la compression bzip2." - -#. type: item -#: doc/guix.texi:7723 -#, no-wrap -msgid "--port=@var{port}" -msgstr "--port=@var{port}" - -#. type: itemx -#: doc/guix.texi:7724 -#, no-wrap -msgid "-p @var{port}" -msgstr "-p @var{port}" - -#. type: table -#: doc/guix.texi:7726 -msgid "Listen for HTTP requests on @var{port}." -msgstr "Écoute les requêtes HTTP sur le @var{port}" - -#. type: item -#: doc/guix.texi:7727 doc/guix.texi:17516 -#, no-wrap -msgid "--listen=@var{host}" -msgstr "--listen=@var{hôte}" - -#. type: table -#: doc/guix.texi:7730 -msgid "Listen on the network interface for @var{host}. The default is to accept connections from any interface." -msgstr "Écoute sur l'interface réseau de @var{hôte}. Par défaut, la commande accepte les connexions de n'importe quelle interface." - -#. type: table -#: doc/guix.texi:7735 -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 "Charge les privilèges de @var{utilisateur} le plus vite possible — c.-à-d. une fois que la socket du serveur est ouverte et que la clef de signature a été lue." - -#. type: item -#: doc/guix.texi:7736 -#, no-wrap -msgid "--compression[=@var{level}]" -msgstr "--compression[=@var{niveau}]" - -#. type: itemx -#: doc/guix.texi:7737 -#, no-wrap -msgid "-C [@var{level}]" -msgstr "-C [@var{niveau}]" - -#. type: table -#: doc/guix.texi:7742 -msgid "Compress data using the given @var{level}. When @var{level} is zero, disable compression. The range 1 to 9 corresponds to different gzip compression levels: 1 is the fastest, and 9 is the best (CPU-intensive). The default is 3." -msgstr "Compresse les données au @var{niveau} donné. Lorsque le @var{niveau} est zéro, désactive la compression. L'intervalle 1 à 9 correspond aux différents niveaux de compression gzip : 1 est le plus rapide et 9 est la meilleure (mais gourmande en CPU). Le niveau par défaut est 3." - -#. type: table -#: doc/guix.texi:7751 -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 "À moins que @option{--cache} ne soit utilisé, la compression se fait à la volée et les flux compressés ne sont pas cachés. Ainsi, pour réduire la charge sur la machine qui fait tourner @command{guix publish}, c'est une bonne idée de choisir un niveau de compression faible, de lancer @command{guix publish} derrière un serveur de cache ou d'utiliser @option{--cache}. Utilise @option{--cache} a l'avantage qu'il permet à @command{guix publish} d'ajouter l'en-tête HTTP @code{Content-Length} à sa réponse." - -#. type: item -#: doc/guix.texi:7752 -#, no-wrap -msgid "--cache=@var{directory}" -msgstr "--cache=@var{répertoire}" - -#. type: itemx -#: doc/guix.texi:7753 -#, no-wrap -msgid "-c @var{directory}" -msgstr "-c @var{répertoire}" - -#. type: table -#: doc/guix.texi:7756 -msgid "Cache archives and meta-data (@code{.narinfo} URLs) to @var{directory} and only serve archives that are in cache." -msgstr "Cache les archives et les métadonnées (les URL @code{.narinfo}) dans @var{répertoire} et ne sert que les archives dans ce cache." - -#. type: table -#: doc/guix.texi:7764 -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 "Lorsque cette option est omise, les archives et les métadonnées sont crées à la volée. Cela réduit la bande passante disponible, surtout quand la compression est activée puisqu'elle pourrait être limitée par le CPU. Un autre inconvénient au mode par défaut est que la taille des archives n'est pas connue à l'avance, donc @command{guix publish} n'ajoute pas l'en-tête @code{Content-Length} à ses résponses, ce qui empêche les clients de savoir la quantité de données à télécharger." - -#. type: table -#: doc/guix.texi:7772 -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 "À l'inverse, lorsque @option{--cache} est utilisée, la première requête pour un élément du dépôt (via une URL @code{.narinfo}) renvoie une erreur 404 et déclenche la création de l'archive — en calculant son @code{.narinfo} et en compressant l'archive au besoin. Une fois l'archive cachée dans @var{répertoire}, les requêtes suivantes réussissent et sont servies directement depuis le cache, ce qui garanti que les clients ont la meilleure bande passante possible." - -#. type: table -#: doc/guix.texi:7776 -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 "Le processus de création est effectué par des threads de travail. Par défaut, un thread par cœur du CPU est créé, mais cela peut être personnalisé. Voir @option{--workers} plus bas." - -#. type: table -#: doc/guix.texi:7779 -msgid "When @option{--ttl} is used, cached entries are automatically deleted when they have expired." -msgstr "Lorsque l'option @option{--ttl} est utilisée, les entrées cachées sont automatiquement supprimées lorsqu'elles expirent." - -#. type: item -#: doc/guix.texi:7780 -#, no-wrap -msgid "--workers=@var{N}" -msgstr "--workers=@var{N}" - -#. type: table -#: doc/guix.texi:7783 -msgid "When @option{--cache} is used, request the allocation of @var{N} worker threads to ``bake'' archives." -msgstr "Lorsque @option{--cache} est utilisée, demande l'allocation de @var{N} thread de travail pour créer les archives." - -#. type: item -#: doc/guix.texi:7784 -#, no-wrap -msgid "--ttl=@var{ttl}" -msgstr "--ttl=@var{ttl}" - -#. type: table -#: doc/guix.texi:7788 -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 "Produit des en-têtes HTTP @code{Cache-Control} qui expriment une durée de vie (TTL) de @var{ttl}. @var{ttl} peut dénoter une durée : @code{5d} signifie 5 jours, @code{1m} signifie un mois, etc." - -#. type: table -#: doc/guix.texi:7793 -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 "Cela permet au Guix de l'utilisateur de garder les informations en cache pendant @var{ttl}. Cependant, remarquez que @code{guix publish} ne garanti pas lui-même que les éléments du dépôt qu'il fournit seront toujours disponible pendant la durée @var{ttl}." - -#. type: table -#: doc/guix.texi:7797 -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 "En plus, lorsque @option{--cache} est utilisée, les entrées cachées qui n'ont pas été demandé depuis @var{ttl} et n'ont pas d'élément correspondant dans le dépôt peuvent être supprimées." - -#. type: item -#: doc/guix.texi:7798 -#, no-wrap -msgid "--nar-path=@var{path}" -msgstr "--nar-path=@var{chemin}" - -#. type: table -#: doc/guix.texi:7801 -msgid "Use @var{path} as the prefix for the URLs of ``nar'' files (@pxref{Invoking guix archive, normalized archives})." -msgstr "Utilise @var{chemin} comme préfixe des URL de fichier « nar » (@pxref{Invoking guix archive, normalized archives})." - -#. type: table -#: doc/guix.texi:7805 -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 "Par défaut, les nars sont présents à l'URL comme @code{/nar/gzip/@dots{}-coreutils-8.25}. Cette option vous permet de changer la partie @code{/nar} en @var{chemin}." - -#. type: item -#: doc/guix.texi:7806 -#, no-wrap -msgid "--public-key=@var{file}" -msgstr "--public-key=@var{fichier}" - -#. type: itemx -#: doc/guix.texi:7807 -#, no-wrap -msgid "--private-key=@var{file}" -msgstr "--private-key=@var{fichier}" - -#. type: table -#: doc/guix.texi:7810 -msgid "Use the specific @var{file}s as the public/private key pair used to sign the store items being published." -msgstr "Utilise les @var{fichier}s spécifiques comme pair de clefs utilisées pour signer les éléments avant de les publier." - -#. type: table -#: doc/guix.texi:7817 -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 "Les fichiers doivent correspondre à la même pair de clefs (la clef privée est utilisée pour signer et la clef publique est seulement ajouté aux métadonnées de la signature). Ils doivent contenir les clefs dans le format s-expression canonique produit par @command{guix archive --generate-key} (@pxref{Invoking guix archive}). Par défaut, @file{/etc/guix/signing-key.pub} et @file{/etc/guix/signing-key.sec} sont utilisés." - -#. type: item -#: doc/guix.texi:7818 -#, no-wrap -msgid "--repl[=@var{port}]" -msgstr "--repl[=@var{port}]" - -#. type: itemx -#: doc/guix.texi:7819 -#, no-wrap -msgid "-r [@var{port}]" -msgstr "-r [@var{port}]" - -#. type: table -#: doc/guix.texi:7823 -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 "Crée un serveur REPL Guile (@pxref{REPL Servers,,, guile, GNU Guile Reference Manual}) sur @var{pport} (37146 par défaut). C'est surtout utile pour déboguer un serveur @command{guix publish} qui tourne." - -#. type: Plain text -#: doc/guix.texi:7829 -msgid "Enabling @command{guix publish} on a GuixSD 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 "Activer @command{guix publish} sur un système GuixSD est vraiment une seule ligne : instantiez simplement un service @code{guix-publish-service-type} dans le champs @code{services} de votre déclaration @code{operating-system} (@pxref{guix-publish-service-type, @code{guix-publish-service-type}})." - -#. type: Plain text -#: doc/guix.texi:7832 -msgid "If you are instead running Guix on a ``foreign distro'', follow these instructions:”" -msgstr "Si vous avez installé Guix sur une « distro extérieure », suivez ces instructions :" - -#. type: itemize -#: doc/guix.texi:7836 -msgid "If your host distro uses the systemd init system:" -msgstr "Si votre distro hôte utilise le système d'init systemd :" - -#. type: example -#: doc/guix.texi:7841 -#, no-wrap -msgid "" -"# ln -s ~root/.guix-profile/lib/systemd/system/guix-publish.service \\\n" -" /etc/systemd/system/\n" -"# systemctl start guix-publish && systemctl enable guix-publish\n" -msgstr "" -"# ln -s ~root/.guix-profile/lib/systemd/system/guix-publish.service \\\n" -" /etc/systemd/system/\n" -"# systemctl start guix-publish && systemctl enable guix-publish\n" - -#. type: example -#: doc/guix.texi:7849 -#, no-wrap -msgid "" -"# ln -s ~root/.guix-profile/lib/upstart/system/guix-publish.conf /etc/init/\n" -"# start guix-publish\n" -msgstr "" -"# ln -s ~root/.guix-profile/lib/upstart/system/guix-publish.conf /etc/init/\n" -"# start guix-publish\n" - -#. type: itemize -#: doc/guix.texi:7853 -msgid "Otherwise, proceed similarly with your distro's init system." -msgstr "Sinon, procédez de manière similaire avec votre système d'init de votre distro." - -#. type: section -#: doc/guix.texi:7856 -#, no-wrap -msgid "Invoking @command{guix challenge}" -msgstr "Invoquer @command{guix challenge}" - -#. type: cindex -#: doc/guix.texi:7859 -#, no-wrap -msgid "verifiable builds" -msgstr "constructions vérifiables" - -#. type: command{#1} -#: doc/guix.texi:7860 -#, no-wrap -msgid "guix challenge" -msgstr "guix challenge" - -#. type: cindex -#: doc/guix.texi:7861 -#, no-wrap -msgid "challenge" -msgstr "défi" - -#. type: Plain text -#: doc/guix.texi:7866 -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 "Est-ce que les binaires fournis par ce serveur correspondent réellement au code source qu'il dit avoir construit ? Est-ce que le processus de construction d'un paquet est déterministe ? Ce sont les question auxquelles la commande @command{guix challenge} essaye de répondre." - -#. type: Plain text -#: doc/guix.texi:7874 -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 "La première question est évidemment importante : avant d'utiliser un serveur de substituts (@pxref{Substituts}), il vaut mieux @emph{vérifier} qu'il fournit les bons binaires et donc le @emph{défier}. La deuxième est ce qui permet la première : si les constructions des paquets sont déterministes alors des constructions indépendantes du paquet devraient donner le même résultat, bit à bit ; si un serveur fournit un binaire différent de celui obtenu localement, il peut être soit corrompu, soit malveillant." - -#. type: Plain text -#: doc/guix.texi:7883 -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 "On sait que le hash qui apparaît dans @file{/gnu/store} est le hash de toutes les entrées du processus qui construit le fichier ou le répertoire — les compilateurs, les bibliothèques, les scripts de construction, etc. (@pxref{Introduction}). En supposant que les processus de construction sont déterministes, un nom de fichier dans le dépôt devrait correspondre exactement à une sortie de construction. @command{guix challenge} vérifie si il y a bien effectivement une seule correspondance en comparant les sorties de plusieurs constructions indépendantes d'un élément du dépôt donné." - -#. type: Plain text -#: doc/guix.texi:7885 -msgid "The command output looks like this:" -msgstr "La sortie de la commande ressemble à :" - -#. type: smallexample -#: doc/guix.texi:7902 -#, no-wrap -msgid "" -"$ guix challenge --substitute-urls=\"https://hydra.gnu.org https://guix.example.org\"\n" -"updating list of substitutes from 'https://hydra.gnu.org'... 100.0%\n" -"updating list of substitutes from 'https://guix.example.org'... 100.0%\n" -"/gnu/store/@dots{}-openssl-1.0.2d contents differ:\n" -" local hash: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q\n" -" https://hydra.gnu.org/nar/@dots{}-openssl-1.0.2d: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q\n" -" https://guix.example.org/nar/@dots{}-openssl-1.0.2d: 1zy4fmaaqcnjrzzajkdn3f5gmjk754b43qkq47llbyak9z0qjyim\n" -"/gnu/store/@dots{}-git-2.5.0 contents differ:\n" -" local hash: 00p3bmryhjxrhpn2gxs2fy0a15lnip05l97205pgbk5ra395hyha\n" -" https://hydra.gnu.org/nar/@dots{}-git-2.5.0: 069nb85bv4d4a6slrwjdy8v1cn4cwspm3kdbmyb81d6zckj3nq9f\n" -" https://guix.example.org/nar/@dots{}-git-2.5.0: 0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73\n" -"/gnu/store/@dots{}-pius-2.1.1 contents differ:\n" -" local hash: 0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax\n" -" https://hydra.gnu.org/nar/@dots{}-pius-2.1.1: 0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax\n" -" https://guix.example.org/nar/@dots{}-pius-2.1.1: 1cy25x1a4fzq5rk0pmvc8xhwyffnqz95h2bpvqsz2mpvlbccy0gs\n" -"\n" -msgstr "" -"$ guix challenge --substitute-urls=\"https://hydra.gnu.org https://guix.example.org\"\n" -"mise à jour de la liste des substituts depuis 'https://hydra.gnu.org'... 100.0%\n" -"mise à jour de la liste des substituts depuis 'https://guix.example.org'... 100.0%\n" -"le contenu de /gnu/store/@dots{}-openssl-1.0.2d diffère :\n" -" empreinte locale : 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q\n" -" https://hydra.gnu.org/nar/@dots{}-openssl-1.0.2d : 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q\n" -" https://guix.example.org/nar/@dots{}-openssl-1.0.2d : 1zy4fmaaqcnjrzzajkdn3f5gmjk754b43qkq47llbyak9z0qjyim\n" -"le contenu de /gnu/store/@dots{}-git-2.5.0 diffère :\n" -" empreinte locale : 00p3bmryhjxrhpn2gxs2fy0a15lnip05l97205pgbk5ra395hyha\n" -" https://hydra.gnu.org/nar/@dots{}-git-2.5.0 : 069nb85bv4d4a6slrwjdy8v1cn4cwspm3kdbmyb81d6zckj3nq9f\n" -" https://guix.example.org/nar/@dots{}-git-2.5.0 : 0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73\n" -"le contenu de /gnu/store/@dots{}-pius-2.1.1 diffère :\n" -" empreinte locale : 0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax\n" -" https://hydra.gnu.org/nar/@dots{}-pius-2.1.1 : 0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax\n" -" https://guix.example.org/nar/@dots{}-pius-2.1.1 : 1cy25x1a4fzq5rk0pmvc8xhwyffnqz95h2bpvqsz2mpvlbccy0gs\n" -"\n" - -#. type: smallexample -#: doc/guix.texi:7904 -#, no-wrap -msgid "" -"@dots{}\n" "\n" +" --clear-failures remove PATHS from the set of cached failures" msgstr "" -"@dots{}\n" "\n" +" --clear-failures supprimer CHEMINS de l'ensemble des échecs en cache" -#. type: smallexample -#: doc/guix.texi:7909 -#, no-wrap -msgid "" -"6,406 store items were analyzed:\n" -" - 4,749 (74.1%) were identical\n" -" - 525 (8.2%) differed\n" -" - 1,132 (17.7%) were inconclusive\n" -msgstr "" -"6,406 éléments du dépôt ont été analysés :\n" -" - 4,749 (74.1%) étaient identiques\n" -" - 525 (8.2%) étaient différents\n" -" - 1,132 (17.7%) étaient impossibles à évaluer\n" - -#. type: Plain text -#: doc/guix.texi:7917 -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 "Dans cet exemple, @command{guix challenge} scanne d'abord le dépôt pour déterminer l'ensemble des dérivations construites localement — en opposition aux éléments qui ont été téléchargées depuis un serveur de substituts — puis demande leur avis à tous les serveurs de substituts. Il rapporte ensuite les éléments du dépôt pour lesquels les serveurs ont obtenu un résultat différent de la construction locale." - -#. type: cindex -#: doc/guix.texi:7918 -#, no-wrap -msgid "non-determinism, in package builds" -msgstr "non-déterminisme, dans les constructions des paquets" - -#. type: Plain text -#: doc/guix.texi:7929 -msgid "As an example, @code{guix.example.org} always gets a different answer. Conversely, @code{hydra.gnu.org} 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 "Dans l'exemple, @code{guix.example.org} obtient toujours une réponse différente. Inversement, @code{hydra.gnu.org} est d'accord avec les constructions locale, sauf dans le cas de Git. Cela peut indiquer que le processus de construction de Git est non-déterministe, ce qui signifie que sa sortie diffère en fonction de divers choses que Guix ne contrôle pas parfaitement, malgré l'isolation des constructions (@pxref{Features}). Les sources les plus communes de non-déterminisme comprennent l'ajout d'horodatage dans les résultats des constructions, l'inclusion de nombres aléatoires et des listes de fichiers ordonnés par numéro d'inœud. Voir @uref{https://reproducible-builds.org/docs/}, pour plus d'informations." - -#. type: Plain text -#: doc/guix.texi:7932 -msgid "To find out what is wrong with this Git binary, we can do something along these lines (@pxref{Invoking guix archive}):" -msgstr "Pour trouver ce qui ne va pas avec le binaire de Git, on peut faire quelque chose comme cela (@pxref{Invoking guix archive}) :" - -#. type: example -#: doc/guix.texi:7937 -#, no-wrap -msgid "" -"$ wget -q -O - https://hydra.gnu.org/nar/@dots{}-git-2.5.0 \\\n" -" | guix archive -x /tmp/git\n" -"$ diff -ur --no-dereference /gnu/store/@dots{}-git.2.5.0 /tmp/git\n" -msgstr "" -"$ wget -q -O - https://hydra.gnu.org/nar/@dots{}-git-2.5.0 \\\n" -" | guix archive -x /tmp/git\n" -"$ diff -ur --no-dereference /gnu/store/@dots{}-git.2.5.0 /tmp/git\n" - -#. type: Plain text -#: doc/guix.texi:7946 -msgid "This command shows the difference between the files resulting from the local build, and the files resulting from the build on @code{hydra.gnu.org} (@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 "Cette commande montre les différences entre les fichiers qui résultent de la construction locale et des fichiers qui résultent de la construction sur @code{hydra.gnu.org} (@pxref{Overview, Comparing and Merging Files,, diffutils, Comparing and Merging Files}). La commande @command{diff} fonctionne bien avec des fichiers texte. Lorsque des fichiers binaires diffèrent cependant, @uref{https://diffoscope.org/, Diffoscope} est une meilleure option. C'est un outil qui aide à visualiser les différences entre toute sorte de fichiers." - -#. type: Plain text -#: doc/guix.texi:7954 -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 "Une fois que vous avez fait ce travail, vous pourrez dire si les différences sont dues au non-déterminisme du processus de construction ou à la malhonnêteté du serveur. Nous avons fait beaucoup d'effort pour éliminer les sources de non-déterminisme dans les paquets pour rendre plus facile la vérification des substituts, mais bien sûr, c'est un processus qui n'implique pas que Guix, mais une grande partie de la communauté des logiciels libres. Pendant ce temps, @command{guix challenge} est un outil pour aider à corriger le problème." - -#. type: Plain text -#: doc/guix.texi:7958 -msgid "If you are writing packages for Guix, you are encouraged to check whether @code{hydra.gnu.org} and other substitute servers obtain the same build result as you did with:" -msgstr "Si vous écrivez un paquet pour Guix, nous vous encourageons à vérifier si @code{hydra.gnu.org} et d'autres serveurs de substituts obtiennent le même résultat que vous avec :" - -#. type: example -#: doc/guix.texi:7961 -#, no-wrap -msgid "$ guix challenge @var{package}\n" -msgstr "$ guix challenge @var{paquet}\n" - -#. type: Plain text -#: doc/guix.texi:7966 -msgid "where @var{package} is a package specification such as @code{guile@@2.0} or @code{glibc:debug}." -msgstr "où @var{paquet} est une spécification de paquet comme @code{guile@@2.0} ou @code{glibc:debug}." - -#. type: example -#: doc/guix.texi:7971 -#, no-wrap -msgid "guix challenge @var{options} [@var{packages}@dots{}]\n" -msgstr "guix challenge @var{options} [@var{paquets}@dots{}]\n" - -#. type: Plain text -#: doc/guix.texi:7978 -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 "Lorsqu'une différence est trouvée entre l'empreinte d'un élément construit localement et celle d'un substitut fournit par un serveur, ou parmi les substituts fournis par différents serveurs, la commande l'affiche comme dans l'exemple ci-dessus et sa valeur de sortie est 2 (les autres valeurs différentes de 0 indiquent d'autres sortes d'erreurs)." - -#. type: Plain text -#: doc/guix.texi:7980 -msgid "The one option that matters is:" -msgstr "L'option qui compte est :" - -#. type: table -#: doc/guix.texi:7986 -msgid "Consider @var{urls} the whitespace-separated list of substitute source URLs to compare to." -msgstr "Considère @var{urls} comme la liste des URL des sources de substituts séparés par des espaces avec lesquels comparer les paquets locaux." - -#. type: itemx -#: doc/guix.texi:7988 -#, no-wrap -msgid "-v" -msgstr "-v" - -#. type: table -#: doc/guix.texi:7991 -msgid "Show details about matches (identical contents) in addition to information about mismatches." -msgstr "Montre des détails sur les correspondances (contenu identique) en plus des informations sur différences." - -#. type: section -#: doc/guix.texi:7995 -#, no-wrap -msgid "Invoking @command{guix copy}" -msgstr "Invoquer @command{guix copy}" - -#. type: cindex -#: doc/guix.texi:7997 -#, no-wrap -msgid "copy, of store items, over SSH" -msgstr "copier des éléments du dépôt par SSH" - -#. type: cindex -#: doc/guix.texi:7998 -#, no-wrap -msgid "SSH, copy of store items" -msgstr "SSH, copie d'éléments du dépôt" - -#. type: cindex -#: doc/guix.texi:7999 -#, no-wrap -msgid "sharing store items across machines" -msgstr "partager des éléments du dépôt entre plusieurs machines" - -#. type: cindex -#: doc/guix.texi:8000 -#, no-wrap -msgid "transferring store items across machines" -msgstr "transférer des éléments du dépôt entre plusieurs machines" - -#. type: Plain text -#: doc/guix.texi:8007 -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 "La commande @command{guix copy} copie des éléments du dépôt d'une machine vers le dépôt d'une autre machine à travers une connexion SSH@footnote{Cette commande n'est disponible que si Guile-SSH est trouvé. @xref{Requirements}, pour des détails}. Par exemple, la commande suivante copie le paquet @code{coreutils}, le profil utilisateur et toutes leurs dépendances sur @var{hôte}, en tant qu'utilisateur @var{utilisateur} :" - -#. type: example -#: doc/guix.texi:8011 -#, no-wrap -msgid "" -"guix copy --to=@var{user}@@@var{host} \\\n" -" coreutils `readlink -f ~/.guix-profile`\n" -msgstr "" -"guix copy --to=@var{utilisateur}@@@var{hôte} \\\n" -" coreutils `readlink -f ~/.guix-profile`\n" - -#. type: Plain text -#: doc/guix.texi:8015 -msgid "If some of the items to be copied are already present on @var{host}, they are not actually sent." -msgstr "Si certains éléments à copier sont déjà présents sur @var{hôte}, ils ne sont pas envoyés." - -#. type: Plain text -#: doc/guix.texi:8018 -msgid "The command below retrieves @code{libreoffice} and @code{gimp} from @var{host}, assuming they are available there:" -msgstr "La commande ci-dessous récupère @code{libreoffice} et @code{gimp} depuis @var{hôte}, en supposant qu'ils y sont présents :" - -#. type: example -#: doc/guix.texi:8021 -#, no-wrap -msgid "guix copy --from=@var{host} libreoffice gimp\n" -msgstr "guix copy --from=@var{hôte} libreoffice gimp\n" - -#. type: Plain text -#: doc/guix.texi:8026 -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 "La connexion SSH est établie avec le client Guile-SSH, qui set compatible avec OpenSSH : il honore @file{~/.ssh/known_hosts} et @file{~/.ssh/config} et utilise l'agent SSH pour l'authentification." - -#. type: Plain text -#: doc/guix.texi:8032 -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 "La clef utilisée pour signer les éléments qui sont envoyés doit être acceptée par la machine distante. De même, la clef utilisée pour la machine distante depuis laquelle vous récupérez des éléments doit être dans @file{/etc/guix/acl} pour qu'ils soient acceptés par votre propre démon. @xref{Invoking guix archive}, pour plus d'informations sur l'authentification des éléments du dépôt." - -#. type: example -#: doc/guix.texi:8037 -#, no-wrap -msgid "guix copy [--to=@var{spec}|--from=@var{spec}] @var{items}@dots{}\n" -msgstr "guix copy [--to=@var{spec}|--from=@var{spec}] @var{items}@dots{}\n" - -#. type: Plain text -#: doc/guix.texi:8040 -msgid "You must always specify one of the following options:" -msgstr "Vous devez toujours spécifier l'une des options suivantes :" - -#. type: item -#: doc/guix.texi:8042 -#, no-wrap -msgid "--to=@var{spec}" -msgstr "--to=@var{spec}" - -#. type: itemx -#: doc/guix.texi:8043 -#, no-wrap -msgid "--from=@var{spec}" -msgstr "--from=@var{spec}" - -#. type: table -#: doc/guix.texi:8047 -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 "Spécifie l'hôte où envoyer ou d'où recevoir les éléments. @var{spec} doit être une spécification SSH comme @code{example.org}, @code{charlie@@example.org} ou @code{charlie@@example.org:2222}." - -#. type: Plain text -#: doc/guix.texi:8051 -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 "L'option @var{items} peut être des noms de paquets, comme @code{gimp} ou des éléments du dépôt comme @file{/gnu/store/@dots{}-idutils-4.6}." - -#. type: Plain text -#: doc/guix.texi:8055 -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 "Lorsque vous spécifiez le nom d'un paquet à envoyer, il est d'abord construit au besoin, sauf si l'option @option{--dry-run} est spécifiée. Les options de construction communes sont supportées (@pxref{Common Build Options})." - -#. type: section -#: doc/guix.texi:8058 -#, no-wrap -msgid "Invoking @command{guix container}" -msgstr "Invoquer @command{guix container}" - -#. type: command{#1} -#: doc/guix.texi:8060 -#, no-wrap -msgid "guix container" -msgstr "guix container" - -#. type: quotation -#: doc/guix.texi:8064 -msgid "As of version @value{VERSION}, this tool is experimental. The interface is subject to radical change in the future." -msgstr "À la version @value{VERSION}, cet outil est toujours expérimental. L'interface est sujette à changement radicaux dans le futur." - -#. type: Plain text -#: doc/guix.texi:8071 -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 "Le but de @command{guix container} est de manipuler des processus qui tournent dans un environnement séparé, connus sous le nom de « conteneur », typiquement créés par les commandes @command{guix environment} (@pxref{Invoking guix environment}) et @command{guix system container} (@pxref{Invoking guix system})." - -#. type: example -#: doc/guix.texi:8076 -#, no-wrap -msgid "guix container @var{action} @var{options}@dots{}\n" -msgstr "guix container @var{action} @var{options}@dots{}\n" - -#. type: Plain text -#: doc/guix.texi:8080 -msgid "@var{action} specifies the operation to perform with a container, and @var{options} specifies the context-specific arguments for the action." -msgstr "@var{action} spécifie les opérations à effectuer avec un conteneur, et @var{options} spécifie les arguments spécifiques au contexte pour l'action." - -#. type: Plain text -#: doc/guix.texi:8082 -msgid "The following actions are available:" -msgstr "Les actions suivantes sont disponibles :" - -#. type: item -#: doc/guix.texi:8084 -#, no-wrap -msgid "exec" -msgstr "exec" - -#. type: table -#: doc/guix.texi:8086 -msgid "Execute a command within the context of a running container." -msgstr "Exécute une commande dans le contexte d'un conteneur lancé." - -#. type: table -#: doc/guix.texi:8088 -msgid "The syntax is:" -msgstr "La syntaxe est :" - -#. type: example -#: doc/guix.texi:8091 -#, no-wrap -msgid "guix container exec @var{pid} @var{program} @var{arguments}@dots{}\n" -msgstr "guix container exec @var{pid} @var{programme} @var{arguments}@dots{}\n" - -#. type: table -#: doc/guix.texi:8097 -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 "@var{pid} spécifie le PID du conteneur lancé. @var{programme} spécifie le nom du fichier exécutable dans le système de fichiers racine du conteneur. @var{arguments} sont les options supplémentairesà passer à @var{programme}." - -#. type: table -#: doc/guix.texi:8101 -msgid "The following command launches an interactive login shell inside a GuixSD container, started by @command{guix system container}, and whose process ID is 9001:" -msgstr "La commande suivante lance un shell de connexion interactif dans un conteneur GuixSD, démarré par @command{guix system container} et dont le PID est 9001 :" - -#. type: example -#: doc/guix.texi:8104 -#, no-wrap -msgid "guix container exec 9001 /run/current-system/profile/bin/bash --login\n" -msgstr "guix container exec 9001 /run/current-system/profile/bin/bash --login\n" - -#. type: table -#: doc/guix.texi:8108 -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 "Remarquez que @var{pid} ne peut pas être le processus parent d'un conteneur. Ce doit être le PID 1 du conteneur ou l'un de ses processus fils." - -#. type: section -#: doc/guix.texi:8112 -#, no-wrap -msgid "Invoking @command{guix weather}" -msgstr "Invoquer @command{guix weather}" - -#. type: Plain text -#: doc/guix.texi:8121 -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 "Vous pouvez parfois grogner lorsque les substituts ne sont pas disponibles et que vous devez construire les paquets vous-même (@pxref{Substituts}). La commande @command{guix weather} rapporte la disponibilité des substituts sur les serveurs spécifiés pour que vous sachiez si vous allez raller aujourd'hui. Cela peut parfois être une information utile pour les utilisateurs, mais elle est surtout utile pour les personnes qui font tourner @command{guix publish} (@pxref{Invoking guix publish})." - -#. type: cindex -#: doc/guix.texi:8122 -#, no-wrap -msgid "statistics, for substitutes" -msgstr "statistiques sur les substituts" - -#. type: cindex -#: doc/guix.texi:8123 -#, no-wrap -msgid "availability of substitutes" -msgstr "disponibilité des substituts" - -#. type: cindex -#: doc/guix.texi:8124 -#, no-wrap -msgid "substitute availability" -msgstr "substuts, disponibilité" - -#. type: cindex -#: doc/guix.texi:8125 -#, no-wrap -msgid "weather, substitute availability" -msgstr "weather, disponibilité des substituts" - -#. type: Plain text -#: doc/guix.texi:8127 -msgid "Here's a sample run:" -msgstr "Voici un exemple :" - -#. type: example -#: doc/guix.texi:8139 -#, no-wrap -msgid "" -"$ guix weather --substitute-urls=https://guix.example.org\n" -"computing 5,872 package derivations for x86_64-linux...\n" -"looking for 6,128 store items on https://guix.example.org..\n" -"updating list of substitutes from 'https://guix.example.org'... 100.0%\n" -"https://guix.example.org\n" -" 43.4% substitutes available (2,658 out of 6,128)\n" -" 7,032.5 MiB of nars (compressed)\n" -" 19,824.2 MiB on disk (uncompressed)\n" -" 0.030 seconds per request (182.9 seconds in total)\n" -" 33.5 requests per second\n" -"\n" -msgstr "" -"$ guix weather --substitute-urls=https://guix.example.org\n" -"calcul de 5,872 dérivations de paquets pour x86_64-linux…\n" -"recherche de 6,128 éléments du dépôt sur https://guix.example.org…\n" -"mise à jour de la liste des substituts depuis 'https://guix.example.org'... 100.0%\n" -"https://guix.example.org\n" -" 43.4% substituts disponibles (2,658 sur 6,128)\n" -" 7,032.5 Mo de fichiers nar (compressés)\n" -" 19,824.2 Mo sur le disque (décompressés)\n" -" 0.030 secondes par requêtes (182.9 secondes au total)\n" -" 33.5 requêtes par seconde\n" -"\n" - -#. type: example -#: doc/guix.texi:8149 -#, no-wrap -msgid "" -" 9.8% (342 out of 3,470) of the missing items are queued\n" -" 867 queued builds\n" -" x86_64-linux: 518 (59.7%)\n" -" i686-linux: 221 (25.5%)\n" -" aarch64-linux: 128 (14.8%)\n" -" build rate: 23.41 builds per hour\n" -" x86_64-linux: 11.16 builds per hour\n" -" i686-linux: 6.03 builds per hour\n" -" aarch64-linux: 6.41 builds per hour\n" -msgstr "" -" 9.8% (342 sur 3,470) des éléments manquants sont dans la queue\n" -" 867 constructions dans la queue\n" -" x86_64-linux : 518 (59.7%)\n" -" i686-linux : 221 (25.5%)\n" -" aarch64-linux : 128 (14.8%)\n" -" vitesse de construction : 23.41 constructions par heure\n" -" x86_64-linux : 11.16 constructions par heure\n" -" i686-linux : 6.03 constructions par heure\n" -" aarch64-linux : 6.41 constructions par heure\n" - -#. type: cindex -#: doc/guix.texi:8151 -#, no-wrap -msgid "continuous integration, statistics" -msgstr "intégration continue, statistiques" - -#. type: Plain text -#: doc/guix.texi:8160 -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." -msgstr "Comme vous pouvez le voir, elle rapporte le pourcentage des paquets pour lesquels des substituts sont disponibles sur le serveur — indépendamment du fait que les substituts soient activés, et indépendamment du fait que la clef de signature du serveur soit autorisée. Elle rapporte aussi la taille des archives compressées fournies par le serveur, la taille des éléments du dépôt correspondant dans le dépôt (en supposant que la déduplication soit désactivée) et la vitesse du serveur. La deuxième partie donne des statistiques sur l'intégration continue (CI), si le serveur le supporte." - -#. type: Plain text -#: doc/guix.texi:8166 -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 "Pour cela, @command{guix weather} récupère par HTTP(S) les métadonnées (@dfn{narinfos}@ de tous les éléments du dépôts pertinents. Comme @command{guix challenge}, il ignore les signatures de ces substituts, ce qui n'est pas dangereux puisque la commande ne fait que récupérer des statistiques et n'installe pas ces substituts." - -#. type: Plain text -#: doc/guix.texi:8169 -msgid "Among other things, it is possible to query specific system types and specific package sets. The available options are listed below." -msgstr "Entre autres choses, il est possible de demander des types de système particuliers et des ensembles de paquets particuliers. Les options disponibles sont listées plus bas." - -#. type: table -#: doc/guix.texi:8175 -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 "@var{urls} est la liste des URL des serveurs de substituts séparés par des espaces. Lorsque cette option n'est pas renseignée, l'ensemble des serveurs de substituts par défaut est utilisé." - -#. type: table -#: doc/guix.texi:8181 -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 "Effectue des requêtes pour les substituts @var{système} — p.@: ex.@: @code{aarch64-linux}. Cette option peut être répétée, auquel cas @command{guix weather} demandera les substituts de plusieurs types de systèmes." - -#. type: table -#: doc/guix.texi:8187 -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 "Plutôt que de demander des substituts pour tous les paquets, demande uniquement les paquets spécifiés dans @var{fichier}. @var{fichier} doit contenir un @dfn{manifeste} comme avec l'option @code{-m} de @command{guix package} (@pxref{Invoking guix package})." - -#. type: Plain text -#: doc/guix.texi:8205 -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}). To distinguish between the two, we refer to the standalone distribution as the Guix System Distribution, or GuixSD." -msgstr "Guix fournit aussi une distribution du système GNU contenant uniquement des logiciels libres@footnote{Le terme « libre » se réfère ici bien sûr à @url{http://www.gnu.org/philosophy/free-sw.fr.html,la liberté offerte à l'utilisateur de ces logiciels}.}. On peut installer la distribution elle-même (@pxref{System Installation}), mais on peut aussi installer Guix comme gestionnaire de paquets par dessus un système GNU/Linux déjà installé (@pxref{Installation}). Pour distinguer ces deux cas, on appelle la distribution autonome « Distribution Système Guix » ou GuixSD." - -#. type: Plain text -#: doc/guix.texi:8211 -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}):" -msgstr "la distribution fournit les paquets cœur de GNU comme la GNU libc, GCC et Binutils, ainsi que de nombreuses applications GNU et non-GNU. La liste complète des paquets disponibles se trouve @url{http://www.gnu.org/software/guix/packages,en ligne} ou en lançant @command{guix package} (@pxref{Invoking guix package}) :" - -#. type: example -#: doc/guix.texi:8214 -#, no-wrap -msgid "guix package --list-available\n" -msgstr "guix package --list-available\n" - -#. type: Plain text -#: doc/guix.texi:8220 -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 "Notre but est de fournir une distribution logicielle entièrement libre de GNU/Linux et d'autres variantes de GNU, en se concentrant sur la promotion et l'intégration étroite des composants GNU en insistant sur les programmes et les outils qui aident l'utilisateur à exercer ses libertés." - -#. type: Plain text -#: doc/guix.texi:8222 -msgid "Packages are currently available on the following platforms:" -msgstr "Les paquets sont actuellement disponibles pour les plateformes suivantes :" - -#. type: item -#: doc/guix.texi:8225 doc/guix.texi:8390 -#, no-wrap -msgid "x86_64-linux" -msgstr "x86_64-linux" - -#. type: table -#: doc/guix.texi:8227 -msgid "Intel/AMD @code{x86_64} architecture, Linux-Libre kernel;" -msgstr "l'architecture Intel et AMD @code{x86_64} avec le noyau Linux-libre ;" - -#. type: item -#: doc/guix.texi:8228 doc/guix.texi:8393 -#, no-wrap -msgid "i686-linux" -msgstr "i686-linux" - -#. type: table -#: doc/guix.texi:8230 -msgid "Intel 32-bit architecture (IA32), Linux-Libre kernel;" -msgstr "l'architecture Intel 32-bits (IA32) avec le noyau Linux-libre ;" - -#. type: item -#: doc/guix.texi:8231 -#, no-wrap -msgid "armhf-linux" -msgstr "armhf-linux" - -#. type: table -#: doc/guix.texi:8235 -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 "l'architecture ARMv7-A avec gestion des flottants matérielle, Thumb-2 et NEON, avec l'interface binaire applicative (ABI) EABI hard-float et le noyau Linux-libre ;" - -#. type: item -#: doc/guix.texi:8236 -#, no-wrap -msgid "aarch64-linux" -msgstr "aarch64-linux" - -#. type: table -#: doc/guix.texi:8240 -msgid "little-endian 64-bit ARMv8-A processors, Linux-Libre kernel. This is currently in an experimental stage, with limited support. @xref{Contributing}, for how to help!" -msgstr "les processeurs ARMv8-A 64-bits en little-endian avec le noyau Linux-libre. Le support est actuellement expérimental et limité. @xref{Contributing}, pour savoir comment aider !" - -#. type: item -#: doc/guix.texi:8241 -#, no-wrap -msgid "mips64el-linux" -msgstr "mips64el-linux" - -#. type: table -#: doc/guix.texi:8244 -msgid "little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel." -msgstr "les processeurs MIPS 64-bits little-endian, spécifiquement la série Loongson, ABI n32, avec le noyau Linux-libre." - -#. type: Plain text -#: doc/guix.texi:8248 -msgid "GuixSD itself is currently only available on @code{i686} and @code{x86_64}." -msgstr "GuixSD lui-même est actuellement disponible sur @code{i686} et @code{x86_64}." - -#. type: Plain text -#: doc/guix.texi:8252 -msgid "For information on porting to other architectures or kernels, @pxref{Porting}." -msgstr "Pour des informations sur comment porter vers d'autres architectures et d'autres noyau, @pxref{Porting}." - -#. type: Plain text -#: doc/guix.texi:8267 -msgid "Building this distribution is a cooperative effort, and you are invited to join! @xref{Contributing}, for information about how you can help." -msgstr "La construction de cette distribution est un effort collaboratif et nous vous invitons à nous rejoindre ! @xref{Contributing}, pour des informations sur la manière de nous aider." - -#. type: cindex -#: doc/guix.texi:8271 -#, no-wrap -msgid "installing GuixSD" -msgstr "installer GuixSD" - -#. type: Plain text -#: doc/guix.texi:8277 -msgid "This section explains how to install the Guix System Distribution (GuixSD) on a machine. The Guix package manager can also be installed on top of a running GNU/Linux system, @pxref{Installation}." -msgstr "Cette section explique comment installer la distribution système Guix (GuixSD) sur votre machine. Le gestionnaire de paquets Guix peut aussi être installé sur un système GNU/Linux déjà installé, @pxref{Installation}." - -#. type: quotation -#: doc/guix.texi:8286 -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 "Vous lisez cette documentation avec un lecteur Info. Pour des détails sur son utilisation, appuyez sur la touche @key{ENTRÉE} (« Entrée » ou « à la ligne ») sur le lien suivant : @pxref{Top, Info reader,, info-stnd, Stand-alone GNU Info}. Appuyez ensuite sur @kbd{l} pour revenir ici." - -#. type: quotation -#: doc/guix.texi:8289 -msgid "Alternately, run @command{info info} in another tty to keep the manual available." -msgstr "Autrement, lancez @command{info info} dans un autre tty pour garder ce manuel ouvert." - -#. type: Plain text -#: doc/guix.texi:8314 -msgid "As of version @value{VERSION}, the Guix System Distribution (GuixSD) is not production-ready. It may contain bugs and lack important features. Thus, if you are looking for a stable production system that respects your freedom as a computer user, a good solution at this point is to consider @url{http://www.gnu.org/distros/free-distros.html, one of the more established GNU/Linux distributions}. We hope you can soon switch to the GuixSD without fear, of course. In the meantime, you can also keep using your distribution and try out the package manager on top of it (@pxref{Installation})." -msgstr "À la version @value{VERSION}, la distribution système Guix (GuixSD) n'est pas prête pour la production. Elle peut contenir des bogues et ne pas avoir certaines fonctionnalités importantes. Ainsi, si vous cherche un système de production stable qui respecte votre liberté en tant qu'utilisateur, une bonne solution consiste à utiliser @url{http://www.gnu.org/distros/free-distros.html, une des distributions GNU/Linux mieux établie}. Nous espérons que vous pourrez bientôt passer à GuixSD sans peur, bien sûr. Pendant ce temps, vous pouvez aussi utiliser votre distribution actuelle et essayer le gestionnaire de paquet par dessus celle-ci (@pxref{Installation})." - -#. type: Plain text -#: doc/guix.texi:8317 -msgid "Before you proceed with the installation, be aware of the following noteworthy limitations applicable to version @value{VERSION}:" -msgstr "Avant de procéder à l'installation, soyez conscient de ces limitations les plus importantes qui s'appliquent à la version @value{VERSION} :" - -#. type: itemize -#: doc/guix.texi:8323 -msgid "The installation process does not include a graphical user interface and requires familiarity with GNU/Linux (see the following subsections to get a feel of what that means.)" -msgstr "Le procédé d'installation n'a pas d'interface utilisateur graphique et requiert une certaine familiarité avec GNU/Linux (voir les sous-sections suivantes pour avoir un aperçu de ce que cela signifie)." - -#. type: itemize -#: doc/guix.texi:8326 -msgid "Support for the Logical Volume Manager (LVM) is missing." -msgstr "LVM (gestionnaire de volumes logiques) n'est pas supporté." - -#. type: itemize -#: doc/guix.texi:8330 -msgid "More and more system services are provided (@pxref{Services}), but some may be missing." -msgstr "De plus en plus de services systèmes sont fournis (@pxref{Services}) mais certains manquent toujours cruellement." - -#. type: itemize -#: doc/guix.texi:8334 -msgid "More than 6,500 packages are available, but you might occasionally find that a useful package is missing." -msgstr "Plus de 6 500 paquets sont disponibles, mais vous pourrez parfois trouver qu'un paquet utile est absent." - -#. type: itemize -#: doc/guix.texi:8339 -msgid "GNOME, Xfce, LXDE, and Enlightenment are available (@pxref{Desktop Services}), as well as a number of X11 window managers. However, some graphical applications may be missing, as well as KDE." -msgstr "GNOME, Xfce, LXDE et Enlightenment sont disponibles (@pxref{Desktop Services}), ainsi qu'un certain nombre de gestionnaires de fenêtres X11. cependant, certaines applications graphiques peuvent manquer, ainsi que KDE." - -#. type: Plain text -#: doc/guix.texi:8344 -msgid "You have been warned! But 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 "Vous êtes avertis ! Mais plus qu'un avertissement, c'est une invitation à rapporter les problèmes (et vos succès !) et à nous rejoindre pour améliorer la distribution. @xref{Contributing}, pour plus d'info." - -#. type: cindex -#: doc/guix.texi:8349 -#, no-wrap -msgid "hardware support on GuixSD" -msgstr "support matériel sur GuixSD" - -#. type: Plain text -#: doc/guix.texi:8358 -msgid "GNU@tie{}GuixSD 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 GuixSD." -msgstr "GNU@tie{}GuixSD se concentre sur le respect des libertés de ses utilisateurs. Il est construit autour du noyau Linux-libre, ce qui signifie que seuls les matériels pour lesquels des pilotes logiciels et des microgiciels libres sont disponibles sont supportés. De nos jours, une grande gamme de matériel qu'on peut acheter est supporté par GNU/Linux-libre — des claviers aux cartes graphiques en passant par les scanners et les contrôleurs Ethernet. Malheureusement, il reste des produit dont les fabriquants refusent de laisser le contrôle aux utilisateurs sur leur propre utilisation de l'ordinateur, et ces matériels ne sont pas supportés par GuixSD." - -#. type: cindex -#: doc/guix.texi:8359 -#, no-wrap -msgid "WiFi, hardware support" -msgstr "WiFi, support matériel" - -#. type: Plain text -#: doc/guix.texi:8368 -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 GuixSD, as part of @var{%base-firmware} (@pxref{operating-system Reference, @code{firmware}})." -msgstr "L'un des types de matériels où les pilotes ou les microgiciels sont le moins disponibles sont les appareils WiFi. Les appareils WiFi connus pour fonctionner sont ceux qui utilisent des puces Atheros (AR9271 et AR7010) qui correspondent au pilote @code{ath9k} de Linux-libre, et ceux qui utilisent des puces Broadcom/AirForce (BCM43xx avec la révision Wireless-Core 5), qui correspondent au pilote @code{b43-open} de Linux-libre. Des microgiciels libres existent pour les deux et sont disponibles directement sur GuixSD, dans @var{%base-firmware} (@pxref{operating-system Reference, @code{firmware}})." - -#. type: cindex -#: doc/guix.texi:8369 -#, no-wrap -msgid "RYF, Respects Your Freedom" -msgstr "RYF, Respects Your Freedom" - -#. type: Plain text -#: doc/guix.texi:8375 -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 "La @uref{https://www.fsf.org/, Free Software Foundation} a un programme de certification nommé @uref{https://www.fsf.org/ryf, @dfn{Respects Your Freedom}} (RYF), pour les produits matériels qui respectent votre liberté et votre vie privée en s'assurant que vous avez le contrôle sur l'appareil. Nous vous encourageons à vérifier la liste des appareils certifiés par RYF." - -#. type: Plain text -#: doc/guix.texi:8379 -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 "Une autre ressource utile est le site web @uref{https://www.h-node.org/, H-Node}. Il contient un catalogue d'appareils avec des informations sur leur support dans GNU/Linux." - -#. type: Plain text -#: doc/guix.texi:8388 -msgid "An ISO-9660 installation image that can be written to a USB stick or burnt to a DVD can be downloaded from @indicateurl{ftp://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{system}.iso.xz}, where @var{system} is one of:" -msgstr "Une image d'installation ISO-9660 téléchargeable depuis @indicateurl{ftp://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{système}.iso.xz} peut être écrite sur une clef USB ou gravée sur un DVD, où @var{système} est l'une de ces valeurs :" - -#. type: table -#: doc/guix.texi:8392 -msgid "for a GNU/Linux system on Intel/AMD-compatible 64-bit CPUs;" -msgstr "pour un système GNU/Linux sur un CPU compatible Intel/AMD 64-bits ;" - -#. type: table -#: doc/guix.texi:8395 -msgid "for a 32-bit GNU/Linux system on Intel-compatible CPUs." -msgstr "pour un système GNU/Linux sur un CPU compatible Intel 32-bits ;" - -#. type: Plain text -#: doc/guix.texi:8400 -msgid "Make sure to download the associated @file{.sig} file and to verify the authenticity of the image against it, along these lines:" -msgstr "Assurez-vous de télécharger les fichiers @file{.sig} associés et de vérifier l'authenticité de l'image avec, de cette manière :" - -#. type: example -#: doc/guix.texi:8404 -#, no-wrap -msgid "" -"$ wget ftp://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{system}.iso.xz.sig\n" -"$ gpg --verify guixsd-install-@value{VERSION}.@var{system}.iso.xz.sig\n" -msgstr "" -"$ wget ftp://alpha.gnu.org/gnu/guix/guixsd-install-@value{VERSION}.@var{système}.iso.xz.sig\n" -"$ gpg --verify guixsd-install-@value{VERSION}.@var{system}.iso.xz.sig\n" - -#. type: Plain text -#: doc/guix.texi:8419 -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 "Cette image contient les outils nécessaires à l'installation. Elle est faite pour être copiée @emph{telle quelle} sur une clef USB assez grosse ou un DVD." - -#. type: unnumberedsubsubsec -#: doc/guix.texi:8420 -#, no-wrap -msgid "Copying to a USB Stick" -msgstr "Copie sur une clef USB" - -#. type: Plain text -#: doc/guix.texi:8423 -msgid "To copy the image to a USB stick, follow these steps:" -msgstr "Pour copier l'image sur une clef USB, suivez ces étapes :" - -#. type: enumerate -#: doc/guix.texi:8427 doc/guix.texi:8452 -msgid "Decompress the image using the @command{xz} command:" -msgstr "Décompressez l'image avec la commande @command{xz} :" - -#. type: example -#: doc/guix.texi:8430 doc/guix.texi:8455 -#, no-wrap -msgid "xz -d guixsd-install-@value{VERSION}.@var{system}.iso.xz\n" -msgstr "xz -d guixsd-install-@value{VERSION}.@var{système}.iso.xz\n" - -#. type: enumerate -#: doc/guix.texi:8436 -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 "Insérez la clef USB de 1@tie{}Gio ou plus dans votre machine et déterminez son nom d'appareil. En supposant que la clef usb est connue sous le nom de @file{/dev/sdX}, copiez l'image avec :" - -#. type: example -#: doc/guix.texi:8440 -#, no-wrap -msgid "" -"dd if=guixsd-install-@value{VERSION}.x86_64-linux.iso of=/dev/sdX\n" -"sync\n" -msgstr "" -"dd if=guixsd-install-@value{VERSION}.x86_64-linux.iso of=/dev/sdX\n" -"sync\n" - -#. type: enumerate -#: doc/guix.texi:8443 -msgid "Access to @file{/dev/sdX} usually requires root privileges." -msgstr "Accéder à @fle{/dev/sdX} requiert généralement les privilèges super-utilisateur." - -#. type: unnumberedsubsubsec -#: doc/guix.texi:8445 -#, no-wrap -msgid "Burning on a DVD" -msgstr "Graver sur un DVD" - -#. type: Plain text -#: doc/guix.texi:8448 -msgid "To copy the image to a DVD, follow these steps:" -msgstr "Pour copier l'image sur un DVD, suivez ces étapes :" - -#. type: enumerate -#: doc/guix.texi:8461 -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 "Insérez un DVD vierge dans votre machine et déterminez son nom d'appareil. En supposant que le DVD soit connu sont le nom de @file{/dev/srX}, copiez l'image avec :" - -#. type: example -#: doc/guix.texi:8464 -#, no-wrap -msgid "growisofs -dvd-compat -Z /dev/srX=guixsd-install-@value{VERSION}.x86_64.iso\n" -msgstr "growisofs -dvd-compat -Z /dev/srX=guixsd-install-@value{VERSION}.x86_64.iso\n" - -#. type: enumerate -#: doc/guix.texi:8467 -msgid "Access to @file{/dev/srX} usually requires root privileges." -msgstr "Accéder à @file{/dev/srX} requiert généralement les privilèges super-utilisateur." - -#. type: unnumberedsubsubsec -#: doc/guix.texi:8469 -#, no-wrap -msgid "Booting" -msgstr "Démarrage" - -#. type: Plain text -#: doc/guix.texi:8474 -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." -msgstr "Une fois que c'est fait, vous devriez pouvoir redémarrer le système et démarrer depuis la clef USB ou le DVD. Pour cela, vous devrez généralement entrer dans le menu de démarrage BIOS ou UEFI, où vous pourrez choisir de démarrer sur la clef USB." - -#. type: Plain text -#: doc/guix.texi:8477 -msgid "@xref{Installing GuixSD in a VM}, if, instead, you would like to install GuixSD in a virtual machine (VM)." -msgstr "@xref{Installing GuixSD in a VM}, si, à la place, vous souhaitez installer GuixSD dans une machine virtuelle (VM)." - -#. type: Plain text -#: doc/guix.texi:8489 -msgid "Once you have successfully booted your computer using the installation medium, you should end up with a root prompt. Several console TTYs are configured and can be used to run commands as root. TTY2 shows this documentation, 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 "Une fois que vous avez démarré votre ordinateur sur le média d'installation, vous devriez vous retrouver sur un prompt en root. Plusieurs TTY sont configurées et peuvent être utilisés pour lancer des commandes en root. Le TTY2 affiche cette documentation, dans la quelle vous pouvez naviguer avec les commandes du lecteur Info (@pxref{Top,,, info-stnd, Stand-alone GNU Info}). Le démon de souris GPM tourne sur le système d'installation, ce qui vous permet de sélectionner du texte avec le bouton gauche de la souris et de le coller en appuyant sur la molette." - -#. type: quotation -#: doc/guix.texi:8494 -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 "L'installation nécessite un accès au réseau pour que les dépendances manquantes de votre configuration système puissent être téléchargées. Voyez la section « réseau » plus bas." - -#. type: Plain text -#: doc/guix.texi:8500 -msgid "The installation system includes many common tools needed for this task. But it is also a full-blown GuixSD system, which means that you can install additional packages, should you need it, using @command{guix package} (@pxref{Invoking guix package})." -msgstr "Le système d'installation inclus plusieurs outils usuels pour requis pour cette tâche. Mais c'est aussi un système GuixSD complet, ce qui signifie que vous pouvez installer des paquets supplémentaires si vous en avez besoin, avec @command{guix package} (@pxref{Invoking guix package})." - -#. type: subsubsection -#: doc/guix.texi:8501 -#, no-wrap -msgid "Keyboard Layout" -msgstr "Disposition du clavier" - -#. type: cindex -#: doc/guix.texi:8503 doc/guix.texi:10593 doc/guix.texi:11931 -#, no-wrap -msgid "keyboard layout" -msgstr "disposition du clavier" - -#. type: Plain text -#: doc/guix.texi:8507 -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 "L'image d'installation utilise la disposition clavier qwerty (US). Si vous voulez la changer, vous pouvez utiliser la commande @command{loadkeys}. Par exemple, la commande suivante sélectionne la disposition Dvorak :" - -#. type: example -#: doc/guix.texi:8510 -#, no-wrap -msgid "loadkeys dvorak\n" -msgstr "loadkeys dvorak\n" - -#. type: Plain text -#: doc/guix.texi:8515 -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 "Consultez les fichiers dans @file{/run/current-system/profile/share/keymaps} pour trouver une liste des dispositions disponibles. Lancez @command{man loadkey} pour plus d'informations." - -#. type: subsubsection -#: doc/guix.texi:8516 -#, no-wrap -msgid "Networking" -msgstr "Réseau" - -#. type: Plain text -#: doc/guix.texi:8519 -msgid "Run the following command see what your network interfaces are called:" -msgstr "Lancez la commande suivante pour voir comment vos interfaces réseau sont appelées :" - -#. type: example -#: doc/guix.texi:8522 -#, no-wrap -msgid "ifconfig -a\n" -msgstr "ifconfig -a\n" - -#. type: Plain text -#: doc/guix.texi:8526 -msgid "@dots{} or, using the GNU/Linux-specific @command{ip} command:" -msgstr "@dots{} ou, avec la commande spécifique à GNU/Linux @command{ip} :" - -#. type: example -#: doc/guix.texi:8529 -#, no-wrap -msgid "ip a\n" -msgstr "ip a\n" - -#. type: Plain text -#: doc/guix.texi:8536 -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 "Les interfaces filaires ont un nom qui commence par @samp{e} ; par exemple, l'interface qui correspond au premier contrôleur Ethernet sur la carte mère est appelé @samp{eno1}. Les interfaces sans-fil ont un nom qui commence par @samp{w}, comme @samp{w1p2s0}." - -#. type: item -#: doc/guix.texi:8538 -#, no-wrap -msgid "Wired connection" -msgstr "Connexion filaire" - -#. type: table -#: doc/guix.texi:8541 -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 "Pour configure une connexion filaire, lancez la commande suivante, en remplaçant @var{interface} par le nom de l'interface filaire que vous voulez utiliser." - -#. type: example -#: doc/guix.texi:8544 -#, no-wrap -msgid "ifconfig @var{interface} up\n" -msgstr "ifconfig @var{interface} up\n" - -#. type: item -#: doc/guix.texi:8546 -#, no-wrap -msgid "Wireless connection" -msgstr "Connexion sans-fil" - -#. type: cindex -#: doc/guix.texi:8547 doc/guix.texi:11008 -#, no-wrap -msgid "wireless" -msgstr "sans-fil" - -#. type: cindex -#: doc/guix.texi:8548 doc/guix.texi:11009 -#, no-wrap -msgid "WiFi" -msgstr "WiFi" - -#. type: table -#: doc/guix.texi:8553 -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 "Pour configurer le réseau sans-fil, vous pouvez créer un fichier de configuration pour l'outil de configuration @command{wpa_supplicant} (son emplacement importe peu) avec l'un des éditeurs de texte disponibles comme @command{nano} :" - -#. type: example -#: doc/guix.texi:8556 -#, no-wrap -msgid "nano wpa_supplicant.conf\n" -msgstr "nano wpa_supplicant.conf\n" - -#. type: table -#: doc/guix.texi:8561 -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 "Par exemple, la déclaration qui suit peut aller dans ce fichier et fonctionnera pour plusieurs réseaux sans-fil, si vous donnez le vrai SSID et la phrase de passe pour le réseau auquel vous vous connectez :" - -#. type: example -#: doc/guix.texi:8568 -#, no-wrap -msgid "" -"network=@{\n" -" ssid=\"@var{my-ssid}\"\n" -" key_mgmt=WPA-PSK\n" -" psk=\"the network's secret passphrase\"\n" -"@}\n" -msgstr "" -"network=@{\n" -" ssid=\"@var{mon-ssid}\"\n" -" key_mgmt=WPA-PSK\n" -" psk=\"la phrase de passe secrète du réseau\"\n" -"@}\n" - -#. type: table -#: doc/guix.texi:8573 -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 "Démarrez le service sans-file et lancez-le en tache de fond avec la commande suivante (en remplaçant @var{interface} par le nom de l'interface réseau que vous voulez utiliser) :" - -#. type: example -#: doc/guix.texi:8576 -#, 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:8579 -msgid "Run @command{man wpa_supplicant} for more information." -msgstr "Lancez @command{man wpa_supplicant} pour plus d'informations." - -#. type: cindex -#: doc/guix.texi:8581 -#, no-wrap -msgid "DHCP" -msgstr "DHCP" - -#. type: Plain text -#: doc/guix.texi:8584 -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 "À partir de ce moment, vous avez besoin d'une adresse IP. Sur les réseaux où les IP sont automatiquement attribuée par DHCP, vous pouvez lancer :" - -#. type: example -#: doc/guix.texi:8587 -#, no-wrap -msgid "dhclient -v @var{interface}\n" -msgstr "dhclient -v @var{interface}\n" - -#. type: Plain text -#: doc/guix.texi:8590 -msgid "Try to ping a server to see if networking is up and running:" -msgstr "Essayez de pinger un serveur pour voir si le réseau fonctionne :" - -#. type: example -#: doc/guix.texi:8593 -#, no-wrap -msgid "ping -c 3 gnu.org\n" -msgstr "ping -c 3 gnu.org\n" - -#. type: Plain text -#: doc/guix.texi:8597 -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 "Mettre en place un accès réseau est presque toujours une nécessité parce que l'image ne contient pas tous les logiciels et les outils dont vous pourriez avoir besoin." - -#. type: cindex -#: doc/guix.texi:8598 -#, no-wrap -msgid "installing over SSH" -msgstr "installer par SSH" - -#. type: Plain text -#: doc/guix.texi:8601 -msgid "If you want to, you can continue the installation remotely by starting an SSH server:" -msgstr "Si vous le souhaitez, vous pouvez continuer l'installation à distance en démarrant un serveur SSH :" - -#. type: example -#: doc/guix.texi:8604 -#, no-wrap -msgid "herd start ssh-daemon\n" -msgstr "herd start ssh-daemon\n" - -#. type: Plain text -#: doc/guix.texi:8608 -msgid "Make sure to either set a password with @command{passwd}, or configure OpenSSH public key authentication before logging in." -msgstr "Assurez-vous soit de définir un mot de passe avec @command{passwd}, soit de configurer l'authentification par clef OpenSSH avant de vous connecter." - -#. type: subsubsection -#: doc/guix.texi:8609 -#, no-wrap -msgid "Disk Partitioning" -msgstr "Partitionnement" - -#. type: Plain text -#: doc/guix.texi:8613 -msgid "Unless this has already been done, the next step is to partition, and then format the target partition(s)." -msgstr "À moins que vous ne l'ayez déjà fait, l'étape suivante consiste à partitionner le disque puis à formater les partitions cibles." - -#. type: Plain text -#: doc/guix.texi:8618 -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 "L'image d'installation inclus plusieurs outils de partitionnement, dont Parted (@pxref{Overview,,, parted, GNU Parted User Manual}), @command{fdisk}, et @command{cfdisk}. Lancez-en un et paramétrez votre disque avec le partitionnement qui vous convient :" - -#. type: example -#: doc/guix.texi:8621 -#, no-wrap -msgid "cfdisk\n" -msgstr "cfdisk\n" - -#. type: Plain text -#: doc/guix.texi:8627 -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 "Si votre disque utilise le format des tables de partitions GUID (GPT) et que vous souhaitez installer un GRUB pour système BIOS (c'est le cas par défaut), assurez-vous de créer qu'une partition de démarrage BIOS soit bien disponible (@pxref{BIOS installation,,, grub, GNU GRUB manual})." - -#. type: cindex -#: doc/guix.texi:8628 -#, no-wrap -msgid "EFI, installation" -msgstr "EFI, installation" - -#. type: cindex -#: doc/guix.texi:8629 -#, no-wrap -msgid "UEFI, installation" -msgstr "UEFI, installation" - -#. type: cindex -#: doc/guix.texi:8630 -#, no-wrap -msgid "ESP, EFI system partition" -msgstr "ESP, partition système EFI" - -#. type: Plain text -#: doc/guix.texi:8634 -msgid "If you instead wish to use EFI-based GRUB, a FAT32 @dfn{EFI System Partition} (ESP) is required. This partition should be mounted at @file{/boot/efi} and must have the @code{esp} flag set. E.g., for @command{parted}:" -msgstr "Si vous souhaitez à la place utilise GRUB pour système EFI, vous devrez avoir une @dfn{partition système EFI} (ESP) en FAT32. Cette partition devrait être montée dans @file{/boot/efi} et doit avoir le drapeau @code{esp}. P.@: ex.@: pour @command{parted} :" - -#. type: example -#: doc/guix.texi:8637 -#, no-wrap -msgid "parted /dev/sda set 1 esp on\n" -msgstr "parted /dev/sda set 1 esp on\n" - -#. type: Plain text -#: doc/guix.texi:8645 -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 GuixSD 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/sda2}, run:" -msgstr "Une fois que vous avez fini le partitionnement du disque dur cible, vous devez créer un système de fichier sur les partitions@footnote{Actuellement GuixSD ne supporte que les systèmes de fichiers ext4 et btrfs. En particulier, le code qui lit les UUID des systèmes de fichiers et les étiquettes ne fonctionne que pour ces types de systèmes de fichiers.}. Pour l'ESP, si vous en avez une et en supposant que ce soit @file{/dev/sda2}, lancez :" - -#. type: example -#: doc/guix.texi:8648 -#, no-wrap -msgid "mkfs.fat -F32 /dev/sda2\n" -msgstr "mkfs.fat -F32 /dev/sda2\n" - -#. type: Plain text -#: doc/guix.texi:8656 -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/sda1}, a file system with the label @code{my-root} can be created with:" -msgstr "Préférez assigner une étiquette au système de fichier pour que vous puissiez facilement vous y référer dans la déclaration @code{file-system} (@pxref{File Systems}). On le fait habituellement avec l'option @code{-L} de @command{mkfs.ext4} et des commandes liées. Donc, en supposant que la partition racine soit @file{/dev/sda1}, on peut créer un système de fichier avec pour étiquette @code{my-root} avec :" - -#. type: example -#: doc/guix.texi:8659 -#, no-wrap -msgid "mkfs.ext4 -L my-root /dev/sda1\n" -msgstr "mkfs.ext4 -L my-root /dev/sda1\n" - -#. type: cindex -#: doc/guix.texi:8661 doc/guix.texi:9066 -#, no-wrap -msgid "encrypted disk" -msgstr "chiffrement du disque" - -#. type: Plain text -#: doc/guix.texi:8668 -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/sda1}, the command sequence would be along these lines:" -msgstr "Si vous voulez plutôt chiffrer la partition racine, vous pouvez utiliser les utilitaires Cryptsetup et LUKS pour cela (voir @inlinefmtifelse{html, @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, @code{man cryptsetup}} pour plus d'informations). En supposant que vous voulez stocker la partition racine sur @fiel{/dev/sda1}, la séquence de commandes suivante vous mènerait à ce résultat :" - -#. type: example -#: doc/guix.texi:8673 -#, no-wrap -msgid "" -"cryptsetup luksFormat /dev/sda1\n" -"cryptsetup open --type luks /dev/sda1 my-partition\n" -"mkfs.ext4 -L my-root /dev/mapper/my-partition\n" -msgstr "" -"cryptsetup luksFormat /dev/sda1\n" -"cryptsetup open --type luks /dev/sda1 my-partition\n" -"mkfs.ext4 -L my-root /dev/mapper/my-partition\n" - -#. type: Plain text -#: doc/guix.texi:8678 -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 "Une fois cela effectué, montez le système de fichier cible dans @file{/mnt} avec une commande comme (de nouveau, en supposant que @code{my-root} est l'étiquette du système de fichiers racine) :" - -#. type: example -#: doc/guix.texi:8681 -#, no-wrap -msgid "mount LABEL=my-root /mnt\n" -msgstr "mount LABEL=my-root /mnt\n" - -#. type: Plain text -#: doc/guix.texi:8687 -msgid "Also mount any other file systems you would like to use on the target system relative to this path. If you have @file{/boot} on a separate partition for example, mount it at @file{/mnt/boot} now so it is found by @code{guix system init} afterwards." -msgstr "Montez aussi tous les systèmes de fichiers que vous voudriez utiliser sur le système cible relativement à ce chemin. Si vous avez un @file{/boot} sur une partition séparé par exemple, montez-le sur @file{/mnt/boot} maintenant pour qu'il puisse être trouvé par @code{guix system init} ensuite." - -#. type: Plain text -#: doc/guix.texi:8692 -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/sda2}, you would run:" -msgstr "Enfin, si vous souhaitez utilise une ou plusieurs partitions de swap (@pxref{Memory Concepts, swap space,, libc, The GNU C Library Reference Manual}), assurez-vous de les initialiser avec @command{mkswap}. En supposant que vous avez une partition de swap sur @file{/dev/sda2}, vous pouvez lancer :" - -#. type: example -#: doc/guix.texi:8696 -#, no-wrap -msgid "" -"mkswap /dev/sda2\n" -"swapon /dev/sda2\n" -msgstr "" -"mkswap /dev/sda2\n" -"swapon /dev/sda2\n" +#: guix/scripts/gc.scm:87 +#, scheme-format +msgid "~a: invalid '--verify' option~%" +msgstr "~a : option « --verify » invalide~%" -#. type: Plain text -#: doc/guix.texi:8704 -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 "Autrement, vous pouvez utiliser un fichier de swap. Par exemple, en supposant que dans le nouveau système vous voulez utiliser le fichier @file{/swapfile} comme fichier de swap, vous lanceriez@footnote{Cet exemple fonctionnera sur plusieurs types de systèmes de fichiers (p.@: ex.@: ext4). Cependant, pour les systèmes de fichiers qui utilisent la copie sur écriture (COW) comme btrfs, les étapes requises peuvent varier. Pour plus de détails, regardez les pages de manuel de @command{mkswap} et @command{swapon}.} :" +#: guix/scripts/gc.scm:117 +#, scheme-format +msgid "invalid amount of storage: ~a~%" +msgstr "quantité de stockage non valide : ~a~%" -#. type: example -#: doc/guix.texi:8712 -#, no-wrap -msgid "" -"# This is 10 GiB of swap space. Adjust \"count\" to change the size.\n" -"dd if=/dev/zero of=/mnt/swapfile bs=1MiB count=10240\n" -"# For security, make the file readable and writable only by root.\n" -"chmod 600 /mnt/swapfile\n" -"mkswap /mnt/swapfile\n" -"swapon /mnt/swapfile\n" -msgstr "" -"# Cela représente 10 Gio d'espace d'échange. Ajustez « count » pour changer la taille.\n" -"dd if=/dev/zero of=/mnt/swapfile bs=1MiB count=10240\n" -"# Par sécurité, laissez le fichier en lecture et en écriture uniquement pour root.\n" -"chmod 600 /mnt/swapfile\n" -"mkswap /mnt/swapfile\n" -"swapon /mnt/swapfile\n" - -#. type: Plain text -#: doc/guix.texi:8717 -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 "Remarquez que si vous avez chiffré la partition racine et créé un fichier d'échange dans son système de fichier comme décrit ci-dessus, alors le chiffrement protégera aussi le fichier d'échange, comme n'importe quel fichier de ce système de fichiers." - -#. type: Plain text -#: doc/guix.texi:8723 -msgid "With the target partitions ready and the target root mounted on @file{/mnt}, we're ready to go. First, run:" -msgstr "Lorsque la partition cible est prête et que les autres partitions sont montées, on est prêt à commencer l'installation. Commencez par :" - -#. type: example -#: doc/guix.texi:8726 -#, no-wrap -msgid "herd start cow-store /mnt\n" -msgstr "herd start cow-store /mnt\n" - -#. type: Plain text -#: doc/guix.texi:8733 -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 "Cela rend @file{/gnu/store} capable de faire de la copie sur écriture, de sorte que les paquets ajoutés pendant l'installation sont écrits sur le disque cible sur @file{/mnt} plutôt que gardés en mémoire. Cela est nécessaire parce que la première phase de la commande @commad{guix system init} (voir plus bas) implique de télécharger ou de construire des éléments de @file{/gnu/store} qui est initialement un système de fichiers en mémoire." - -#. type: Plain text -#: doc/guix.texi:8744 -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 "Ensuite, vous devrez modifier un fichier et fournir la déclaration du système à installer. Pour cela, le système d'installation propose trois éditeurs de texte. Nous recommandons GNU nano (@pxref{Top,,, nano, GNU nano Manual}), qui supporte la coloration syntaxique la correspondance de parenthèses ; les autres éditeurs sont GNU Zile (un clone d'Emacs) et nvi (un clone de l'éditeur @command{vi} original de BSD). Nous recommandons vivement de stocker ce fichier sur le système de fichier racine cible, disons en tant que @file{/mnt/etc/config.scm}. Sinon, vous perdrez votre fichier de configuration une fois que vous aurez redémarré sur votre nouveau système." - -#. type: Plain text -#: doc/guix.texi:8751 -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}, pour un aperçu de comment créer votre fichier de configuration. Les exemples de configuration dont on parle dans cette section sont disponibles dans @file{/etc/configuration} sur l'image d'installation. Ainsi, pour commencer avec une configuration du système qui fournit un serveur d'affichage graphique (un système de « bureau »), vous pouvez lancer ce qui suit :" - -#. type: example -#: doc/guix.texi:8756 -#, no-wrap -msgid "" -"# mkdir /mnt/etc\n" -"# cp /etc/configuration/desktop.scm /mnt/etc/config.scm\n" -"# nano /mnt/etc/config.scm\n" -msgstr "" -"# mkdir /mnt/etc\n" -"# cp /etc/configuration/desktop.scm /mnt/etc/config.scm\n" -"# nano /mnt/etc/config.scm\n" - -#. type: Plain text -#: doc/guix.texi:8760 -msgid "You should pay attention to what your configuration file contains, and in particular:" -msgstr "Vous devriez faire attention à ce que contient votre fichier de configuration, en particulier :" - -#. type: itemize -#: doc/guix.texi:8770 -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}, and do make sure the path is actually mounted." -msgstr "Assurez-vous que la forme @code{bootloader-configuration} se réfère à la cible où vous voulez installer GRUB. Elle devrait aussi mentionner @code{grub-bootloader} si vous installer GRUB en mode BIOS (ou « legacy ») ou @code{grub-efi-bootloader} pour les système UEFI plus récents. Pour les anciens systèmes, le champs @code{target} contient un périphérique comme @code{/dev/sda} ; pour les systèmes UEFI il contient un chemin vers une partition EFI montée, comme @code{/boot/efi}, et assurez-vous que ce chemin est bien monté." - -#. type: itemize -#: doc/guix.texi:8776 -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 sets the value of @code{title} to @code{'label}." -msgstr "Assurez-vous que les étiquettes de vos systèmes de fichiers correspondent aux valeurs de leur champs @code{device} dans votre configuration @code{file-system}, en supposant que la configuration @code{file-system} utilise la valeur @code{'label} dans le champ @code{title}." - -#. type: itemize -#: doc/guix.texi:8780 -msgid "If there are encrypted or RAID partitions, make sure to add a @code{mapped-devices} field to describe them (@pxref{Mapped Devices})." -msgstr "Si vous avez des partitions RAID ou chiffrées, assurez-vous d'ajouter un champ @code{mapped-device} pour les décrire (@pxref{Mapped Devices})." - -#. type: Plain text -#: doc/guix.texi:8785 -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 "Une fois que vous avez fini les préparatifs sur le fichier de configuration, le nouveau système peut être initialisé (rappelez-vous que le système de fichiers racine cible est dans @file{/mnt}) :" - -#. type: example -#: doc/guix.texi:8788 -#, 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:8795 -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 "Cela copie tous les fichiers nécessaires et installe GRUB sur @file{/dev/sdX} à moins que vous ne passiez l'option @option{--no-bootloader}. Pour plus d'informations, @pxref{Invoking guix system}. Cette commande peut engendrer des téléchargements ou des constructions pour les paquets manquants, ce qui peut prendre du temps." - -#. type: Plain text -#: doc/guix.texi:8802 -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})." -msgstr "Une fois que cette commande a terminée — et on l'espère réussi ! — vous pouvez lancer @command{reboot} et démarrer sur votre nouveau système. Le mot de passe @code{root} est d'abord vide ; les mots de passe des autres utilisateurs doivent être initialisés avec la commande @command{passwd} en tant que @code{root}, à mois que votre configuration ne spécifie autre chose (@pxref{user-account-password, mot de passe des comptes utilisateurs})." - -#. type: cindex -#: doc/guix.texi:8803 -#, no-wrap -msgid "upgrading GuixSD" -msgstr "mettre à jour GuixSD" - -#. type: Plain text -#: doc/guix.texi:8810 -msgid "From then on, you can update GuixSD whenever you want by running @command{guix pull} as @code{root} (@pxref{Invoking guix pull}), and then running @command{guix system reconfigure} to build 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 "À partir de maintenant, vous pouvez mettre à jour GuixSD lorsque vous le souhaitez en lançant @command{guix pull} en tant que @code{root} (@pxref{Invoking guix pull}), puis en lançant @command{guix system reconfigure} pour construire une nouvelle génération du système avec les derniers paquets et les derniers services (@pxref{Invoking guix system}). Nous vous recommandons de le faire régulièrement pour que votre système inclus les dernières mises à jour de sécurité (@pxref{Security Updates})." - -#. type: Plain text -#: doc/guix.texi:8814 -msgid "Join us on @code{#guix} on the Freenode IRC network or on @file{guix-devel@@gnu.org} to share your experience---good or not so good." -msgstr "Rejoignez-nous sur @code{#guix} sur le réseau IRC Freenode ou sur @file{guix-devel@@gnu.org} pour partager votre expérience — bonne ou mauvaise." - -#. type: subsection -#: doc/guix.texi:8816 -#, no-wrap -msgid "Installing GuixSD in a Virtual Machine" -msgstr "Installer GuixSD sur une machine virtuelle" - -#. type: cindex -#: doc/guix.texi:8818 -#, no-wrap -msgid "virtual machine, GuixSD installation" -msgstr "machine virtuelle, installation de GuixSD" - -#. type: cindex -#: doc/guix.texi:8819 -#, no-wrap -msgid "virtual private server (VPS)" -msgstr "serveur privé virtuel (VPS)" - -#. type: cindex -#: doc/guix.texi:8820 -#, no-wrap -msgid "VPS (virtual private server)" -msgstr "VPS (serveur privé virtuel)" - -#. type: Plain text -#: doc/guix.texi:8824 -msgid "If you'd like to install GuixSD in a virtual machine (VM) or on a virtual private server (VPS) rather than on your beloved machine, this section is for you." -msgstr "Si vous souhaitez installer GuixSD sur une machine virtuelle (VM) ou un serveur privé virtuel (VPS) plutôt que sur votre machine chérie, cette section est faite pour vous." - -#. type: Plain text -#: doc/guix.texi:8827 -msgid "To boot a @uref{http://qemu.org/,QEMU} VM for installing GuixSD in a disk image, follow these steps:" -msgstr "Pour démarrer une VM @uref{http://qemu.org/,QEMU} pour installer GuixSD sur une image disque, suivez ces étapes :" - -#. type: enumerate -#: doc/guix.texi:8832 -msgid "First, retrieve and decompress the GuixSD installation image as described previously (@pxref{USB Stick and DVD Installation})." -msgstr "Tout d'abord récupérez et décompressez l'image d'installation de GuixSD comme décrit précédemment (@pxref{USB Stick and DVD Installation})." - -#. type: enumerate -#: doc/guix.texi:8836 -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 "Créez une image disque qui contiendra le système installé. Pour créer une image qcow2, utilise la commande @command{qemu-img} :" - -#. type: example -#: doc/guix.texi:8839 -#, no-wrap -msgid "qemu-img create -f qcow2 guixsd.img 50G\n" -msgstr "qemu-img create -f qcow2 guixsd.img 50G\n" - -#. type: enumerate -#: doc/guix.texi:8843 -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 "Le fichier qui en résulte sera bien plus petit que les 50 Go (habituellement moins de 1 Mo) mais il grossira au fur et à mesure que le stockage virtuel grossira." - -#. type: enumerate -#: doc/guix.texi:8846 -msgid "Boot the USB installation image in an VM:" -msgstr "Démarrez l'image d'installation USB dans une VM :" - -#. type: example -#: doc/guix.texi:8852 -#, no-wrap -msgid "" -"qemu-system-x86_64 -m 1024 -smp 1 \\\n" -" -net user -net nic,model=virtio -boot menu=on \\\n" -" -drive file=guixsd-install-@value{VERSION}.@var{system}.iso \\\n" -" -drive file=guixsd.img\n" -msgstr "" -"qemu-system-x86_64 -m 1024 -smp 1 \\\n" -" -net user -net nic,model=virtio -boot menu=on \\\n" -" -drive file=guixsd-install-@value{VERSION}.@var{system}.iso \\\n" -" -drive file=guixsd.img\n" - -#. type: enumerate -#: doc/guix.texi:8855 -msgid "The ordering of the drives matters." -msgstr "L'ordre des périphérique est important" - -#. type: enumerate -#: doc/guix.texi:8859 -msgid "In the VM console, quickly press the @kbd{F12} key to enter the boot menu. Then press the @kbd{2} key and the @kbd{RET} key to validate your selection." -msgstr "Dans la console de la VM, appuyez rapidement sur @kbd{F12} pour entrer dans le menu de démarrage. Ensuite appuyez sur @kbd{2} et la touche @kbd{Entrée} pour valider votre choix." - -#. type: enumerate -#: doc/guix.texi:8863 -msgid "You're now root in the VM, proceed with the installation process. @xref{Preparing for Installation}, and follow the instructions." -msgstr "Vous êtes maintenant root dans la VM, continuez en suivant la procédure d'installation. @xref{Preparing for Installation}, et suivez les instructions." - -#. type: Plain text -#: doc/guix.texi:8868 -msgid "Once installation is complete, you can boot the system that's on your @file{guixsd.img} image. @xref{Running GuixSD in a VM}, for how to do that." -msgstr "Une fois l'installation terminée, vous pouvez démarrer le système dans votre image @file{guixsd.img}. @xref{Running GuixSD in a VM}, pour une manière de faire." - -#. type: cindex -#: doc/guix.texi:8872 -#, no-wrap -msgid "installation image" -msgstr "image d'installation" - -#. type: Plain text -#: doc/guix.texi:8875 -msgid "The installation image described above was built using the @command{guix system} command, specifically:" -msgstr "L'image d'installation décrite plus haut a été construite avec la commande @command{guix system}, plus précisément :" - -#. type: example -#: doc/guix.texi:8878 -#, no-wrap -msgid "guix system disk-image gnu/system/install.scm\n" -msgstr "guix system disk-image gnu/system/install.scm\n" - -#. type: Plain text -#: doc/guix.texi:8883 -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 "Regardez le fichier @file{gnu/system/install.scm} dans l'arborescence des sources et regardez aussi @ref{Invoking guix system} pour plus d'informations sur l'image d'installation." - -#. type: subsection -#: doc/guix.texi:8884 -#, no-wrap -msgid "Building the Installation Image for ARM Boards" -msgstr "Construire l'image d'installation pour les cartes ARM" - -#. type: Plain text -#: doc/guix.texi:8888 -msgid "Many ARM boards require a specific variant of the @uref{http://www.denx.de/wiki/U-Boot/, U-Boot} bootloader." -msgstr "De nombreuses cartes ARM requièrent une variante spécifique du chargeur d'amorçage @uref{http://www.denx.de/wiki/U-Boot/, U-Boot}." - -#. type: Plain text -#: doc/guix.texi:8892 -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 "Si vous construisez une image disque et que le chargeur d'amorçage n'est pas disponible autrement (sur un autre périphérique d'amorçage etc), il est recommandé de construire une image qui inclus le chargeur d'amorçage, plus précisément :" - -#. type: example -#: doc/guix.texi:8895 -#, 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:8899 -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} est le nom de la carte. Si vous spécifiez une carte invalide, une liste de cartes possibles sera affichée." - -#. type: cindex -#: doc/guix.texi:8903 -#, no-wrap -msgid "system configuration" -msgstr "configuration du système" - -#. type: Plain text -#: doc/guix.texi:8909 -msgid "The Guix System Distribution 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 "La distribution système Guix utilise un mécanisme de configuration du système cohérent. On veut dire par là que tous les aspects de la configuration globale du système — comme la disponibilité des services système, des fuseaux horaires, des paramètres linguistiques, des comptes utilisateurs — sont déclarés à un seul endroit. Une telle @dfn{configuration système} peut être @dfn{instanciée}, c'est-à-dire entrer en vigueur." - -#. type: Plain text -#: doc/guix.texi:8919 -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 "L'un des avantages de placer toute la configuration du système sous le contrôle de Guix est de permettre les mises à jour transactionnelles du système ce qui rend possible le fait de revenir en arrière à une instanciation précédent du système, si quelque chose se passait mal avec le nouveau (@pxref{Features}). Un autre avantage est de rendre facile la réplication de la même configuration sur plusieurs machines différentes ou à différents moments dans le temps, sans avoir à recourir à des outils d'administrations supplémentaires au-dessus des outils du système." - -#. type: Plain text -#: doc/guix.texi:8924 -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 "Cette section décrit ce mécanisme. Tout d'abord nous nous concentrons sur le point de vue de l'administrateur système en expliquant comment le système est configuré et instancié. Ensuite nous montrons comment ce mécanisme peut être étendu, par exemple pour supporter de nouveaux services systèmes." - -#. type: Plain text -#: doc/guix.texi:8951 -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 "Le système d'exploitation est configuré en fournissant une déclaration @code{operating-system} dans un fichier qui peut être passé à la command @command{guix system} (@pxref{Invoking guix system}). Une configuration simple, avec les services systèmes par défaut, le noyau Linux-Libre par défaut, un disque de RAM initial et un chargeur d'amorçage ressemble à ceci :" - -#. type: findex -#: doc/guix.texi:8952 -#, no-wrap -msgid "operating-system" -msgstr "operating-system" - -#. type: include -#: doc/guix.texi:8954 -#, no-wrap -msgid "os-config-bare-bones.texi" -msgstr "os-config-bare-bones.texi" - -#. type: Plain text -#: doc/guix.texi:8961 -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 "Cet exemple devrait se comprendre de lui-même. Certains champs définis ci-dessus, comme @code{host-name} et @code{bootloader} sont obligatoires. D'autres comme @code{packages} et @code{services} peuvent être omis auquel cas ils ont une valeur par défaut." - -#. type: Plain text -#: doc/guix.texi:8966 -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 "Ci-dessous nous discutons des effets de certains des champs les plus importants (@pxref{operating-system Reference}, pour des détails sur tous les champs disponibles) et comment @dfn{instancier} le système d'exploitation avec @command{guix system}." - -#. type: unnumberedsubsubsec -#: doc/guix.texi:8967 -#, no-wrap -msgid "Globally-Visible Packages" -msgstr "Paquets visibles sur tout le système" - -#. type: vindex -#: doc/guix.texi:8969 -#, no-wrap -msgid "%base-packages" -msgstr "%base-packages" - -#. type: Plain text -#: doc/guix.texi:8982 -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 @var{%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 and OpenSSH to those, taken from the @code{(gnu packages screen)} and @code{(gnu packages ssh)} modules (@pxref{Package Modules}). The @code{(list package output)} syntax can be used to add a specific output of a package:" -msgstr "Le champ @code{packages} liste les paquets qui seront visibles sur tout le système, pour tous les comptes utilisateurs — c.-à-d.@: dans la variable d'environnement @code{PATH} de tous les utilisateurs — en plus des paquets par profil (@pxref{Invoking guix package}). La variable @var{%base-packages} fournit tous les outils qu'on pourrait attendre pour les taches de base de l'administrateur et de l'utilisateur — dont les GNU Core Utilities, les GNU Networking Utilities, l'éditeur de texte léger GNU Zile, @command{find}, @command{grep}, etc. L'exemple au-dessus ajout GNU@tie{}Screen et OpenSSH à ces paquets, récupérés depuis les modules @code{(gnu packages screen)} et @code{(gnu packages ssh)} (@pxref{Package Modules}). La syntaxe @code{(list paquet sortie)} peut être utilisée pour ajouter une sortie spécifique d'un paquet :" - -#. type: lisp -#: doc/guix.texi:8986 -#, no-wrap +#: guix/scripts/gc.scm:202 +msgid "already ~h bytes available on ~a, nothing to do~%" +msgstr "déjà ~h octets disponibles sur ~a, rien à faire~%" + +#: guix/scripts/gc.scm:205 +msgid "freeing ~h bytes~%" +msgstr "libération de ~h octets~%" + +#: guix/scripts/gc.scm:217 +#, scheme-format +msgid "extraneous arguments: ~{~a ~}~%" +msgstr "arguments superflus : ~{~a ~}~%" + +#: guix/scripts/gc.scm:237 guix/scripts/gc.scm:240 +msgid "freed ~h bytes~%" +msgstr "~h octets libérés~%" + +#: guix/scripts/hash.scm:47 msgid "" -"(use-modules (gnu packages))\n" -"(use-modules (gnu packages dns))\n" +"Usage: guix hash [OPTION] FILE\n" +"Return the cryptographic hash of FILE.\n" "\n" +"Supported formats: 'nix-base32' (default), 'base32', and 'base16' ('hex'\n" +"and 'hexadecimal' can be used as well).\n" msgstr "" -"(use-modules (gnu packages))\n" -"(use-modules (gnu packages dns))\n" +"Usage : guix hash [OPTION] FICHIER\n" +"Retourner l'empreinte cryptographique du FICHIER.\n" "\n" +"Formats supportés: « nix-base32 » (par défaut), « base32 », et « base16 » (« hex »\n" +"et « hexadecimal » peuvent également être utilisés).\n" -#. type: lisp -#: doc/guix.texi:8991 -#, no-wrap +#: guix/scripts/hash.scm:52 msgid "" -"(operating-system\n" -" ;; ...\n" -" (packages (cons (list bind \"utils\")\n" -" %base-packages)))\n" -msgstr "" -"(operating-system\n" -" ;; ...\n" -" (packages (cons (list bind \"utils\")\n" -" %base-packages)))\n" - -#. type: findex -#: doc/guix.texi:8993 -#, no-wrap -msgid "specification->package" -msgstr "specification->package" - -#. type: Plain text -#: doc/guix.texi:9002 -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 "Se référer aux paquets par le nom de leur variable, comme @code{bind} ci-dessus, a l'avantage d'être sans ambiguïté ; cela permet aussi de se rendre rapidement compte de coquilles quand on a des « variables non liées ». L'inconvénient est qu'on a besoin de savoir dans quel module est défini le paquet, et de modifier la ligne @code{use-package-modules} en conséquence. Pour éviter cela, on peut utiliser la procédure @code{specification->package} du module @code{(gnu packages)}, qui renvoie le meilleur paquet pour un nom donné ou un nom et une version :" - -#. type: lisp -#: doc/guix.texi:9005 -#, no-wrap -msgid "" -"(use-modules (gnu packages))\n" "\n" +" -x, --exclude-vcs exclude version control directories" msgstr "" -"(use-modules (gnu packages))\n" "\n" +" -x, --exclude-vcs exclure les répertoires de contrôle de versions" -#. type: lisp -#: doc/guix.texi:9011 -#, no-wrap -msgid "" -"(operating-system\n" -" ;; ...\n" -" (packages (append (map specification->package\n" -" '(\"tcpdump\" \"htop\" \"gnupg@@2.0\"))\n" -" %base-packages)))\n" -msgstr "" -"(operating-system\n" -" ;; ...\n" -" (packages (append (map specification->package\n" -" '(\"tcpdump\" \"htop\" \"gnupg@@2.0\"))\n" -" %base-packages)))\n" - -#. type: unnumberedsubsubsec -#: doc/guix.texi:9013 -#, no-wrap -msgid "System Services" -msgstr "Services systèmes" - -#. type: cindex -#: doc/guix.texi:9015 doc/guix.texi:20417 doc/guix.texi:21335 -#, no-wrap -msgid "services" -msgstr "services" - -#. type: vindex -#: doc/guix.texi:9016 -#, no-wrap -msgid "%base-services" -msgstr "%base-services" - -#. type: Plain text -#: doc/guix.texi:9026 -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 @command{lshd} secure shell daemon listening on port 2222 (@pxref{Networking Services, @code{lsh-service}}). Under the hood, @code{lsh-service} arranges so that @code{lshd} is started with the right command-line options, possibly with supporting configuration files generated as needed (@pxref{Defining Services})." -msgstr "Le champ @code{services} liste les @dfn{services système} à rendre disponible lorsque le système démarre (@pxref{Services}). La déclaration @code{operating-system} au-dessus spécifie que, en plus des services de base, on veut que le démon ssh @command{lshd} écoute sur le port 2222 (@pxref{Networking Services, @code{lsh-service}}). Sous le capot, @code{lsh-service} s'arrange pour que @code{lshd} soit lancé avec les bonnes options de la ligne de commande, éventuellement en générant des fichiers de configuration (@pxref{Defining Services})." - -#. type: cindex -#: doc/guix.texi:9027 -#, no-wrap -msgid "customization, of services" -msgstr "personnalisation des services" - -#. type: findex -#: doc/guix.texi:9028 -#, no-wrap -msgid "modify-services" -msgstr "modify-services" - -#. type: Plain text -#: doc/guix.texi:9032 -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 "Parfois, plutôt que d'utiliser les services de base tels-quels, on peut vouloir les personnaliser. Pour cela, utilisez @code{modify-services} (@pxref{Service Reference, @code{modify-services}}) pour modifier la liste." - -#. type: Plain text -#: doc/guix.texi:9037 -msgid "For example, suppose you want to modify @code{guix-daemon} and Mingetty (the console log-in) in the @var{%base-services} list (@pxref{Base Services, @code{%base-services}}). To do that, you can write the following in your operating system declaration:" -msgstr "Par exemple, supposons que vous souhaitiez modifier @code{guix-daemon} et Mingetty (l'écran de connexion en console) dans la liste @var{%base-services} (@pxref{Base Services, @code{%base-services}}). Pour cela, vous pouvez écrire ce qui suit dans votre déclaration de système d'exploitation :" - -#. type: lisp -#: doc/guix.texi:9050 -#, no-wrap -msgid "" -"(define %my-services\n" -" ;; My very own list of services.\n" -" (modify-services %base-services\n" -" (guix-service-type config =>\n" -" (guix-configuration\n" -" (inherit config)\n" -" (use-substitutes? #f)\n" -" (extra-options '(\"--gc-keep-derivations\"))))\n" -" (mingetty-service-type config =>\n" -" (mingetty-configuration\n" -" (inherit config)))))\n" -"\n" -msgstr "" -"(define %my-services\n" -" ;; Ma propre liste de services.\n" -" (modify-services %base-services\n" -" (guix-service-type config =>\n" -" (guix-configuration\n" -" (inherit config)\n" -" (use-substitutes? #f)\n" -" (extra-options '(\"--gc-keep-derivations\"))))\n" -" (mingetty-service-type config =>\n" -" (mingetty-configuration\n" -" (inherit config)))))\n" - -#. type: lisp -#: doc/guix.texi:9054 -#, no-wrap -msgid "" -"(operating-system\n" -" ;; @dots{}\n" -" (services %my-services))\n" -msgstr "" -"(operating-system\n" -" ;; @dots{}\n" -" (services %my-services))\n" - -#. type: Plain text -#: doc/guix.texi:9065 -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 @var{%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 "Cela modifie la configuration — c.-à-d.@: les paramètres du service — de l'instance de @code{guix-service-type}, et de toutes les instances de @code{mingetty-service-type} dans la liste @var{%base-services}. Remarquez comment on fait cela : d'abord, on s'arrange pour que la configuration de départ soit liée à l'identifiant @code{config} dans @var{body} puis on écrit @var{body} pour qu'il s'évalue en la configuration désirée. En particulier, remarquez comment on utilise @code{inherit} pour créer une nouvelle configuration qui a les même valeurs que l'ancienne configuration, avec seulement quelques modifications." - -#. type: Plain text -#: doc/guix.texi:9072 -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 "La configuration pour une utilisation de « bureau » typique, avec une partition racine chiffrée, le serveur d'affichage X11, GNOME et Xfce (les utilisateurs peuvent choisir l'environnement de bureau sur l'écran de connexion en appuyant sur @kbd{F1}), la gestion du réseau, la gestion de l'énergie, et bien plus, ressemblerait à ceci :" - -#. type: include -#: doc/guix.texi:9074 -#, no-wrap -msgid "os-config-desktop.texi" -msgstr "os-config-desktop.texi" - -#. type: cindex -#: doc/guix.texi:9077 -#, no-wrap -msgid "UEFI" -msgstr "UEFI" - -#. type: Plain text -#: doc/guix.texi:9080 -msgid "A graphical UEFI system with a choice of lightweight window managers instead of full-blown desktop environments would look like this:" -msgstr "Un système UEFI graphique avec un panel de gestionnaires de fenêtres légers plutôt que des environnements de bureaux complets ressemblerait à ceci :" - -#. type: include -#: doc/guix.texi:9082 -#, no-wrap -msgid "os-config-lightweight-desktop.texi" -msgstr "os-config-lightweight-desktop.texi" - -#. type: Plain text -#: doc/guix.texi:9088 -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 "Cet exemple se réfère au système de fichier @file{/boot/efi} par son UUID, @code{1234-ABCD}. Remplacez cet UUID par le bon UUID de votre système, renvoyé par la commande @command{blkid}." - -#. type: Plain text -#: doc/guix.texi:9092 -msgid "@xref{Desktop Services}, for the exact list of services provided by @var{%desktop-services}. @xref{X.509 Certificates}, for background information about the @code{nss-certs} package that is used here." -msgstr "@xref{Desktop Services}, pour la liste exacte des services fournis par @var{%desktop-services}. @xref{X.509 Certificates}, pour des informations sur le paquet @code{nss-certs} utilisé ici." - -#. type: Plain text -#: doc/guix.texi:9099 -msgid "Again, @var{%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 @var{%desktop-services} minus the Avahi service:" -msgstr "Encore une fois, @var{%desktop-services} n'est qu'une liste d'objets service. Si vous voulez en supprimer des services, vous pouvez le faire avec des procédures pour les listes (@pxref{SRFI-1 Filtering and Partitioning,,, guile, GNU Guile Reference Manual}). Par exemple, l'expression suivante renvoie une liste qui contient tous les services dans @var{%desktop-services} sauf le service Avahi :" - -#. type: example -#: doc/guix.texi:9104 -#, no-wrap -msgid "" -"(remove (lambda (service)\n" -" (eq? (service-kind service) avahi-service-type))\n" -" %desktop-services)\n" -msgstr "" -"(remove (lambda (service)\n" -" (eq? (service-kind service) avahi-service-type))\n" -" %desktop-services)\n" - -#. type: unnumberedsubsubsec -#: doc/guix.texi:9106 -#, no-wrap -msgid "Instantiating the System" -msgstr "Instancier le système" - -#. type: Plain text -#: doc/guix.texi:9113 -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 "En supposant que la déclaration @code{operating-system} est stockée dans le fichier @file{my-system-config.scm}, la commande @command{guix system reconfigure my-system-config.scm} instancie cette configuration et en fait l'entrée par défaut dans GRUB (@pxref{Invoking guix system})." - -#. type: Plain text -#: doc/guix.texi:9121 -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 "Pour changer la configuration du système, on met normalement à jour ce fichier et on relance @command{guix system reconfigure}. On ne devrait jamais avoir à modifier de fichiers dans @file{/etc} ou à lancer des commandes qui modifient l'état du système comme @command{useradd} ou @command{grub-install}. En fait, vous devez les éviter parce que non seulement ça annulerait vos garanties, mais ça empêcherait aussi de revenir à des versions précédents du système, si vous en avez besoin." - -#. type: cindex -#: doc/guix.texi:9122 -#, no-wrap -msgid "roll-back, of the operating system" -msgstr "revenir en arrière dans la configuration du système" - -#. type: Plain text -#: doc/guix.texi:9132 -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 "En parlant de revenir en arrière, à chaque fois que vous lancez @command{guix system reconfigure}, une nouvelle @dfn{génération} du système est crée — sans modifier ou supprimer les générations précédentes. Les anciennes générations du système ont une entrée dans le menu du chargeur d'amorçage, ce qui vous permet de démarrer dessus au cas où quelque chose se serait mal passé avec la dernière génération. C'est rassurant, non ? La commande @command{guix system list-generations} liste les générations du système disponibles sur le disque. Il est possible de revenir à une ancienne génération via les commandes @command{guix system roll-back} et @command{guix system switch-generation}." - -#. type: Plain text -#: doc/guix.texi:9138 -msgid "Although the command @command{guix system reconfigure} will not modify previous generations, 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 "Bien que la commande @command{guix system reconfigure} ne modifiera pas les générations précédentes, vous devez faire attention lorsque votre génération actuelle n'est pas la dernière (p.@: ex.@: après avoir invoqué @command{guix system roll-back}), puisque l'opération pourrait remplacer une génération suivante (@pxref{Invoking guix system})." - -#. type: unnumberedsubsubsec -#: doc/guix.texi:9139 -#, no-wrap -msgid "The Programming Interface" -msgstr "L'interface de programmation" - -#. type: Plain text -#: doc/guix.texi:9144 -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 "Au niveau Scheme, la grosse déclaration @code{operating-system} est instanciée avec la procédure monadique suivante (@pxref{The Store Monad}) :" - -#. type: deffn -#: doc/guix.texi:9145 -#, no-wrap -msgid "{Monadic Procedure} operating-system-derivation os" -msgstr "{Procédure Monadique} operating-system-derivation os" - -#. type: deffn -#: doc/guix.texi:9148 -msgid "Return a derivation that builds @var{os}, an @code{operating-system} object (@pxref{Derivations})." -msgstr "Renvoie une dérivation qui construit @var{os}, un objet @code{operating-system} (@pxref{Derivations})." - -#. type: deffn -#: doc/guix.texi:9152 -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 "La sortie de la dérivation est un répertoire qui se réfère à tous les paquets et d'autres fichiers supports requis pour instancier @var{os}." - -#. type: Plain text -#: doc/guix.texi:9157 -msgid "This procedure is provided by the @code{(gnu system)} module. Along with @code{(gnu services)} (@pxref{Services}), this module contains the guts of GuixSD. Make sure to visit it!" -msgstr "Cette procédure est fournie par le module @code{(gnu system)}. Avec @code{(gnu srevices)} (@pxref{Services}), ce module contient les entrailles de GuixSD. Ouvrez-le un jour !" - -#. type: subsection -#: doc/guix.texi:9160 -#, no-wrap -msgid "@code{operating-system} Reference" -msgstr "Référence de @code{operating-system}" - -#. type: Plain text -#: doc/guix.texi:9165 -msgid "This section summarizes all the options available in @code{operating-system} declarations (@pxref{Using the Configuration System})." -msgstr "Cette section résume toutes les options disponibles dans les déclarations @code{operating-system} (@pxref{Using the Configuration System})." - -#. type: deftp -#: doc/guix.texi:9166 -#, no-wrap -msgid "{Data Type} operating-system" -msgstr "{Type de données} operating-system" - -#. type: deftp -#: doc/guix.texi:9170 -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 "C'est le type de données représentant une configuration d'un système d'exploitation. On veut dire par là toute la configuration globale du système, mais pas la configuration par utilisateur (@pxref{Using the Configuration System})." - -#. type: item -#: doc/guix.texi:9172 -#, no-wrap -msgid "@code{kernel} (default: @var{linux-libre})" -msgstr "@code{kernel} (par défaut : @var{linux-libre})" - -#. type: table -#: doc/guix.texi:9176 -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 "L'objet paquet d'un noyau de système d'exploitation à utiliser@footnote{Actuellement seul le noyau Linux-libre est supporté. Dans le futur, il sera possible d'utiliser GNU@tie{}Hurd.}." - -#. type: item -#: doc/guix.texi:9177 -#, no-wrap -msgid "@code{kernel-arguments} (default: @code{'()})" -msgstr "@code{kernel-arguments} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:9180 -msgid "List of strings or gexps representing additional arguments to pass on the command-line of the kernel---e.g., @code{(\"console=ttyS0\")}." -msgstr "Liste de chaînes ou de gexps représentant des arguments supplémentaires à passer sur la ligne de commande du noyau — p.@: ex.@: @code{(\"console=ttyS0\")}." - -#. type: code{#1} -#: doc/guix.texi:9181 doc/guix.texi:20614 doc/guix.texi:20633 -#, no-wrap -msgid "bootloader" -msgstr "bootloader" - -#. type: table -#: doc/guix.texi:9183 -msgid "The system bootloader configuration object. @xref{Bootloader Configuration}." -msgstr "L'objet de configuration du chargeur d'amorçage. @xref{Bootloader Configuration}." - -#. type: item -#: doc/guix.texi:9184 -#, no-wrap -msgid "@code{initrd-modules} (default: @code{%base-initrd-modules})" -msgstr "@code{initrd-modules} (par défaut : @code{%base-initrd-modules})" - -#. type: code{#1} -#: doc/guix.texi:9185 doc/guix.texi:20454 doc/guix.texi:20557 -#: doc/guix.texi:20752 -#, no-wrap -msgid "initrd" -msgstr "initrd" - -#. type: cindex -#: doc/guix.texi:9186 doc/guix.texi:20455 doc/guix.texi:20558 -#, no-wrap -msgid "initial RAM disk" -msgstr "disque de RAM initial" - -#. type: table -#: doc/guix.texi:9189 -msgid "The list of Linux kernel modules that need to be available in the initial RAM disk. @xref{Initial RAM Disk}." -msgstr "La liste des modules du noyau linux requis dans l'image disque de RAM initiale. @xref{Initial RAM Disk}." - -#. type: item -#: doc/guix.texi:9190 -#, no-wrap -msgid "@code{initrd} (default: @code{base-initrd})" -msgstr "@code{initrd} (par défaut : @code{base-initrd})" - -#. type: table -#: doc/guix.texi:9194 -msgid "A monadic 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 "Une procédure monadique qui renvoie un disque de RAM initial pour le noyau Linux. Ce champ est fournit pour pouvoir personnaliser son système à bas-niveau et n'est que rarement utile dans le cas général. @xref{Initial RAM Disk}." - -#. type: item -#: doc/guix.texi:9195 -#, no-wrap -msgid "@code{firmware} (default: @var{%base-firmware})" -msgstr "@code{firmware} (par défaut : @var{%base-firmware})" - -#. type: cindex -#: doc/guix.texi:9196 -#, no-wrap -msgid "firmware" -msgstr "firmware" - -#. type: table -#: doc/guix.texi:9198 -msgid "List of firmware packages loadable by the operating system kernel." -msgstr "Liste les paquets de microgiciels chargeables pour le noyau de système d'exploitation." - -#. type: table -#: doc/guix.texi:9203 -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 "La valeur par défaut contient les microgiciels requis pour les périphériques WiFi Atheros et Broadcom (modules @code{ath9k} et @code{b43-open} de Linux-libre, respectivement). @xref{Hardware Considerations}, pour plus d'info sur les périphériques supportés." - -#. type: code{#1} -#: doc/guix.texi:9204 -#, no-wrap -msgid "host-name" -msgstr "host-name" - -#. type: table -#: doc/guix.texi:9206 -msgid "The host name." -msgstr "Le nom d'hôte." - -#. type: code{#1} -#: doc/guix.texi:9207 -#, no-wrap -msgid "hosts-file" -msgstr "hosts-file" - -#. type: cindex -#: doc/guix.texi:9208 -#, no-wrap -msgid "hosts file" -msgstr "fichier hosts" - -#. type: table -#: doc/guix.texi:9213 -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 "Un objet simili-fichier (@pxref{G-Expressions, file-like objects}) à utiliser comme @file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library Reference Manual}). La valeur par défaut est un fichier avec des entrées pour @code{localhost} et @var{host-name}." - -#. type: item -#: doc/guix.texi:9214 -#, no-wrap -msgid "@code{mapped-devices} (default: @code{'()})" -msgstr "@code{mapped-devices} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:9216 -msgid "A list of mapped devices. @xref{Mapped Devices}." -msgstr "Une liste de périphériques mappés. @xref{Mapped Devices}." - -#. type: code{#1} -#: doc/guix.texi:9217 -#, no-wrap -msgid "file-systems" -msgstr "file-systems" - -#. type: table -#: doc/guix.texi:9219 -msgid "A list of file systems. @xref{File Systems}." -msgstr "Une liste de systèmes de fichiers. @xref{File Systems}." - -#. type: item -#: doc/guix.texi:9220 -#, no-wrap -msgid "@code{swap-devices} (default: @code{'()})" -msgstr "@code{swap-devices} (par défaut : @code{'()})" - -#. type: cindex -#: doc/guix.texi:9221 -#, no-wrap -msgid "swap devices" -msgstr "espaces d'échange" - -#. type: table -#: doc/guix.texi:9228 -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 "Une liste de chaînes identifiant les périphériques ou les fichiers utilisé pour « l'espace d'échange » (@pxref{Memory Concepts,,, libc, The GNU C Library Reference Manual}). Par exemple, @code{'(\"/dev/sda3\")} ou @code{'(\"/swapfile\")}. Il est possible de spécifier un fichier d'échange sur un périphérique mappé, tant que le périphérique nécessaire et le système de fichiers sont aussi spécifiés. @xref{Mapped Devices} et @ref{File Systems}." - -#. type: item -#: doc/guix.texi:9229 -#, no-wrap -msgid "@code{users} (default: @code{%base-user-accounts})" -msgstr "@code{users} (par défaut : @code{%base-user-accounts})" - -#. type: itemx -#: doc/guix.texi:9230 -#, no-wrap -msgid "@code{groups} (default: @var{%base-groups})" -msgstr "@code{groups} (par défaut : @var{%base-groups})" - -#. type: table -#: doc/guix.texi:9232 -msgid "List of user accounts and groups. @xref{User Accounts}." -msgstr "Liste les comptes utilisateurs et les groupes. @xref{User Accounts}." - -#. type: table -#: doc/guix.texi:9235 -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 "Si la liste @code{users} n'a pas de compte lié à l'UID@tie{}0, un compte « root » avec l'UID@tie{}0 est automatiquement ajouté." - -#. type: item -#: doc/guix.texi:9236 -#, no-wrap -msgid "@code{skeletons} (default: @code{(default-skeletons)})" -msgstr "@code{skeletons} (par défaut : @code{(default-skeletons)})" - -#. type: table -#: doc/guix.texi:9240 -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 "Une liste de couples composés d'un nom de fichier cible et d'un objet simili-fichier (@pxref{G-Expressions, file-like objects}). Ce sont les fichiers squelettes qui seront ajoutés au répertoire personnel des comptes utilisateurs nouvellement créés." - -#. type: table -#: doc/guix.texi:9242 -msgid "For instance, a valid value may look like this:" -msgstr "Par exemple, un valeur valide ressemblerait à cela :" - -#. type: example -#: doc/guix.texi:9248 -#, no-wrap -msgid "" -"`((\".bashrc\" ,(plain-file \"bashrc\" \"echo Hello\\n\"))\n" -" (\".guile\" ,(plain-file \"guile\"\n" -" \"(use-modules (ice-9 readline))\n" -" (activate-readline)\")))\n" -msgstr "" -"`((\".bashrc\" ,(plain-file \"bashrc\" \"echo Hello\\n\"))\n" -" (\".guile\" ,(plain-file \"guile\"\n" -" \"(use-modules (ice-9 readline))\n" -" (activate-readline)\")))\n" - -#. type: item -#: doc/guix.texi:9250 -#, no-wrap -msgid "@code{issue} (default: @var{%default-issue})" -msgstr "@code{issue} (par défaut : @var{%default-issue})" - -#. type: table -#: doc/guix.texi:9253 -msgid "A string denoting the contents of the @file{/etc/issue} file, which is displayed when users log in on a text console." -msgstr "Une chaîne qui dénote le contenu du fichier @file{/etc/issue} qui est affiché lorsqu'un utilisateur se connecte sur la console." - -#. type: item -#: doc/guix.texi:9254 -#, no-wrap -msgid "@code{packages} (default: @var{%base-packages})" -msgstr "@code{packages} (par défaut : @var{%base-packages})" - -#. type: table -#: doc/guix.texi:9257 -msgid "The set of packages installed in the global profile, which is accessible at @file{/run/current-system/profile}." -msgstr "L'ensemble des paquets installés dans le profil global, qui est accessible à partir de @file{/run/current-system/profile}." - -#. type: table -#: doc/guix.texi:9261 -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 "L'ensemble par défaut contient les utilitaires de base et c'est une bonne pratique d'installer les utilitaires non essentiels dans les profils utilisateurs (@pxref{Invoking guix package})." - -#. type: code{#1} -#: doc/guix.texi:9262 -#, no-wrap -msgid "timezone" -msgstr "timezone" - -#. type: table -#: doc/guix.texi:9264 -msgid "A timezone identifying string---e.g., @code{\"Europe/Paris\"}." -msgstr "Une chaîne identifiant un fuseau horaire — p.@: ex.@: @code{\"Europe/Paris\"}." - -#. type: table -#: doc/guix.texi:9268 -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 "Vous pouvez lancer la commande @command{tzselect} pour trouver le fuseau horaire correspondant à votre région. Si vous choisissez un nom de fuseau horaire invalide, @command{guix system} échouera." - -#. type: item -#: doc/guix.texi:9269 -#, no-wrap -msgid "@code{locale} (default: @code{\"en_US.utf8\"})" -msgstr "@code{locale} (par défaut : @code{\"en_US.utf8\"})" - -#. type: table -#: doc/guix.texi:9272 -msgid "The name of the default locale (@pxref{Locale Names,,, libc, The GNU C Library Reference Manual}). @xref{Locales}, for more information." -msgstr "Le nom du paramètre régional par défaut (@pxref{Locale Names,,, libc, The GNU C Library Reference Manual}). @xref{Locales}, pour plus d'informations." - -#. type: item -#: doc/guix.texi:9273 -#, no-wrap -msgid "@code{locale-definitions} (default: @var{%default-locale-definitions})" -msgstr "@code{locale-definitions} (pan défaut : @var{%default-locale-definitions})" - -#. type: table -#: doc/guix.texi:9276 -msgid "The list of locale definitions to be compiled and that may be used at run time. @xref{Locales}." -msgstr "La liste des définitions de locales à compiler et qui devraient être utilisées à l'exécution. @xref{Locales}." - -#. type: item -#: doc/guix.texi:9277 -#, no-wrap -msgid "@code{locale-libcs} (default: @code{(list @var{glibc})})" -msgstr "@code{locale-libcs} (par défaut : @code{(list @var{glibc})})" - -#. type: table -#: doc/guix.texi:9281 -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 "La liste des paquets GNU@tie{}libc dont les données des paramètres linguistiques sont utilisées pour construire les définitions des paramètres linguistiques. @xref{Locales}, pour des considérations sur la compatibilité qui justifient cette option." - -#. type: item -#: doc/guix.texi:9282 -#, no-wrap -msgid "@code{name-service-switch} (default: @var{%default-nss})" -msgstr "@code{name-service-switch} (par défaut : @var{%default-nss})" - -#. type: table -#: doc/guix.texi:9286 -msgid "Configuration of the libc name service switch (NSS)---a @code{} object. @xref{Name Service Switch}, for details." -msgstr "La configuration de NSS de la libc (name service switch) — un objet @code{}. @xref{Name Service Switch}, pour des détails." - -#. type: item -#: doc/guix.texi:9287 -#, no-wrap -msgid "@code{services} (default: @var{%base-services})" -msgstr "@code{services} (par défaut : @var{%base-services})" - -#. type: table -#: doc/guix.texi:9289 -msgid "A list of service objects denoting system services. @xref{Services}." -msgstr "Une liste d'objets services qui dénotent les services du système. @xref{Services}." - -#. type: item -#: doc/guix.texi:9290 -#, no-wrap -msgid "@code{pam-services} (default: @code{(base-pam-services)})" -msgstr "@code{pam-services} (par défaut : @code{(base-pam-services)})" - -#. type: cindex -#: doc/guix.texi:9291 -#, no-wrap -msgid "PAM" -msgstr "PAM" - -#. type: cindex -#: doc/guix.texi:9292 -#, no-wrap -msgid "pluggable authentication modules" -msgstr "pluggable authentication modules" - -#. type: table -#: doc/guix.texi:9295 -msgid "Linux @dfn{pluggable authentication module} (PAM) services." -msgstr "Services PAM (@dfn{pluggable authentication module}) Linux." - -#. type: item -#: doc/guix.texi:9296 -#, no-wrap -msgid "@code{setuid-programs} (default: @var{%setuid-programs})" -msgstr "@code{setuid-programs} (par défaut : @var{%setuid-programs})" - -#. type: table -#: doc/guix.texi:9299 -msgid "List of string-valued G-expressions denoting setuid programs. @xref{Setuid Programs}." -msgstr "Liste de G-expressions qui s'évaluent en chaînes de caractères qui dénotent les programmes setuid. @xref{Setuid Programs}." - -#. type: item -#: doc/guix.texi:9300 -#, no-wrap -msgid "@code{sudoers-file} (default: @var{%sudoers-specification})" -msgstr "@code{sudoers-file} (par défaut : @var{%sudoers-specification})" - -#. type: cindex -#: doc/guix.texi:9301 -#, no-wrap -msgid "sudoers file" -msgstr "fichier sudoers" - -#. type: table -#: doc/guix.texi:9304 -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 "Le contenu du fichier @file{/etc/sudoers} comme un objet simili-fichier (@pxref{G-Expressions, @code{local-file} et @code{plain-file}})." - -#. type: table -#: doc/guix.texi:9309 -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 "Ce fichier spécifier quels utilisateurs peuvent utiliser la commande @command{sudo}, ce qu'ils ont le droit de faire, et quels privilèges ils peuvent gagner. La valeur par défaut est que seul @code{root} et les membres du groupe @code{wheel} peuvent utiliser @code{sudo}." - -#. type: Plain text -#: doc/guix.texi:9320 -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 "La liste des systèmes de fichiers à monter est spécifiée dans le champ @code{file-systems} de la déclaration de système d'exploitation (@pxref{Using the Configuration System}). Chaque système de fichier est déclaré avec la forme @code{file-system}, comme ceci :" - -#. type: example -#: doc/guix.texi:9326 -#, no-wrap -msgid "" -"(file-system\n" -" (mount-point \"/home\")\n" -" (device \"/dev/sda3\")\n" -" (type \"ext4\"))\n" -msgstr "" -"(file-system\n" -" (mount-point \"/home\")\n" -" (device \"/dev/sda3\")\n" -" (type \"ext4\"))\n" - -#. type: Plain text -#: doc/guix.texi:9330 -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 "Comme d'habitude, certains de ces champs sont obligatoire — comme le montre l'exemple au-dessus — alors que d'autres peuvent être omis. Ils sont décrits plus bas." - -#. type: deftp -#: doc/guix.texi:9331 -#, no-wrap -msgid "{Data Type} file-system" -msgstr "{Type de données} file-system" - -#. type: deftp -#: doc/guix.texi:9334 -msgid "Objects of this type represent file systems to be mounted. They contain the following members:" -msgstr "Les objets de ce type représentent des systèmes de fichiers à monter. Ils contiennent les membres suivants :" - -#. type: item -#: doc/guix.texi:9336 doc/guix.texi:9522 -#, no-wrap -msgid "type" -msgstr "type" - -#. type: table -#: doc/guix.texi:9339 -msgid "This is a string specifying the type of the file system---e.g., @code{\"ext4\"}." -msgstr "C'est une chaîne de caractères spécifiant le type du système de fichier — p.@: ex.@: @code{\"ext4\"}." - -#. type: code{#1} -#: doc/guix.texi:9340 -#, no-wrap -msgid "mount-point" -msgstr "mount-point" - -#. type: table -#: doc/guix.texi:9342 -msgid "This designates the place where the file system is to be mounted." -msgstr "Désigne l'emplacement où le système de fichier sera monté." - -#. type: code{#1} -#: doc/guix.texi:9343 -#, no-wrap -msgid "device" -msgstr "device" - -#. type: table -#: doc/guix.texi:9353 -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 "Ce champ nomme le système de fichier « source ». il peut être l'une de ces trois choses : une étiquette de système de fichiers, un UUID de système de fichier ou le nom d'un nœud dans @file{/dev}. Les étiquettes et les UUID offrent une manière de se référer à des systèmes de fichiers sans avoir à coder en dur le nom de périphérique@footnote{Remarquez que, s'il est tentant d'utiliser @file{/dev/disk/by-uuid} et autres chemins similaires pour obtenir le même résultat, ce n'est pas recommandé : ces nœuds de périphériques spéciaux sont créés par le démon udev et peuvent ne pas être disponibles au moment de monter le périphérique.}." - -#. type: findex -#: doc/guix.texi:9354 -#, no-wrap -msgid "file-system-label" -msgstr "file-system-label" - -#. type: table -#: doc/guix.texi:9359 -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 "Les étiquettes de systèmes de fichiers sont crées avec la procédure @code{file-system-label}, les UUID avec @code{uuid} et les nœuds de @file{/dev} sont de simples chaînes de caractères. Voici un exemple d'un système de fichiers référencé par son étiquette, donnée par la commande @command{e2label} :" - -#. type: example -#: doc/guix.texi:9365 -#, no-wrap -msgid "" -"(file-system\n" -" (mount-point \"/home\")\n" -" (type \"ext4\")\n" -" (device (file-system-label \"my-home\")))\n" -msgstr "" -"(file-system\n" -" (mount-point \"/home\")\n" -" (type \"ext4\")\n" -" (device (file-system-label \"my-home\")))\n" - -#. type: findex -#: doc/guix.texi:9367 -#, no-wrap -msgid "uuid" -msgstr "uuid" - -#. type: table -#: doc/guix.texi:9375 -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 "Les UUID sont convertis à partir de leur représentation en chaîne de caractères (montrée par la command @command{tune2fs -l}) en utilisant la forme @code{uuid}@footnote{La forme @code{uuid} s'attend à des UUID sur 16 octets définis dans la @uref{https://tools.ietf.org/html/rfc4122, RFC@tie{}4122}. C'est la forme des UUID utilisées par la famille de systèmes de fichiers ext2 et d'autres, mais ce n'est pas le même type d'UUID que ceux qui se trouvent sur les systèmes de fichiers FAT par exemple}, comme ceci :" - -#. type: example -#: doc/guix.texi:9381 -#, no-wrap -msgid "" -"(file-system\n" -" (mount-point \"/home\")\n" -" (type \"ext4\")\n" -" (device (uuid \"4dab5feb-d176-45de-b287-9b0a6e4c01cb\")))\n" -msgstr "" -"(file-system\n" -" (mount-point \"/home\")\n" -" (type \"ext4\")\n" -" (device (uuid \"4dab5feb-d176-45de-b287-9b0a6e4c01cb\")))\n" - -#. type: table -#: doc/guix.texi:9389 -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 "Lorsque la source d'un système de fichiers est un périphérique mappé (@pxref{Mapped Devices}), sont champ @code{device} @emph{doit} se référer au nom du périphérique mappé — p.@: ex.@: @file{\"/dev/mapper/root-partition\"}. Cela est requis pour que le système sache que monter ce système de fichier dépend de la présence du périphérique mappé correspondant." - -#. type: item -#: doc/guix.texi:9390 -#, no-wrap -msgid "@code{flags} (default: @code{'()})" -msgstr "@code{flags} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:9395 -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), and @code{no-exec} (disallow program execution.)" -msgstr "C'est une liste de symboles qui dénotent des drapeaux de montage. Les drapeaux reconnus sont @code{read-only}, @code{bind-mount}, @code{no-dev} (interdit l'accès aux fichiers spéciaux), @code{no-suid} (ignore les bits setuid et setgid) et @code{no-exec} (interdit l'exécution de programmes)." - -#. type: item -#: doc/guix.texi:9396 -#, no-wrap -msgid "@code{options} (default: @code{#f})" -msgstr "@code{options} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:9398 -msgid "This is either @code{#f}, or a string denoting mount options." -msgstr "C'est soit @code{#f} soit une chaîne de caractères dénotant des options de montage." - -#. type: item -#: doc/guix.texi:9399 -#, no-wrap -msgid "@code{mount?} (default: @code{#t})" -msgstr "@code{mount?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:9404 -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 "Cette valeur indique s'il faut monter automatiquement le système de fichier au démarrage du système. Lorsque la valeur est @code{#f}, le système de fichier reçoit une entrée dans @file{/etc/fstab} (lue par la commande @command{mount}) mais n'est pas monté automatiquement." - -#. type: item -#: doc/guix.texi:9405 -#, no-wrap -msgid "@code{needed-for-boot?} (default: @code{#f})" -msgstr "@code{needed-for-boot?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:9410 -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 "Cette valeur booléenne indique si le système de fichier est nécessaire au démarrage. Si c'est vrai alors le système de fichier est monté au chargement du disque de RAM initial. C'est toujours le cas par exemple du système de fichiers racine." - -#. type: item -#: doc/guix.texi:9411 -#, no-wrap -msgid "@code{check?} (default: @code{#t})" -msgstr "@code{check?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:9414 -msgid "This Boolean indicates whether the file system needs to be checked for errors before being mounted." -msgstr "Cette valeur booléenne indique si le système de fichier doit être vérifié avant de le monter." - -#. type: item -#: doc/guix.texi:9415 -#, no-wrap -msgid "@code{create-mount-point?} (default: @code{#f})" -msgstr "@code{create-mount-point?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:9417 -msgid "When true, the mount point is created if it does not exist yet." -msgstr "Lorsque cette valeur est vraie, le point de montage est créé s'il n'existe pas déjà." - -#. type: item -#: doc/guix.texi:9418 -#, no-wrap -msgid "@code{dependencies} (default: @code{'()})" -msgstr "@code{dependencies} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:9422 -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 "C'est une liste d'objets @code{} ou @code{} qui représentent les systèmes de fichiers qui doivent être montés ou les périphériques mappés qui doivent être ouverts avant (et monté ou fermés après) celui-ci." - -#. type: table -#: doc/guix.texi:9426 -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 "Par exemple, considérons une hiérarchie de montage : @file{/sys/fs/cgroup} est une dépendance de @file{/sys/fs/cgroup/cpu} et @file{/sys/fs/cgroup/memory}." - -#. type: table -#: doc/guix.texi:9429 -msgid "Another example is a file system that depends on a mapped device, for example for an encrypted partition (@pxref{Mapped Devices})." -msgstr "Un autre exemple est un système de fichier qui dépend d'un périphérique mappé, par exemple pour une partition chiffrée (@pxref{Mapped Devices})." - -#. type: Plain text -#: doc/guix.texi:9434 -msgid "The @code{(gnu system file-systems)} exports the following useful variables." -msgstr "Le module @code{(gnu system file-systems)} exporte les variables utiles suivantes." - -#. type: defvr -#: doc/guix.texi:9435 -#, no-wrap -msgid "{Scheme Variable} %base-file-systems" -msgstr "{Variable Scheme} %base-file-systems" - -#. type: defvr -#: doc/guix.texi:9440 -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 "Ce sont les systèmes de fichiers essentiels qui sont requis sur les systèmes normaux, comme @var{%pseudo-terminal-file-system} et @var{%immutable-store} (voir plus bas). Les déclarations de systèmes d'exploitation devraient au moins les contenir." - -#. type: defvr -#: doc/guix.texi:9442 -#, no-wrap -msgid "{Scheme Variable} %pseudo-terminal-file-system" -msgstr "{Variable Scheme} %pseudo-terminal-file-system" - -#. type: defvr -#: doc/guix.texi:9448 -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 "C'est le système de fichier monté sur @file{/dev/pts}. Il supporte les @dfn{pseudo-terminaux} créés via @code{openpty} et les fonctions similaires (@pxref{Pseudo-Terminals,,, libc, The GNU C Library Reference Manual}). Les pseudo-terminaux sont utilisés par les émulateurs de terminaux comme @command{xterm}." - -#. type: defvr -#: doc/guix.texi:9450 -#, no-wrap -msgid "{Scheme Variable} %shared-memory-file-system" -msgstr "{Variable Scheme} %shared-memory-file-system" - -#. type: defvr -#: doc/guix.texi:9454 -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 "Ce système de fichier est monté dans @file{/dev/shm} et est utilisé pour le partage de mémoire entre processus (@pxref{Memory-mapped I/O, @code{shm_open},, libc, The GNU C Library Reference Manual})." - -#. type: defvr -#: doc/guix.texi:9456 -#, no-wrap -msgid "{Scheme Variable} %immutable-store" -msgstr "{Variable Scheme} %immutable-store" - -#. type: defvr -#: doc/guix.texi:9461 -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 "Ce système de fichiers effectue un « montage lié » en lecture-seule de @file{/gnu/store}, ce qui en fait un répertoire en lecture-seule pour tous les utilisateurs dont @code{root}. Cela évite que des logiciels qui tournent en @code{root} ou des administrateurs systèmes ne modifient accidentellement le dépôt." - -#. type: defvr -#: doc/guix.texi:9464 -msgid "The daemon itself is still able to write to the store: it remounts it read-write in its own ``name space.''" -msgstr "Le démon lui-même est toujours capable d'écrire dans le dépôt : il est remonté en lecture-écriture dans son propre « espace de nom »." - -#. type: defvr -#: doc/guix.texi:9466 -#, no-wrap -msgid "{Scheme Variable} %binary-format-file-system" -msgstr "{Variable Scheme} %binary-format-file-system" - -#. type: defvr -#: doc/guix.texi:9470 -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 "Le système de fichiers @code{binfmt_misc}, qui permet de gérer n'importe quel type de fichiers exécutables à déléguer en espace utilisateur. Cela demande que le module du noyau @code{binfmt.ko} soit chargé." - -#. type: defvr -#: doc/guix.texi:9472 -#, no-wrap -msgid "{Scheme Variable} %fuse-control-file-system" -msgstr "{Variable Scheme} %fuse-control-file-system" - -#. type: defvr -#: doc/guix.texi:9476 -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 "Le système de fichiers @code{fusectl}, qui permet à des utilisateurs non privilégiés de monter et de démonter des systèmes de fichiers FUSE en espace utilisateur. Cela requiert que le module du noyau @code{fuse.ko} soit chargé." - -#. type: cindex -#: doc/guix.texi:9481 -#, no-wrap -msgid "device mapping" -msgstr "mappage de périphériques" - -#. type: cindex -#: doc/guix.texi:9482 -#, no-wrap -msgid "mapped devices" -msgstr "périphériques mappés" - -#. type: Plain text -#: doc/guix.texi:9500 -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 "Le noyau Linux a une notion de @dfn{mappage de périphériques} : un périphérique bloc, comme une partition sur un disque dur, peut être @dfn{mappé} sur un autre périphérique, typiquement dans @code{/dev/mapper}, avec des calculs supplémentaires sur les données qui naviguent entre les deux@footnote{Remarquez que le Hurd ne fait pas de différence entre le concept de « périphérique mappé » et celle d'un système de fichiers : les deux correspondent à la @emph{traduction} des opérations d'entrée-sortie faites sur un fichier en des opérations sur ce qui le contient. Ainsi, le Hurd implémente les périphériques mappés, comme les systèmes de fichiers, avec le mécanisme des @dfn{traducteurs} générique (@pxref{Translators,,, hurd, The GNU Hurd Reference Manual}).}. Un exemple typique est le mappage de périphériques chiffrés : toutes les écritures sont sur le périphérique mappé sont chiffrées, toutes les lectures déchiffrées, de manière transparente. Guix étend cette notion en considérant que tout périphérique ou ensemble de périphériques qui sont @dfn{transformés} d'une certaine manière créent un nouveau périphérique ; par exemple, les périphériques RAID sont obtenus en @dfn{assemblant} plusieurs autres périphériques, comme des disque ou des partitions, en un nouveau périphérique en tant qu'unique partition. Un autre exemple, qui n'est pas encore disponible, sont les volumes logiques LVM." - -#. type: Plain text -#: doc/guix.texi:9503 -msgid "Mapped devices are declared using the @code{mapped-device} form, defined as follows; for examples, see below." -msgstr "Les périphériques mappés sont déclarés avec la forme @code{mapped-device}, définie comme suit ; par exemple, voir ci-dessous." - -#. type: deftp -#: doc/guix.texi:9504 -#, no-wrap -msgid "{Data Type} mapped-device" -msgstr "{Type de données} mapped-device" - -#. type: deftp -#: doc/guix.texi:9507 -msgid "Objects of this type represent device mappings that will be made when the system boots up." -msgstr "Les objets de ce type représentent des mappages de périphériques qui seront effectués au démarrage du système." - -#. type: table -#: doc/guix.texi:9513 -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 "C'est soit une chaîne qui spécifie le nom d'un périphérique bloc à mapper, comme @code{\"/dev/sda3\"}, soit une liste de plusieurs périphériques à assembler pour en créer un nouveau." - -#. type: code{#1} -#: doc/guix.texi:9514 doc/guix.texi:20646 -#, no-wrap -msgid "target" -msgstr "target" - -#. type: table -#: doc/guix.texi:9521 -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 "Cette chaîne spécifie le nom du périphérique mappé qui en résulte. Pour les mappeurs noyaux comme les périphériques chiffrés de type @code{luks-device-mapping}, spécifier @code{\"ma-partition\"} crée le périphérique @code{\"/dev/mapper/ma-partition\"}. Pour les périphériques RAID de type @code{raid-device-mapping}, il faut donner le nom complet comme @code{\"/dev/md0\"}." - -#. type: table -#: doc/guix.texi:9525 -msgid "This must be a @code{mapped-device-kind} object, which specifies how @var{source} is mapped to @var{target}." -msgstr "Ce doit être un objets @code{mapped-device-kind}, qui spécifie comment @var{source} est mappés sur @var{target}." - -#. type: defvr -#: doc/guix.texi:9528 -#, no-wrap -msgid "{Scheme Variable} luks-device-mapping" -msgstr "{Variable Scheme} luks-device-mapping" - -#. type: defvr -#: doc/guix.texi:9532 -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 "Cela définie les périphériques blocs chiffrés en LUKS avec @command{cryptsetup} du paquet du même nom. Elle s'appuie sur le module du noyau Linux @code{dm-crypt}." - -#. type: defvr -#: doc/guix.texi:9534 -#, no-wrap -msgid "{Scheme Variable} raid-device-mapping" -msgstr "{Variable Scheme} raid-device-mapping" - -#. type: defvr -#: doc/guix.texi:9539 -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 "Cela définie un périphérique RAID qui est assemblé avec la commande @code{mdadm} du paquet du même nom. Elle nécessite un module noyau Linux approprié pour le niveau RAID chargé, comme @code{raid456} pour RAID-4, RAID-5 et RAID-6 ou @code{raid10} pour RAID-10." - -#. type: cindex -#: doc/guix.texi:9541 -#, no-wrap -msgid "disk encryption" -msgstr "chiffrement du disque" - -#. type: cindex -#: doc/guix.texi:9542 -#, no-wrap -msgid "LUKS" -msgstr "LUKS" - -#. type: Plain text -#: doc/guix.texi:9550 -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 "L'exemple suivant spécifie un mappage de @file{/dev/sda3} vers @file{/dev/mapper/home} avec LUKS — @url{https://gitlab.com/cryptsetup/cryptsetup,Linux Unified Key Setup}, un mécanisme standard pour chiffrer les disques. Le périphérique @file{/dev/mapper/home} peut ensuite être utilisé comme @code{device} d'une déclaration @code{file-system} (@pxref{File Systems})." - -#. type: example -#: doc/guix.texi:9556 -#, no-wrap -msgid "" -"(mapped-device\n" -" (source \"/dev/sda3\")\n" -" (target \"home\")\n" -" (type luks-device-mapping))\n" -msgstr "" -"(mapped-device\n" -" (source \"/dev/sda3\")\n" -" (target \"home\")\n" -" (type luks-device-mapping))\n" - -#. type: Plain text -#: doc/guix.texi:9561 -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 "Autrement, pour devenir indépendant du numéro de périphérique, on peut obtenir l'UUID LUKS (@dfn{l'identifiant unique}) du périphérique source avec une commande comme :" - -#. type: example -#: doc/guix.texi:9564 -#, no-wrap -msgid "cryptsetup luksUUID /dev/sda3\n" -msgstr "cryptsetup luksUUID /dev/sda3\n" - -#. type: Plain text -#: doc/guix.texi:9567 -msgid "and use it as follows:" -msgstr "et l'utiliser ainsi :" - -#. type: example -#: doc/guix.texi:9573 -#, no-wrap -msgid "" -"(mapped-device\n" -" (source (uuid \"cb67fc72-0d54-4c88-9d4b-b225f30b0f44\"))\n" -" (target \"home\")\n" -" (type luks-device-mapping))\n" -msgstr "" -"(mapped-device\n" -" (source (uuid \"cb67fc72-0d54-4c88-9d4b-b225f30b0f44\"))\n" -" (target \"home\")\n" -" (type luks-device-mapping))\n" - -#. type: cindex -#: doc/guix.texi:9575 -#, no-wrap -msgid "swap encryption" -msgstr "chiffrement de l'espace d'échange" - -#. type: Plain text -#: doc/guix.texi:9581 -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 "Il est aussi désirable de chiffrer l'espace d'échange, puisque l'espace d'échange peut contenir des données sensibles. Une manière de faire cela est d'utiliser un fichier d'échange dans un système de fichiers sur un périphérique mappé avec un chiffrement LUKS. De cette manière, le fichier d'échange est chiffré parce que tout le périphérique est chiffré. @xref{Preparing for Installation,,Disk Partitioning}, pour un exemple." - -#. type: Plain text -#: doc/guix.texi:9584 -msgid "A RAID device formed of the partitions @file{/dev/sda1} and @file{/dev/sdb1} may be declared as follows:" -msgstr "Un périphérique RAID formé des partitions @file{/dev/sda1} et @file{/dev/sdb1} peut être déclaré ainsi :" - -#. type: example -#: doc/guix.texi:9590 -#, no-wrap -msgid "" -"(mapped-device\n" -" (source (list \"/dev/sda1\" \"/dev/sdb1\"))\n" -" (target \"/dev/md0\")\n" -" (type raid-device-mapping))\n" -msgstr "" -"(mapped-device\n" -" (source (list \"/dev/sda1\" \"/dev/sdb1\"))\n" -" (target \"/dev/md0\")\n" -" (type raid-device-mapping))\n" - -#. type: Plain text -#: doc/guix.texi:9597 -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 "Le périphérique @file{/dev/md0} peut ensuite être utilisé comme @code{device} d'une déclaration @code{file-system} (@pxref{File Systems}). Remarquez que le niveau de RAID n'a pas besoin d'être donné ; il est choisi pendant la création initiale du périphérique RAID et est ensuite déterminé automatiquement." - -#. type: cindex -#: doc/guix.texi:9602 -#, no-wrap -msgid "users" -msgstr "utilisateurs" - -#. type: cindex -#: doc/guix.texi:9603 -#, no-wrap -msgid "accounts" -msgstr "comptes" - -#. type: cindex -#: doc/guix.texi:9604 -#, no-wrap -msgid "user accounts" -msgstr "comptes utilisateurs" - -#. type: Plain text -#: doc/guix.texi:9608 -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 "Les comptes utilisateurs et les groupes sont gérés entièrement par la déclaration @code{operating-system}. Ils sont spécifiés avec les formes @code{user-account} et @code{user-group} :" - -#. type: example -#: doc/guix.texi:9619 -#, no-wrap -msgid "" -"(user-account\n" -" (name \"alice\")\n" -" (group \"users\")\n" -" (supplementary-groups '(\"wheel\" ;allow use of sudo, etc.\n" -" \"audio\" ;sound card\n" -" \"video\" ;video devices such as webcams\n" -" \"cdrom\")) ;the good ol' CD-ROM\n" -" (comment \"Bob's sister\")\n" -" (home-directory \"/home/alice\"))\n" -msgstr "" -"(user-account\n" -" (name \"alice\")\n" -" (group \"users\")\n" -" (supplementary-groups '(\"wheel\" ;permet d'utiliser sudo, etc.\n" -" \"audio\" ;carte son\n" -" \"video\" ;périphériques réseaux comme les webcams\n" -" \"cdrom\")) ;le bon vieux CD-ROM\n" -" (comment \"Bob's sister\")\n" -" (home-directory \"/home/alice\"))\n" - -#. type: Plain text -#: doc/guix.texi:9628 -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 "Lors du démarrage ou à la fin de @command{guix system reconfigure}, le système s'assure que seuls les comptes utilisateurs et les groupes spécifiés dans la déclaration @code{operating-system} existent, et avec les propriétés spécifiées. Ainsi, les modifications ou les créations de comptes ou de groupes effectuées directement en invoquant des commandes comme @command{useradd} sont perdue à la reconfiguration ou au redémarrage. Cela permet de s'assurer que le système reste exactement tel que déclaré." - -#. type: deftp -#: doc/guix.texi:9629 -#, no-wrap -msgid "{Data Type} user-account" -msgstr "{Type de données} user-account" - -#. type: deftp -#: doc/guix.texi:9632 -msgid "Objects of this type represent user accounts. The following members may be specified:" -msgstr "Les objets de se type représentent les comptes utilisateurs. Les membres suivants peuvent être spécifiés :" - -#. type: table -#: doc/guix.texi:9636 -msgid "The name of the user account." -msgstr "Le nom du compte utilisateur." - -#. type: itemx -#: doc/guix.texi:9637 doc/guix.texi:20408 -#, no-wrap -msgid "group" -msgstr "group" - -#. type: cindex -#: doc/guix.texi:9638 doc/guix.texi:9687 -#, no-wrap -msgid "groups" -msgstr "groupes" - -#. type: table -#: doc/guix.texi:9641 -msgid "This is the name (a string) or identifier (a number) of the user group this account belongs to." -msgstr "C'est le nom (une chaîne) ou un identifiant (un nombre) du groupe utilisateur auquel ce compte appartient." - -#. type: item -#: doc/guix.texi:9642 -#, no-wrap -msgid "@code{supplementary-groups} (default: @code{'()})" -msgstr "@code{supplementary-groups} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:9645 -msgid "Optionally, this can be defined as a list of group names that this account belongs to." -msgstr "Éventuellement, cela peut être définie comme une liste de noms de groupes auxquels ce compte appartient." - -#. type: item -#: doc/guix.texi:9646 -#, no-wrap -msgid "@code{uid} (default: @code{#f})" -msgstr "@code{uid} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:9650 -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 "C'est l'ID utilisateur de ce compte (un nombre) ou @code{#f}. Dans ce dernier cas, le nombre est choisi automatiquement par le système à la création du compte." - -#. type: item -#: doc/guix.texi:9651 -#, no-wrap -msgid "@code{comment} (default: @code{\"\"})" -msgstr "@code{comment} (par défaut : @code{\"\"})" - -#. type: table -#: doc/guix.texi:9653 -msgid "A comment about the account, such as the account owner's full name." -msgstr "Un commentaire à propos du compte, comme le nom complet de l'utilisateur." - -#. type: code{#1} -#: doc/guix.texi:9654 -#, no-wrap -msgid "home-directory" -msgstr "home-directory" - -#. type: table -#: doc/guix.texi:9656 -msgid "This is the name of the home directory for the account." -msgstr "C'est le nom du répertoire personnel du compte." - -#. type: item -#: doc/guix.texi:9657 -#, no-wrap -msgid "@code{create-home-directory?} (default: @code{#t})" -msgstr "@code{create-home-directory?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:9660 -msgid "Indicates whether the home directory of this account should be created if it does not exist yet." -msgstr "Indique si le répertoire personnel du compte devrait être créé s'il n'existe pas déjà." - -#. type: item -#: doc/guix.texi:9661 -#, no-wrap -msgid "@code{shell} (default: Bash)" -msgstr "@code{shell} (par défaut : Bash)" - -#. type: table -#: doc/guix.texi:9664 -msgid "This is a G-expression denoting the file name of a program to be used as the shell (@pxref{G-Expressions})." -msgstr "C'est une G-expression qui dénote un nom de fichier d'un programme utilisé comme shell (@pxref{G-Expressions})." - -#. type: item -#: doc/guix.texi:9665 doc/guix.texi:9705 -#, no-wrap -msgid "@code{system?} (default: @code{#f})" -msgstr "@code{system?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:9669 -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 "C'est une valeur booléenne qui indique si le compte est un compte « système ». Les comptes systèmes sont parfois traités à part ; par exemple, les gestionnaires de connexion graphiques ne les liste pas." - -#. type: anchor{#1} -#: doc/guix.texi:9671 -msgid "user-account-password" -msgstr "user-account-password" - -#. type: item -#: doc/guix.texi:9671 doc/guix.texi:9709 -#, no-wrap -msgid "@code{password} (default: @code{#f})" -msgstr "@code{password} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:9677 -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 "Vous laisseriez normalement ce champ à @code{#f} et initialiseriez les mots de passe utilisateurs en tant que @code{root} avec la commande @command{passwd}, puis laisseriez l'utilisateur le changer avec @command{passwd}. Les mots de passes définis avec @command{passwd} sont bien sûr préservés après redémarrage et reconfiguration." - -#. type: table -#: doc/guix.texi:9683 -msgid "If you @emph{do} want to have a preset password for an account, then this field must contain the encrypted password, as a string. @xref{crypt,,, 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 "Si vous voulez @emph{vraiment} définir un mot de passe pour un compte, alors ce champ doit contenir le mot de passe chiffré, comme une chaîne de caractère. @xref{crypt,,, libc, The GNU C Library Reference Manual}, pour plus d'information sur le chiffrement des mots de passe et ref{Encryption,,, guile, GNU Guile Reference Manual}, pour des informations sur la procédure @code{crypt} de Guile." - -#. type: Plain text -#: doc/guix.texi:9689 -msgid "User group declarations are even simpler:" -msgstr "Les déclarations de groupes sont encore plus simple :" - -#. type: example -#: doc/guix.texi:9692 -#, no-wrap -msgid "(user-group (name \"students\"))\n" -msgstr "(user-group (name \"students\"))\n" - -#. type: deftp -#: doc/guix.texi:9694 -#, no-wrap -msgid "{Data Type} user-group" -msgstr "{Type de données} user-group" - -#. type: deftp -#: doc/guix.texi:9696 -msgid "This type is for, well, user groups. There are just a few fields:" -msgstr "C'est le type pour, hé bien, les comptes utilisateurs. Il n'y a que quelques champs :" - -#. type: table -#: doc/guix.texi:9700 -msgid "The name of the group." -msgstr "Le nom du groupe." - -#. type: item -#: doc/guix.texi:9701 -#, no-wrap -msgid "@code{id} (default: @code{#f})" -msgstr "@code{id} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:9704 -msgid "The group identifier (a number). If @code{#f}, a new number is automatically allocated when the group is created." -msgstr "L'identifiant du groupe (un nombre). S'il est @code{#f}, un nouveau nombre est alloué automatiquement lorsque le groupe est créé." - -#. type: table -#: doc/guix.texi:9708 -msgid "This Boolean value indicates whether the group is a ``system'' group. System groups have low numerical IDs." -msgstr "Cette valeur booléenne indique si le groupe est un groupe « système ». les groupes systèmes ont un numéro d'ID bas." - -#. type: table -#: doc/guix.texi:9712 -msgid "What, user groups can have a password? Well, apparently yes. Unless @code{#f}, this field specifies the password of the group." -msgstr "Quoi, les groupes utilisateurs peuvent avoir des mots de passe ? On dirait bien. À moins que la valeur ne soit @code{#f}, ce champ spécifie le mot de passe du groupe." - -#. type: Plain text -#: doc/guix.texi:9718 -msgid "For convenience, a variable lists all the basic user groups one may expect:" -msgstr "Par simplicité, une variable liste les groupes utilisateurs de base auxquels on pourrait s'attendre :" - -#. type: defvr -#: doc/guix.texi:9719 -#, no-wrap -msgid "{Scheme Variable} %base-groups" -msgstr "{Variable Scheme} %base-groups" - -#. type: defvr -#: doc/guix.texi:9724 -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 "C'est la liste des groupes utilisateur de base que les utilisateurs et les paquets s'attendent à trouver sur le système. Cela comprend des groupes comme « root », « wheel » et « users », ainsi que des groupes utilisés pour contrôler l'accès à certains périphériques, comme « audio », « disk » et « cdrom »." - -#. type: defvr -#: doc/guix.texi:9726 -#, no-wrap -msgid "{Scheme Variable} %base-user-accounts" -msgstr "{Variable Scheme} %base-user-accounts" - -#. type: defvr -#: doc/guix.texi:9729 -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 "C'est la liste des compte du système de base que les programmes peuvent s'attendre à trouver sur un système GNU/Linux, comme le compte « nobody »." - -#. type: defvr -#: doc/guix.texi:9732 -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 "Remarquez que le compte « root » n'est pas défini ici. C'est un cas particulier et il est automatiquement ajouté qu'il soit spécifié ou non." - -#. type: cindex -#: doc/guix.texi:9737 -#, no-wrap -msgid "locale" -msgstr "paramètres linguistiques" - -#. type: Plain text -#: doc/guix.texi:9744 -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 "Un @dfn{paramètre linguistique} définie les conventions culturelles d'une langue et d'une région particulières (@pxref{Locales,,, libc, The GNU C Library Reference Manual}). Chaque paramètre linguistique a un nom de la forme @code{@var{langue}_@var{territoire}.@var{jeudecaractères}} — p.@: ex.@: @code{fr_LU.utf8} désigne le paramètre linguistique pour le français, avec les conventions culturelles du Luxembourg, en utilisant l'encodage UTF-8." - -#. type: cindex -#: doc/guix.texi:9745 -#, no-wrap -msgid "locale definition" -msgstr "définition des paramètres linguistiques" - -#. type: Plain text -#: doc/guix.texi:9749 -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 "Normalement, vous voudrez spécifier les paramètres linguistiques par défaut pour la machine en utilisant le champ @code{locale} de la déclaration @code{operating-system} (@pxref{operating-system Reference, @code{locale}})." - -#. type: Plain text -#: doc/guix.texi:9758 -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 "Les paramètres régionaux choisis sont automatiquement ajoutés aux définitions des @dfn{paramètres régionaux} connues par le système au besoin, avec le jeu de caractères inféré à partir de son nom, p.@: ex.@: @code{bo_CN.utf8} supposera qu'il faut utiliser le jeu de caractères @code{UTF-8}. Des définitions supplémentaires peuvent être spécifiées dans le champ @code{locale-definitions} de @code{operating-system} — c'est utile par exemple si le jeu de caractères n'a pas été inféré à partir du nom. L'ensemble par défaut de définitions comprend certains paramètres linguistiques parmi les plus utilisés, mais pas toutes les variantes disponibles, pour gagner de la place." - -#. type: Plain text -#: doc/guix.texi:9761 -msgid "For instance, to add the North Frisian locale for Germany, the value of that field may be:" -msgstr "Par exemple, pour ajouter les paramètres pour le frison septentrional en Allemagne, la valeur de ce champ serait :" - -#. type: example -#: doc/guix.texi:9766 -#, no-wrap -msgid "" -"(cons (locale-definition\n" -" (name \"fy_DE.utf8\") (source \"fy_DE\"))\n" -" %default-locale-definitions)\n" -msgstr "" -"(cons (locale-definition\n" -" (name \"fy_DE.utf8\") (source \"fy_DE\"))\n" -" %default-locale-definitions)\n" - -#. type: Plain text -#: doc/guix.texi:9770 -msgid "Likewise, to save space, one might want @code{locale-definitions} to list only the locales that are actually used, as in:" -msgstr "De me, pour gagner de la place, on peut vouloir lister dans @code{locale-definitions} seulement les paramètres qui sont vraiment utilisés, comme dans :" - -#. type: example -#: doc/guix.texi:9775 -#, no-wrap -msgid "" -"(list (locale-definition\n" -" (name \"ja_JP.eucjp\") (source \"ja_JP\")\n" -" (charset \"EUC-JP\")))\n" -msgstr "" -"(list (locale-definition\n" -" (name \"ja_JP.eucjp\") (source \"ja_JP\")\n" -" (charset \"EUC-JP\")))\n" - -#. type: Plain text -#: doc/guix.texi:9784 -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 "Les définitions des paramètres linguistiques compilées sont disponibles dans @file{/run/current-system/locale/X.Y}, où @code{X.Y} est la version de la libc, ce qui est l'emplacement par défaut où la GNU@tie{}libc fournie par Guix cherche les données de régionalisation. Cet emplacement peut être modifié avec la variable d'environnement @code{LOCPATH} (@pxref{locales-and-locpath, @code{LOCPATH} and locale packages})." - -#. type: Plain text -#: doc/guix.texi:9787 -msgid "The @code{locale-definition} form is provided by the @code{(gnu system locale)} module. Details are given below." -msgstr "La forme @code{locale-definition} est fournie par le module @code{(gnu system locale)}. Des détails sont disponibles plus bas." - -#. type: deftp -#: doc/guix.texi:9788 -#, no-wrap -msgid "{Data Type} locale-definition" -msgstr "{Type de données} locale-definition" - -#. type: deftp -#: doc/guix.texi:9790 -msgid "This is the data type of a locale definition." -msgstr "C'est le type de données d'une définition de paramètres linguistiques." - -#. type: table -#: doc/guix.texi:9796 -msgid "The name of the locale. @xref{Locale Names,,, libc, The GNU C Library Reference Manual}, for more information on locale names." -msgstr "Le nom du paramètre linguistique. @xref{Locale Names,,, libc, The GNU C Library Reference Manual}, pour en savoir plus sur les noms de paramètres linguistiques." - -#. type: table -#: doc/guix.texi:9800 -msgid "The name of the source for that locale. This is typically the @code{@var{language}_@var{territory}} part of the locale name." -msgstr "Le nom de la source pour ce paramètre linguistique. C'est typiquement la partie @code{@var{langue}_@var{territoire}} du nom du paramètre." - -#. type: item -#: doc/guix.texi:9801 -#, no-wrap -msgid "@code{charset} (default: @code{\"UTF-8\"})" -msgstr "@code{charset} (par défaut : @code{\"UTF-8\"})" - -#. type: table -#: doc/guix.texi:9805 -msgid "The ``character set'' or ``code set'' for that locale, @uref{http://www.iana.org/assignments/character-sets, as defined by IANA}." -msgstr "Le « jeu de caractères » d'un paramètre linguistique, @uref{http://www.iana.org/assignments/character-sets, défini par l'IANA}." - -#. type: defvr -#: doc/guix.texi:9809 -#, no-wrap -msgid "{Scheme Variable} %default-locale-definitions" -msgstr "{Variable Scheme} %default-locale-definitions" - -#. type: defvr -#: doc/guix.texi:9813 -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 "Une liste des paramètres linguistiques UTF-8 couramment utilisés, utilisée comme valeur par défaut pour le champ @code{locale-definitions} des déclarations @code{operating-system}." - -#. type: cindex -#: doc/guix.texi:9814 -#, no-wrap -msgid "locale name" -msgstr "nom de paramètre linguistique" - -#. type: cindex -#: doc/guix.texi:9815 -#, no-wrap -msgid "normalized codeset in locale names" -msgstr "jeu de caractère normalisé dans les noms de paramètres linguistiques" - -#. type: defvr -#: doc/guix.texi:9821 -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 "Ces définitions de paramètres linguistiques utilisent le @dfn{jeu de caractère normalisé} pour la partie qui suit le point dans le nom (@pxref{Using gettextized software, normalized codeset,, libc, The GNU C Library Reference Manual}). Donc par exemple il y a @code{uk_UA.utf8} mais @emph{pas}, disons, @code{uk_UA.UTF-8}." - -#. type: subsubsection -#: doc/guix.texi:9823 -#, no-wrap -msgid "Locale Data Compatibility Considerations" -msgstr "Considérations sur la compatibilité des données linguistiques" - -#. type: cindex -#: doc/guix.texi:9825 -#, no-wrap -msgid "incompatibility, of locale data" -msgstr "incompatibilité, des données linguistiques" - -#. type: Plain text -#: doc/guix.texi:9832 -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 "Les déclaration @code{operating-system} fournissent un champ @code{locale-libcs} pour spécifier les paquets GNU@tie{}libc à utiliser pour compiler les déclarations de paramètres linguistiques (@pxref{operating-system Reference}). « Pourquoi je devrais m'en soucier ? », vous demandez-vous sûrement. Hé bien il se trouve que le format binaire des données linguistique est parfois incompatible d'une version de la libc à une autre." - -#. type: Plain text -#: doc/guix.texi:9844 -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 "Par exemple, un programme lié à la libc version 2.21 est incapable de lire les données linguistiques produites par la libc 2.22 ; pire, ce programme @emph{plante} plutôt que d'ignorer les données linguistiques incompatibles@footnote{Les version 2.23 et supérieures de la GNU@tie{}libc sauteront simplement les données linguistiques incompatibles, ce qui est déjà mieux.}. De même, un programme lié à la libc 2.22 peut lire la plupart mais pas toutes les données linguistiques de la libc 2.21 (spécifiquement les données @code{LC_COLLATE} sont incompatibles) ; donc les appels à @code{setlocale} peuvent échouer, mais les programmes ne plantent pas." - -#. type: Plain text -#: doc/guix.texi:9849 -msgid "The ``problem'' in GuixSD 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 "Le « problème » avec GuixSD c'est que les utilisateurs ont beaucoup de liberté : ils peuvent choisir s'ils veulent et quand ils veulent mettre à jour les logiciels de leur profil, et peuvent utiliser une version différente de la libc de celle que l'administrateur système utilise pour construire les données linguistiques du système global." - -#. type: Plain text -#: doc/guix.texi:9853 -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 "Heureusement, les utilisateurs non privilégiés peuvent aussi installer leur propres données linguistiques et définir @var{GUIX_LOCPATH} comme il le faut (@pxref{locales-and-locpath, @code{GUIX_LOCPATH} and locale packages})." - -#. type: Plain text -#: doc/guix.texi:9860 -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 "Cependant, c'est encore mieux si les données linguistiques du système dans @file{/run/current-system/locale} étaient construites avec les versions de la libc utilisées sur le système, pour que tous les programmes puissent y accéder — c'est surtout crucial sur un système multi-utilisateurs. Pour cela, l'administrateur peut spécifier plusieurs paquets de la libc dans le champ @code{locale-libcs} de @code{operating-system} :" - -#. type: example -#: doc/guix.texi:9863 -#, no-wrap +#: guix/scripts/hash.scm:56 msgid "" -"(use-package-modules base)\n" "\n" +" -r, --recursive compute the hash on FILE recursively" msgstr "" -"(use-package-modules base)\n" "\n" +" -r, --recursive calculer l'empreinte de FICHIER de manière récursive" -#. type: example -#: doc/guix.texi:9867 -#, no-wrap -msgid "" -"(operating-system\n" -" ;; @dots{}\n" -" (locale-libcs (list glibc-2.21 (canonical-package glibc))))\n" -msgstr "" -"(operating-system\n" -" ;; @dots{}\n" -" (locale-libcs (list glibc-2.21 (canonical-package glibc))))\n" - -#. type: Plain text -#: doc/guix.texi:9872 -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 "cet exemple créera un système contenant les définitions des paramètres linguistiques pour la libc 2.21 et pour la version actuelle de la libc dans @file{/run/current-system/locale}." - -#. type: cindex -#: doc/guix.texi:9877 -#, no-wrap -msgid "system services" -msgstr "services systèmes" - -#. type: Plain text -#: doc/guix.texi:9883 -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 "Une part importante de la préparation d'une déclaration @code{operating-system} est la liste des @dfn{services systèmes} et de leur configuration (@pxref{Using the Configuration System}). Les services systèmes sont typiquement des démons lancés au démarrage ou d'autres actions requises à ce moment-là — p.@: ex.@: configurer les accès réseaux." - -#. type: Plain text -#: doc/guix.texi:9890 -msgid "GuixSD 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 "GuixSD a une définition large de « service » (@pxref{Service Composition}), mais beaucoup de services sont gérés par le GNU@tie{}Shepherd (@pxref{Shepherd Services}). Sur un système lancé, la commande @command{herd} vous permet de lister les services disponibles, montrer leur statut, les démarrer et les arrêter, ou faire d'autres opérations spécifiques (@pxref{Jump Start,,, shepherd, The GNU Shepherd Manual}). Par exemple :" - -#. type: example -#: doc/guix.texi:9893 -#, no-wrap -msgid "# herd status\n" -msgstr "# herd status\n" - -#. type: Plain text -#: doc/guix.texi:9898 -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:" -msgstr "La commande ci-dessus, lancée en @code{root}, liste les services actuellement définis. La commande @command{herd doc} montre un synopsis du service donné :" - -#. type: example -#: doc/guix.texi:9902 -#, no-wrap -msgid "" -"# herd doc nscd\n" -"Run libc's name service cache daemon (nscd).\n" -msgstr "" -"# herd doc nscd\n" -"Run libc's name service cache daemon (nscd).\n" +#: guix/scripts/hash.scm:150 guix/ui.scm:365 guix/ui.scm:706 guix/ui.scm:759 +#, scheme-format +msgid "~a~%" +msgstr "~a~%" -#. type: Plain text -#: doc/guix.texi:9907 -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 "Les sous-commandes @command{start}, @command{stop} et @command{restart} ont l'effet auquel on s'attend. Par exemple, les commande suivantes stoppent le service nscd et redémarrent le serveur d'affichage Xorg :" +#: guix/scripts/hash.scm:153 guix/scripts/system.scm:1161 +#: guix/scripts/system.scm:1170 guix/scripts/system.scm:1177 +#, scheme-format +msgid "wrong number of arguments~%" +msgstr "nombre d'arguments incorrect~%" -#. type: example -#: doc/guix.texi:9914 -#, no-wrap -msgid "" -"# herd stop nscd\n" -"Service nscd has been stopped.\n" -"# herd restart xorg-server\n" -"Service xorg-server has been stopped.\n" -"Service xorg-server has been started.\n" -msgstr "" -"# herd stop nscd\n" -"Service nscd has been stopped.\n" -"# herd restart xorg-server\n" -"Service xorg-server has been stopped.\n" -"Service xorg-server has been started.\n" - -#. type: Plain text -#: doc/guix.texi:9919 -msgid "The following sections document the available services, starting with the core services, that may be used in an @code{operating-system} declaration." -msgstr "Les sections suivantes documentent les services disponibles, en commençant par les services de base qui peuvent être utilisés avec une déclaration @code{operating-system}." - -#. type: Plain text -#: doc/guix.texi:9955 -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 "Le module @code{(gnu services base)} fournit des définitions de services poru les services de base qu'on peut attendre du système. Les services exportés par ce module sort listés ci-dessous." - -#. type: defvr -#: doc/guix.texi:9956 -#, no-wrap -msgid "{Scheme Variable} %base-services" -msgstr "{Variable Scheme} %base-services" - -#. type: defvr -#: doc/guix.texi:9962 -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 "Cette variable contient une liste de services de base (@pxref{Service Types and Services}, pour plus d'informations sur les objets service) qu'on peut attendre du système : un service de connexion (mingetty) sur chaque tty, syslogd, le démon de cache de noms de la libc (nscd), le gestionnaire de périphériques udev, et plus." - -#. type: defvr -#: doc/guix.texi:9967 -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 @var{%base-services}, like this:" -msgstr "C'est la valeur par défaut du champ @code{services} des déclarations @code{operating-system}. Habituellement, lors de la personnalisation d'un système, vous voudrez ajouter des services à ceux de @var{%base-services}, comme ceci :" - -#. type: example -#: doc/guix.texi:9970 -#, no-wrap -msgid "(cons* (avahi-service) (lsh-service) %base-services)\n" -msgstr "(cons* (avahi-service) (lsh-service) %base-services)\n" - -#. type: defvr -#: doc/guix.texi:9973 -#, no-wrap -msgid "{Scheme Variable} special-files-service-type" -msgstr "{Variable Scheme} special-files-service-type" - -#. type: defvr -#: doc/guix.texi:9976 -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 "C'est le service qui met en place des « fichiers spéciaux » comme @file{/bin/sh} ; une instance de ce service fait partie de @code{%base-services}." - -#. type: defvr -#: doc/guix.texi:9980 -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 "La valeur associée avec les services @code{special-files-service-type} doit être une liste de couples dont le premier élément est le « fichier spécial » et le deuxième sa cible. Par défaut il s'agit de :" - -#. type: file{#1} -#: doc/guix.texi:9981 -#, no-wrap -msgid "/bin/sh" -msgstr "/bin/sh" - -#. type: cindex -#: doc/guix.texi:9982 -#, no-wrap -msgid "@file{sh}, in @file{/bin}" -msgstr "@file{sh}, dans @file{/bin}" - -#. type: example -#: doc/guix.texi:9985 -#, no-wrap -msgid "`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\")))\n" -msgstr "`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\")))\n" - -#. type: file{#1} -#: doc/guix.texi:9987 -#, no-wrap -msgid "/usr/bin/env" -msgstr "/usr/bin/env" - -#. type: cindex -#: doc/guix.texi:9988 -#, no-wrap -msgid "@file{env}, in @file{/usr/bin}" -msgstr "@file{env}, dans @file{/usr/bin}" - -#. type: defvr -#: doc/guix.texi:9991 -msgid "If you want to add, say, @code{/usr/bin/env} to your system, you can change it to:" -msgstr "Si vous voulez ajouter, disons, @code{/usr/bin/env} à votre système, vous pouvez changer cela en :" - -#. type: example -#: doc/guix.texi:9995 -#, no-wrap -msgid "" -"`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\"))\n" -" (\"/usr/bin/env\" ,(file-append @var{coreutils} \"/bin/env\")))\n" -msgstr "" -"`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\"))\n" -" (\"/usr/bin/env\" ,(file-append @var{coreutils} \"/bin/env\")))\n" - -#. type: defvr -#: doc/guix.texi:10002 -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 "Comme il fait parti de @code{%base-services}, vous pouvez utiliser @code{modify-services} pour personnaliser l'ensemble des fichiers spéciaux (@pxref{Service Reference, @code{modify-services}}). Mais une manière plus simple d'ajouter un fichier spécial est d'utiliser la procédure @code{extra-special-file} (voir plus bas)." - -#. type: deffn -#: doc/guix.texi:10004 -#, no-wrap -msgid "{Scheme Procedure} extra-special-file @var{file} @var{target}" -msgstr "{Procédure Scheme} extra-special-file @var{file} @var{target}" - -#. type: deffn -#: doc/guix.texi:10006 -msgid "Use @var{target} as the ``special file'' @var{file}." -msgstr "Utilise @var{target} comme « fichier spécial » @var{file}." - -#. type: deffn -#: doc/guix.texi:10010 -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 "Par exemple, ajouter l'une des lignes suivantes au champ @code{services} de votre déclaration de système d'exploitation crée un lien symbolique @file{/usr/bin/env} :" - -#. type: example -#: doc/guix.texi:10014 -#, no-wrap -msgid "" -"(extra-special-file \"/usr/bin/env\"\n" -" (file-append coreutils \"/bin/env\"))\n" -msgstr "" -"(extra-special-file \"/usr/bin/env\"\n" -" (file-append coreutils \"/bin/env\"))\n" - -#. type: deffn -#: doc/guix.texi:10017 -#, no-wrap -msgid "{Scheme Procedure} host-name-service @var{name}" -msgstr "{Procédure Scheme} host-name-service @var{name}" - -#. type: deffn -#: doc/guix.texi:10019 -msgid "Return a service that sets the host name to @var{name}." -msgstr "Renvoie un service qui paramètre le nom d'hôte à @var{name}." - -#. type: deffn -#: doc/guix.texi:10021 -#, no-wrap -msgid "{Scheme Procedure} login-service @var{config}" -msgstr "{Procédure Scheme} login-service @var{config}" - -#. type: deffn -#: doc/guix.texi:10025 -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 "Renvoie un service pour lancer login en suivant @var{config}, un objet @code{} qui spécifie le message du jour, entre autres choses." - -#. type: deftp -#: doc/guix.texi:10027 -#, no-wrap -msgid "{Data Type} login-configuration" -msgstr "{Type de données} login-configuration" - -#. type: deftp -#: doc/guix.texi:10029 -msgid "This is the data type representing the configuration of login." -msgstr "Le type de données qui représente la configuration de login." - -#. type: code{#1} -#: doc/guix.texi:10032 -#, no-wrap -msgid "motd" -msgstr "motd" - -#. type: cindex -#: doc/guix.texi:10033 -#, no-wrap -msgid "message of the day" -msgstr "message du jour" - -#. type: table -#: doc/guix.texi:10035 -msgid "A file-like object containing the ``message of the day''." -msgstr "Un objet simili-fichier contenant le « message du jour »." - -#. type: item -#: doc/guix.texi:10036 doc/guix.texi:11736 -#, no-wrap -msgid "@code{allow-empty-passwords?} (default: @code{#t})" -msgstr "@code{allow-empty-passwords?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:10039 -msgid "Allow empty passwords by default so that first-time users can log in when the 'root' account has just been created." -msgstr "Permet les mots de passes vides par défaut pour que les utilisateurs puissent se connecter au compte « root » la première fois après sa création." - -#. type: deffn -#: doc/guix.texi:10043 -#, no-wrap -msgid "{Scheme Procedure} mingetty-service @var{config}" -msgstr "{Procédure Scheme} mingetty-service @var{config}" - -#. type: deffn -#: doc/guix.texi:10047 -msgid "Return a service to run mingetty according to @var{config}, a @code{} object, which specifies the tty to run, among other things." -msgstr "Renvoie un service qui lance mingetty en suivant @var{config}, un objet @code{}, qui spécifie le tty à lancer entre autres choses." - -#. type: deftp -#: doc/guix.texi:10049 -#, no-wrap -msgid "{Data Type} mingetty-configuration" -msgstr "{Type de données} mingetty-configuration" - -#. type: deftp -#: doc/guix.texi:10052 -msgid "This is the data type representing the configuration of Mingetty, which provides the default implementation of virtual console log-in." -msgstr "C'est le type de données représentant la configuration de Mingetty, qui fournit l'implémentation par défaut de l'écran de connexion des consoles virtuelles." - -#. type: code{#1} -#: doc/guix.texi:10055 doc/guix.texi:10091 -#, no-wrap -msgid "tty" -msgstr "tty" - -#. type: table -#: doc/guix.texi:10057 -msgid "The name of the console this Mingetty runs on---e.g., @code{\"tty1\"}." -msgstr "Le nom de la console sur laquelle tourne ce Mingetty, p.@: ex.@: @code{\"tty1\"}." - -#. type: item -#: doc/guix.texi:10058 doc/guix.texi:10120 -#, no-wrap -msgid "@code{auto-login} (default: @code{#f})" -msgstr "@code{auto-login} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10062 -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 "Lorsque la valeur est vraie, ce champ doit être une chaîne de caractère dénotant le nom d'utilisateur pour lequel le système se connecte automatiquement. Lorsque la valeur est @code{#f}, il faut entrer un nom d'utilisateur et un mot de passe pour se connecter." - -#. type: item -#: doc/guix.texi:10063 -#, no-wrap -msgid "@code{login-program} (default: @code{#f})" -msgstr "@code{login-program} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10067 -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 "Ce doit être soit @code{#f}, auquel cas le programme de connexion par défaut est utilisé (@command{login} de la suite d'outils Shadow), soit une gexp dénotant le nom d'un programme de connexion." - -#. type: item -#: doc/guix.texi:10068 -#, no-wrap -msgid "@code{login-pause?} (default: @code{#f})" -msgstr "@code{login-pause?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10071 -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 "Lorsque la valeur est @code{#t} en plus de @var{auto-login}, l'utilisateur devrai appuyer sur une touche avant que le shell de connexion ne soit lancé." - -#. type: item -#: doc/guix.texi:10072 -#, no-wrap -msgid "@code{mingetty} (default: @var{mingetty})" -msgstr "@code{mingetty} (par défaut : @var{mingetty})" - -#. type: table -#: doc/guix.texi:10074 -msgid "The Mingetty package to use." -msgstr "Le paquet Mingetty à utiliser." - -#. type: deffn -#: doc/guix.texi:10078 -#, no-wrap -msgid "{Scheme Procedure} agetty-service @var{config}" -msgstr "{Procédure Scheme} agetty-service @var{config}" - -#. type: deffn -#: doc/guix.texi:10082 -msgid "Return a service to run agetty according to @var{config}, an @code{} object, which specifies the tty to run, among other things." -msgstr "Renvoie un service pour lancer agetty en suivant @var{config}, un objet @code{}, qui spécifie le tty à lancer, entre autres choses." - -#. type: deftp -#: doc/guix.texi:10084 -#, no-wrap -msgid "{Data Type} agetty-configuration" -msgstr "{Type de données} agetty-configuration" - -#. type: deftp -#: doc/guix.texi:10088 -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 "Ce type de données représente la configuration de agetty, qui implémente l'écran de connexion des consoles virtuelles et series. Voir la page de manuel de @code{agetty(8)} pour plus d'informations." - -#. type: table -#: doc/guix.texi:10095 -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 "Le nom de la console sur laquelle agetty est lancé p.@: ex.@: @code{\"ttyS0\"}. Cet argument est facultatif, il aura par défaut une valeur raisonnable d'un port série utilisé par le noyau Linux." - -#. type: table -#: doc/guix.texi:10099 -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 "Pour cela, s'il y a une valeur pour une option @code{agetty.tty} sur la ligne de commande du noyau, agetty extraira le nom du périphérique du port série à partir de cette option." - -#. type: table -#: doc/guix.texi:10103 -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 "Sinon et s'il y a une valeur pour une option @code{console} avec un tty sur la ligne de commande du noyau Linux, agetty extraira le nom du périphérique du port série et l'utilisera." - -#. type: table -#: doc/guix.texi:10107 -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 "Dans les deux cas, agetty laissera les autres paramètres du périphérique série (baud, etc) sans y toucher — dans l'espoir que Linux leur a assigné les bonnes valeurs." - -#. type: item -#: doc/guix.texi:10108 -#, no-wrap -msgid "@code{baud-rate} (default: @code{#f})" -msgstr "@code{baud-rate} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10111 -msgid "A string containing a comma-separated list of one or more baud rates, in descending order." -msgstr "Une chaîne qui contient une liste d'un ou plusieurs taux de baud séparés par des virgules, en ordre décroissant." - -#. type: item -#: doc/guix.texi:10112 -#, no-wrap -msgid "@code{term} (default: @code{#f})" -msgstr "@code{term} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10115 -msgid "A string containing the value used for the @code{TERM} environment variable." -msgstr "Une chaîne contenant la valeur utilisée pour la variable d'environnement @code{TERM}." - -#. type: item -#: doc/guix.texi:10116 -#, no-wrap -msgid "@code{eight-bits?} (default: @code{#f})" -msgstr "@code{eight-bits?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10119 -msgid "When @code{#t}, the tty is assumed to be 8-bit clean, and parity detection is disabled." -msgstr "Lorsque la valeur est @code{#t}, le tty est supposé être propre pour les caractères 8-bit et la détection de parité est désactivée." - -#. type: table -#: doc/guix.texi:10123 -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 "Lorsqu'un nom de connexion est passé comme une chaîne de caractères, l'utilisateur spécifié sera automatiquement connecté sans demande du nom d'utilisateur ni du mot de passe." - -#. type: item -#: doc/guix.texi:10124 -#, no-wrap -msgid "@code{no-reset?} (default: @code{#f})" -msgstr "@code{no-reset?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10126 -msgid "When @code{#t}, don't reset terminal cflags (control modes)." -msgstr "Lorsque la valeur est @code{#t}, ne vide pas les cflags du terminal (modes de contrôle)." - -#. type: item -#: doc/guix.texi:10127 -#, no-wrap -msgid "@code{host} (default: @code{#f})" -msgstr "@code{host} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10130 -msgid "This accepts a string containing the \"login_host\", which will be written into the @file{/var/run/utmpx} file." -msgstr "Cette option accepte une chaîne contenant le « login_host », qui sera écrit dans le fichier @file{/var/run/utmpx}." - -#. type: item -#: doc/guix.texi:10131 -#, no-wrap -msgid "@code{remote?} (default: @code{#f})" -msgstr "@code{remote?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10135 -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 "Lorsque la valeur est @code{#t} en plus de @var{host}, cette option ajoutera une option fakehost @code{-r} à la ligne de commande du programme de connexion spécifié dans @var{login-program}." - -#. type: item -#: doc/guix.texi:10136 -#, no-wrap -msgid "@code{flow-control?} (default: @code{#f})" -msgstr "@code{flow-control?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10138 -msgid "When set to @code{#t}, enable hardware (RTS/CTS) flow control." -msgstr "Lorsque la valeur est @code{#t}, active le contrôle de flux matériel (RTS/CTS)." - -#. type: item -#: doc/guix.texi:10139 -#, no-wrap -msgid "@code{no-issue?} (default: @code{#f})" -msgstr "@code{no-issue?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10142 -msgid "When set to @code{#t}, the contents of the @file{/etc/issue} file will not be displayed before presenting the login prompt." -msgstr "Lorsque la valeur est @code{#t}, le contenu du fichier @file{/etc/issue} ne sera pas affiché avant de présenter l'écran de connexion." - -#. type: item -#: doc/guix.texi:10143 -#, no-wrap -msgid "@code{init-string} (default: @code{#f})" -msgstr "@code{init-string} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10146 -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 "Cette option accepte une chaîne de caractères qui sera envoyée au tty ou au modem avant toute autre chose. Elle peut être utilisée pour initialiser un modem." - -#. type: item -#: doc/guix.texi:10147 -#, no-wrap -msgid "@code{no-clear?} (default: @code{#f})" -msgstr "@code{no-clear?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10150 -msgid "When set to @code{#t}, agetty will not clear the screen before showing the login prompt." -msgstr "Lorsque la valeur est @code{#t}, agetty ne nettoiera pas l'écran avant de montrer l'écran de connexion." - -#. type: item -#: doc/guix.texi:10151 -#, no-wrap -msgid "@code{login-program} (default: (file-append shadow \"/bin/login\"))" -msgstr "@code{login-program} (par défaut : (file-append shadow \"/bin/login\"))" - -#. type: table -#: doc/guix.texi:10155 -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 "Cette option doit être soit une gexp dénotant le nom d'un programme de connexion, soit non définie, auquel cas la valeur par défaut est la commande @command{login} de la suite d'outils Shadow." - -#. type: item -#: doc/guix.texi:10156 -#, no-wrap -msgid "@code{local-line} (default: @code{#f})" -msgstr "@code{local-line} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10160 -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 "Contrôle le drapeau CLOCAL. Cette option accepte l'un des trois symboles comme argument, @code{'auto}, @code{'always} ou @code{'never}. Si la valeur est @code{#f}, la valeur par défaut choisie par agetty est @code{'auto}…" - -#. type: item -#: doc/guix.texi:10161 -#, no-wrap -msgid "@code{extract-baud?} (default: @code{#f})" -msgstr "@code{extract-baud?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10164 -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 "Lorsque la valeur est @code{#t}, dit à agetty d'essayer d'extraire la taux de baud depuis les messages de statut produits par certains modems." - -#. type: item -#: doc/guix.texi:10165 -#, no-wrap -msgid "@code{skip-login?} (default: @code{#f})" -msgstr "@code{skip-login?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10169 -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 "Lorsque la valeur est @code{#t}, ne demande par de nom d'utilisateur. Elle peut être utilisée avec le champ @var{login-program} pour utiliser des systèmes de connexion non standards." - -#. type: item -#: doc/guix.texi:10170 -#, no-wrap -msgid "@code{no-newline?} (default: @code{#f})" -msgstr "@code{no-newline?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10173 -msgid "When set to @code{#t}, do not print a newline before printing the @file{/etc/issue} file." -msgstr "Lorsque la valeur est @code{#t}, n'affiche pas de retour à la ligne avant d'afficher le fichier @file{/etc/issue}." - -#. type: item -#: doc/guix.texi:10175 -#, no-wrap -msgid "@code{login-options} (default: @code{#f})" -msgstr "@code{login-options} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10180 -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 "Cette option accepte une chaîne de caractères contenant des options passées au programme login. Lorsqu'utilisé avec @var{login-program}, soyez conscient qu'un utilisateur malicieux pourrait essayer de rentrer un nom d'utilisateur contenant des options incluses qui pourraient être analysées par le programme de connexion." - -#. type: item -#: doc/guix.texi:10181 -#, no-wrap -msgid "@code{login-pause} (default: @code{#f})" -msgstr "@code{login-pause} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10185 -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 "Lorsque la valeur est @code{#t}, attend qu'une touche soit appuyée avant de montrer l'écran de connexion. Cela peut être utilisé avec @var{auto-login} pour sauvegarder de la mémoire en lançant les shells de manière fainéante." - -#. type: item -#: doc/guix.texi:10186 -#, no-wrap -msgid "@code{chroot} (default: @code{#f})" -msgstr "@code{chroot} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10189 -msgid "Change root to the specified directory. This option accepts a directory path as a string." -msgstr "Change de racine dans le répertoire donné. Cette option accepte un chemin en tant que chaîne de caractères." - -#. type: item -#: doc/guix.texi:10190 -#, no-wrap -msgid "@code{hangup?} (default: @code{#f})" -msgstr "@code{hangup?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10193 -msgid "Use the Linux system call @code{vhangup} to do a virtual hangup of the specified terminal." -msgstr "Utilise l'appel système Linux @code{vhangup} pour raccrocher virtuellement le terminal spécifié." - -#. type: item -#: doc/guix.texi:10194 -#, no-wrap -msgid "@code{keep-baud?} (default: @code{#f})" -msgstr "@code{keep-baud?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10198 -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 "Lorsque la valeur est @code{#t}, essaye de garder le taux de baud existant. Les taux de baud de @var{baud-rate} sont utilisés lorsque agetty reçoit un caractères @key{BREAK}." - -#. type: item -#: doc/guix.texi:10199 -#, no-wrap -msgid "@code{timeout} (default: @code{#f})" -msgstr "@code{timeout} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10202 -msgid "When set to an integer value, terminate if no user name could be read within @var{timeout} seconds." -msgstr "Lorsque la valeur est un nombre entier, termine la session si aucun nom d'utilisateur n'a pu être lu après @var{timeout} secondes." - -#. type: item -#: doc/guix.texi:10203 -#, no-wrap -msgid "@code{detect-case?} (default: @code{#f})" -msgstr "@code{detect-case?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10209 -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 "Lorsque la valeur est @code{#t}, active le support pour la détection des terminaux en majuscule uniquement. Ce paramètre détectera qu'un nom d'utilisateur qui ne contient que des majuscules indique un terminal en majuscule et effectuera des conversion de majuscule en minuscule. Remarquez que cela ne fonctionne pas avec les caractères unicode." - -#. type: item -#: doc/guix.texi:10210 -#, no-wrap -msgid "@code{wait-cr?} (default: @code{#f})" -msgstr "@code{wait-cr?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10215 -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 "Lorsque la valeur est @code{#t}, attend que l'utilisateur ou le modem envoie un retour chariot ou un saut de ligne avant d'afficher @file{/etc/issue} ou l'écran de connexion. Cela est typiquement utilisé avec l'option @var{init-string}." - -#. type: item -#: doc/guix.texi:10216 -#, no-wrap -msgid "@code{no-hints?} (default: @code{#f})" -msgstr "@code{no-hints?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10219 -msgid "When set to @code{#t}, do not print hints about Num, Caps, and Scroll locks." -msgstr "Lorsque la valeur est @code{#t}, n'affiche par les astuces à propos des verrouillages numériques, majuscule et défilement." - -#. type: item -#: doc/guix.texi:10220 -#, no-wrap -msgid "@code{no-hostname?} (default: @code{#f})" -msgstr "@code{no-hostname?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10223 -msgid "By default, the hostname is printed. When this option is set to @code{#t}, no hostname will be shown at all." -msgstr "Par défaut, le nom d'hôte est affiché. Lorsque la valeur est @code{#t}, aucun nom d'hôte ne sera affiché." - -#. type: item -#: doc/guix.texi:10224 -#, no-wrap -msgid "@code{long-hostname?} (default: @code{#f})" -msgstr "@code{long-hostname?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10228 -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 "Par défaut, le nom d'hôte n'est affiché qu'après le premier point. Lorsque la valeur est @code{#t}, le nom d'hôte pleinement qualifié renvoyé par @code{gethostname} ou @code{getaddrinfo} sera affiché." - -#. type: item -#: doc/guix.texi:10229 -#, no-wrap -msgid "@code{erase-characters} (default: @code{#f})" -msgstr "@code{erase-characters} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10232 -msgid "This option accepts a string of additional characters that should be interpreted as backspace when the user types their login name." -msgstr "Cette option accepte une chaîne de caractères de caractères supplémentaires qui devraient être interprétés comme des effacements lorsque l'utilisateur les tape dans leur nom d'utilisateur." - -#. type: item -#: doc/guix.texi:10233 -#, no-wrap -msgid "@code{kill-characters} (default: @code{#f})" -msgstr "@code{kill-characters} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10237 -msgid "This option accepts a string that should be interpreted to mean \"ignore all previous characters\" (also called a \"kill\" character) when the types their login name." -msgstr "Cette option accepte une chaîne de caractères qui devrait être interprété comme signifiant « ignore tous les caractères précédent » (aussi appelé un caractère « kill ») lorsque l'utilisateur tape son nom d'utilisateur." - -#. type: item -#: doc/guix.texi:10238 -#, no-wrap -msgid "@code{chdir} (default: @code{#f})" -msgstr "@code{chdir} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10241 -msgid "This option accepts, as a string, a directory path that will be changed to before login." -msgstr "Cette option accepte, en tant que chaîne de caractères, un chemin vers un répertoire dans lequel se trouvera la commande avant la connexion." - -#. type: item -#: doc/guix.texi:10242 -#, no-wrap -msgid "@code{delay} (default: @code{#f})" -msgstr "@code{delay} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10245 -msgid "This options accepts, as an integer, the number of seconds to sleep before opening the tty and displaying the login prompt." -msgstr "Cette option accepte, en tant qu'entier, le nombre de secondes à attendre avant d'ouvrir le tty et afficher l'écran de connexion." - -#. type: item -#: doc/guix.texi:10246 -#, no-wrap -msgid "@code{nice} (default: @code{#f})" -msgstr "@code{nice} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10249 -msgid "This option accepts, as an integer, the nice value with which to run the @command{login} program." -msgstr "Cette option accepte, en tant qu'entier, la valeur « nice » avec laquelle le programme @command{login} tourne." - -#. type: item -#: doc/guix.texi:10250 doc/guix.texi:10450 -#, no-wrap -msgid "@code{extra-options} (default: @code{'()})" -msgstr "@code{extra-options} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:10253 -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 "Cette option fournie un « mécanisme de secours » pour que l'utilisateur puisse ajouter des arguments de la ligne de commande arbitraires à @command{agetty} comme une liste de chaînes de caractères." - -#. type: deffn -#: doc/guix.texi:10257 -#, no-wrap -msgid "{Scheme Procedure} kmscon-service-type @var{config}" -msgstr "{Procédure Scheme} kmscon-service-type @var{config}" - -#. type: deffn -#: doc/guix.texi:10261 -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 "Renvoie un service qui lance @uref{https://www.freedesktop.org/wiki/Software/kmscon,kmscon} d'après @var{config}, un objet @code{}, qui spécifie le tty sur lequel tourner, entre autres choses." - -#. type: deftp -#: doc/guix.texi:10263 -#, no-wrap -msgid "{Data Type} kmscon-configuration" -msgstr "{Type de données} kmscon-configuration" - -#. type: deftp -#: doc/guix.texi:10266 -msgid "This is the data type representing the configuration of Kmscon, which implements virtual console log-in." -msgstr "C'est le type de données représentant la configuration de Kscon, qui implémente l'écran de chargement de la console virtuelle." - -#. type: code{#1} -#: doc/guix.texi:10269 -#, no-wrap -msgid "virtual-terminal" -msgstr "virtual-terminal" - -#. type: table -#: doc/guix.texi:10271 -msgid "The name of the console this Kmscon runs on---e.g., @code{\"tty1\"}." -msgstr "Le nom de la console sur laquelle Kmscon tourne, p.@: ex.@: @code{\"tty1\"}." - -#. type: item -#: doc/guix.texi:10272 -#, no-wrap -msgid "@code{login-program} (default: @code{#~(string-append #$shadow \"/bin/login\")})" -msgstr "@code{login-program} (par défaut : @code{#~(string-append #$shadow \"/bin/login\")})" - -#. type: table -#: doc/guix.texi:10275 -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 "Une gexp qui dénote le nom d'un programme de connexion. le programme de connexion par défaut est @command{login} de la suite d'outils Shadow." - -#. type: item -#: doc/guix.texi:10276 -#, no-wrap -msgid "@code{login-arguments} (default: @code{'(\"-p\")})" -msgstr "@code{login-arguments} (par défaut : @code{'(\"-p\")})" - -#. type: table -#: doc/guix.texi:10278 -msgid "A list of arguments to pass to @command{login}." -msgstr "Une liste d'arguments à passer à @command{login}." - -#. type: item -#: doc/guix.texi:10279 -#, no-wrap -msgid "@code{hardware-acceleration?} (default: #f)" -msgstr "@code{hardware-acceleration?} (par défaut : #f)" - -#. type: table -#: doc/guix.texi:10281 -msgid "Whether to use hardware acceleration." -msgstr "S'il faut utiliser l'accélération matérielle." - -#. type: item -#: doc/guix.texi:10282 -#, no-wrap -msgid "@code{kmscon} (default: @var{kmscon})" -msgstr "@code{kmscon} (par défaut : @var{kmscon})" - -#. type: table -#: doc/guix.texi:10284 -msgid "The Kmscon package to use." -msgstr "Le paquet Kmscon à utiliser." - -#. type: cindex -#: doc/guix.texi:10288 -#, no-wrap -msgid "name service cache daemon" -msgstr "name service cache daemon" - -#. type: cindex -#: doc/guix.texi:10289 -#, no-wrap -msgid "nscd" -msgstr "nscd" - -#. type: deffn -#: doc/guix.texi:10290 -#, no-wrap -msgid "{Scheme Procedure} nscd-service [@var{config}] [#:glibc glibc] @" -msgstr "{Procédure Scheme} nscd-service [@var{config}] [#:glibc glibc] @" - -#. type: deffn -#: doc/guix.texi:10295 -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 "" -"[#:name-services '()]\n" -"Renvoie un service qui lance le démon de cache de services de noms de la libc (nscd) avec la @var{config} donnée — un objet @code{}. @xref{Name Service Switch}, pour un exemple." - -#. type: defvr -#: doc/guix.texi:10297 -#, no-wrap -msgid "{Scheme Variable} %nscd-default-configuration" -msgstr "{Variable Scheme} %nscd-default-configuration" - -#. type: defvr -#: doc/guix.texi:10301 -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 "C'est la valeur par défaut de @code{} (voir plus bas) utilisée par @code{nscd-service}. Elle utilise les caches définis par @var{%nscd-default-caches} ; voir plus bas." - -#. type: deftp -#: doc/guix.texi:10303 -#, no-wrap -msgid "{Data Type} nscd-configuration" -msgstr "{Type de données} nscd-configuration" - -#. type: deftp -#: doc/guix.texi:10306 -msgid "This is the data type representing the name service cache daemon (nscd) configuration." -msgstr "C'est le type de données qui représente la configuration du démon de cache de services de noms (nscd)." - -#. type: item -#: doc/guix.texi:10309 -#, no-wrap -msgid "@code{name-services} (default: @code{'()})" -msgstr "@code{name-services} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:10312 -msgid "List of packages denoting @dfn{name services} that must be visible to the nscd---e.g., @code{(list @var{nss-mdns})}." -msgstr "Liste des paquets dénotant des @dfn{services de noms} qui doivent être visible pour nscd, p.@: ex.@: @code{(list @var{nss-mdns})}." - -#. type: item -#: doc/guix.texi:10313 -#, no-wrap -msgid "@code{glibc} (default: @var{glibc})" -msgstr "@code{glibc} (par défaut : @var{glibc})" - -#. type: table -#: doc/guix.texi:10316 -msgid "Package object denoting the GNU C Library providing the @command{nscd} command." -msgstr "Objet de paquet qui dénote la Biblothèque C de GNU qui fournit la commande @command{nscd}." - -#. type: item -#: doc/guix.texi:10317 -#, no-wrap -msgid "@code{log-file} (default: @code{\"/var/log/nscd.log\"})" -msgstr "@code{log-file} (par défaut : @code{\"/var/log/nscd.log\"})" - -#. type: table -#: doc/guix.texi:10320 -msgid "Name of the nscd log file. This is where debugging output goes when @code{debug-level} is strictly positive." -msgstr "Nom du fichier journal de nscd. C'est là que les sorties de débogage sont envoyée lorsque @code{debug-level} est strictement positif." - -#. type: item -#: doc/guix.texi:10321 -#, no-wrap -msgid "@code{debug-level} (default: @code{0})" -msgstr "@code{debug-level} (par défaut : @code{0})" - -#. type: table -#: doc/guix.texi:10324 -msgid "Integer denoting the debugging levels. Higher numbers mean that more debugging output is logged." -msgstr "Entier qui dénote le niveau de débogage. Les entiers les plus grands signifient plus de sortie de débogage." - -#. type: item -#: doc/guix.texi:10325 -#, no-wrap -msgid "@code{caches} (default: @var{%nscd-default-caches})" -msgstr "@code{caches} (par défaut : @var{%nscd-default-caches})" - -#. type: table -#: doc/guix.texi:10328 -msgid "List of @code{} objects denoting things to be cached; see below." -msgstr "Liste d'objets @code{} qui dénotent des choses à mettre en cache ; voir plus bas." - -#. type: deftp -#: doc/guix.texi:10332 -#, no-wrap -msgid "{Data Type} nscd-cache" -msgstr "{Type de données} nscd-cache" - -#. type: deftp -#: doc/guix.texi:10334 -msgid "Data type representing a cache database of nscd and its parameters." -msgstr "Type de données représentant une base de données de cache de nscd et ses paramètres." - -#. type: cindex -#: doc/guix.texi:10337 doc/guix.texi:13172 -#, no-wrap -msgid "database" -msgstr "database" - -#. type: table -#: doc/guix.texi:10342 -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 "C'est un symbole qui représente le nom de la base de donnée à mettre en cache. Les valeurs valide sont @code{passwd}, @code{group}, @code{hosts} et @code{services} qui désignent les bases de données NSS correspondantes (@pxref{NSS Basics,,, libc, The GNU C Library Reference Manual})." - -#. type: code{#1} -#: doc/guix.texi:10343 -#, no-wrap -msgid "positive-time-to-live" -msgstr "positive-time-to-live" - -#. type: itemx -#: doc/guix.texi:10344 -#, no-wrap -msgid "@code{negative-time-to-live} (default: @code{20})" -msgstr "@code{negative-time-to-live} (par défaut : @code{20})" - -#. type: table -#: doc/guix.texi:10347 -msgid "A number representing the number of seconds during which a positive or negative lookup result remains in cache." -msgstr "Un entier qui représente le nombre de secondes pendant lesquelles un résultat positif ou négatif reste en cache." - -#. type: item -#: doc/guix.texi:10348 -#, no-wrap -msgid "@code{check-files?} (default: @code{#t})" -msgstr "@code{check-files?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:10351 -msgid "Whether to check for updates of the files corresponding to @var{database}." -msgstr "Indique s'il faut vérifier des mises à jours dans les fichiers correspondant à @var{database}." - -#. type: table -#: doc/guix.texi:10355 -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 "Par exemple, lorsque @var{database} est @code{hosts}, ce drapeau indique à nscd de vérifier s'il y a des mises à jour de @file{/etc/hosts} et de les prendre en compte." - -#. type: item -#: doc/guix.texi:10356 -#, no-wrap -msgid "@code{persistent?} (default: @code{#t})" -msgstr "@code{persistent?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:10358 -msgid "Whether the cache should be stored persistently on disk." -msgstr "Indique si le cache devrait être stocké de manière persistante sur le disque." - -#. type: item -#: doc/guix.texi:10359 -#, no-wrap -msgid "@code{shared?} (default: @code{#t})" -msgstr "@code{shared?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:10361 -msgid "Whether the cache should be shared among users." -msgstr "Indique si le cache devrait être partagé entre les utilisateurs." - -#. type: item -#: doc/guix.texi:10362 -#, no-wrap -msgid "@code{max-database-size} (default: 32@tie{}MiB)" -msgstr "@code{max-database-size} (par défaut : 32@tie{}MiB)" - -#. type: table -#: doc/guix.texi:10364 -msgid "Maximum size in bytes of the database cache." -msgstr "Taille maximale en octets de la base de données en cache." - -#. type: defvr -#: doc/guix.texi:10371 -#, no-wrap -msgid "{Scheme Variable} %nscd-default-caches" -msgstr "{Variable Scheme} %nscd-default-caches" - -#. type: defvr -#: doc/guix.texi:10374 -msgid "List of @code{} objects used by default by @code{nscd-configuration} (see above)." -msgstr "Liste d'objets @code{} utilisés par défaut par @code{nscd-configuration} (voir plus haut)." - -#. type: defvr -#: doc/guix.texi:10380 -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 "Elle active la mise en cache persistante et agressive des recherches de services et de noms d'hôtes. Ces derniers fournissent une recherche de noms d'hôtes plus performante, résiliente face à des serveurs de noms peu fiables et une protection de votre vie privée plus efficace — souvent le résultat des recherches de noms d'hôtes sont dans le cache local, donc les serveurs de nom externes n'ont même pas besoin d'être questionnés." - -#. type: anchor{#1} -#: doc/guix.texi:10383 -msgid "syslog-configuration-type" -msgstr "syslog-configuration-type" - -#. type: cindex -#: doc/guix.texi:10383 doc/guix.texi:10399 -#, no-wrap -msgid "syslog" -msgstr "syslog" - -#. type: cindex -#: doc/guix.texi:10384 doc/guix.texi:10833 -#, no-wrap -msgid "logging" -msgstr "logging" - -#. type: deftp -#: doc/guix.texi:10385 -#, no-wrap -msgid "{Data Type} syslog-configuration" -msgstr "{Type de données} syslog-configuration" - -#. type: deftp -#: doc/guix.texi:10387 -msgid "This data type represents the configuration of the syslog daemon." -msgstr "Ce type de données représente la configuration du démon syslog." - -#. type: item -#: doc/guix.texi:10389 -#, no-wrap -msgid "@code{syslogd} (default: @code{#~(string-append #$inetutils \"/libexec/syslogd\")})" -msgstr "@code{syslogd} (par défaut : @code{#~(string-append #$inetutils \"/libexec/syslogd\")})" - -#. type: table -#: doc/guix.texi:10391 -msgid "The syslog daemon to use." -msgstr "Le démon syslog à utiliser." - -#. type: item -#: doc/guix.texi:10392 -#, no-wrap -msgid "@code{config-file} (default: @code{%default-syslog.conf})" -msgstr "@code{config-file} (par défaut : @code{%default-syslog.conf})" - -#. type: table -#: doc/guix.texi:10394 -msgid "The syslog configuration file to use." -msgstr "Le fichier de configuration de syslog à utiliser." - -#. type: anchor{#1} -#: doc/guix.texi:10399 -msgid "syslog-service" -msgstr "syslog-service" - -#. type: deffn -#: doc/guix.texi:10400 -#, no-wrap -msgid "{Scheme Procedure} syslog-service @var{config}" -msgstr "{Procédure Scheme} syslog-service @var{config}" - -#. type: deffn -#: doc/guix.texi:10402 -msgid "Return a service that runs a syslog daemon according to @var{config}." -msgstr "Renvoie un service qui lance un démon syslog en suivant @var{config}." - -#. type: deffn -#: doc/guix.texi:10405 -msgid "@xref{syslogd invocation,,, inetutils, GNU Inetutils}, for more information on the configuration file syntax." -msgstr "@xref{syslogd invocation,,, inetutils, GNU Inetutils}, pour plus d'informations sur la syntaxe du fichier de configuration." - -#. type: anchor{#1} -#: doc/guix.texi:10408 -msgid "guix-configuration-type" -msgstr "guix-configuration-type" - -#. type: deftp -#: doc/guix.texi:10408 -#, no-wrap -msgid "{Data Type} guix-configuration" -msgstr "{Type de données} guix-configuration" - -#. type: deftp -#: doc/guix.texi:10411 -msgid "This data type represents the configuration of the Guix build daemon. @xref{Invoking guix-daemon}, for more information." -msgstr "Ce type de données représente la configuration du démon de construction de Guix. @xref{Invoking guix-daemon} pour plus d'informations." - -#. type: item -#: doc/guix.texi:10413 -#, no-wrap -msgid "@code{guix} (default: @var{guix})" -msgstr "@code{guix} (par défaut : @var{guix})" - -#. type: table -#: doc/guix.texi:10415 doc/guix.texi:10659 -msgid "The Guix package to use." -msgstr "Le paquet Guix à utiliser." - -#. type: item -#: doc/guix.texi:10416 -#, no-wrap -msgid "@code{build-group} (default: @code{\"guixbuild\"})" -msgstr "@code{build-group} (par défaut : @code{\"guixbuild\"})" - -#. type: table -#: doc/guix.texi:10418 -msgid "Name of the group for build user accounts." -msgstr "Nom du groupe des comptes utilisateurs de construction." - -#. type: item -#: doc/guix.texi:10419 -#, no-wrap -msgid "@code{build-accounts} (default: @code{10})" -msgstr "@code{build-accounts} (par défaut : @code{10})" - -#. type: table -#: doc/guix.texi:10421 -msgid "Number of build user accounts to create." -msgstr "Nombre de comptes utilisateurs de construction à créer." - -#. type: item -#: doc/guix.texi:10422 -#, no-wrap -msgid "@code{authorize-key?} (default: @code{#t})" -msgstr "@code{authorize-key?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:10427 -msgid "Whether to authorize the substitute keys listed in @code{authorized-keys}---by default that of @code{hydra.gnu.org} (@pxref{Substitutes})." -msgstr "Autoriser ou non les clefs de substituts listées dans @code{authorize-keys} — par défaut celle de @code{hydra.gny.org} (@pxref{Substituts})." - -#. type: vindex -#: doc/guix.texi:10428 -#, no-wrap -msgid "%default-authorized-guix-keys" -msgstr "%default-authorized-guix-keys" - -#. type: item -#: doc/guix.texi:10429 -#, no-wrap -msgid "@code{authorized-keys} (default: @var{%default-authorized-guix-keys})" -msgstr "@code{authorized-keys} (par défaut : @var{%default-authorized-guix-keys})" - -#. type: table -#: doc/guix.texi:10433 -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{hydra.gnu.org} (@pxref{Substitutes})." -msgstr "La liste des fichiers de clefs autorisées pour les imports d'archives, en tant que liste de gexps sous forme de chaînes (@pxref{Invoking guix archive}). Par défaut, elle contient celle de @code{hydra.gnu.org} (@pxref{Substituts})." - -#. type: item -#: doc/guix.texi:10434 -#, no-wrap -msgid "@code{use-substitutes?} (default: @code{#t})" -msgstr "@code{use-substitutes?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:10436 -msgid "Whether to use substitutes." -msgstr "S'il faut utiliser les substituts." - -#. type: item -#: doc/guix.texi:10437 -#, no-wrap -msgid "@code{substitute-urls} (default: @var{%default-substitute-urls})" -msgstr "@code{substitute-urls} (par défaut : @var{%default-substitute-urls})" - -#. type: table -#: doc/guix.texi:10439 -msgid "The list of URLs where to look for substitutes by default." -msgstr "La liste des URL où trouver des substituts par défaut." - -#. type: item -#: doc/guix.texi:10440 -#, no-wrap -msgid "@code{max-silent-time} (default: @code{0})" -msgstr "@code{max-silent-time} (par défaut : @code{0})" - -#. type: itemx -#: doc/guix.texi:10441 -#, no-wrap -msgid "@code{timeout} (default: @code{0})" -msgstr "@code{timeout} (par défaut : @code{0})" - -#. type: table -#: doc/guix.texi:10445 -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 "Le nombre de secondes de silence et le nombre de secondes d'inactivité, respectivement, après lesquelles un processus de construction son délai d'attente. Une valeur de zéro désactive le délai d'attente." - -#. type: item -#: doc/guix.texi:10446 -#, no-wrap -msgid "@code{log-compression} (default: @code{'bzip2})" -msgstr "@code{log-compression} (par défaut : @code{'bzip2})" - -#. type: table -#: doc/guix.texi:10449 -msgid "The type of compression used for build logs---one of @code{gzip}, @code{bzip2}, or @code{none}." -msgstr "Le type de compression utilisé par les journaux de construction — parmi @code{gzip}, @code{bzip2} et @code{none}." - -#. type: table -#: doc/guix.texi:10452 -msgid "List of extra command-line options for @command{guix-daemon}." -msgstr "Liste d'options supplémentaires de la ligne de commande pour @command{guix-daemon}." - -#. type: item -#: doc/guix.texi:10453 -#, no-wrap -msgid "@code{log-file} (default: @code{\"/var/log/guix-daemon.log\"})" -msgstr "@code{log-file} (par défaut : @code{\"/var/log/guix-daemon.log\"})" - -#. type: table -#: doc/guix.texi:10456 -msgid "File where @command{guix-daemon}'s standard output and standard error are written." -msgstr "Le fichier où les sorties standard et d'erreur de @command{guix-daemon} sont écrites." - -#. type: item -#: doc/guix.texi:10457 -#, no-wrap -msgid "@code{http-proxy} (default: @code{#f})" -msgstr "@code{http-proxy} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10460 -msgid "The HTTP proxy used for downloading fixed-output derivations and substitutes." -msgstr "Le serveur mandataire HTTP à utiliser pour télécharger les dérivations à sortie fixe et les substituts." - -#. type: item -#: doc/guix.texi:10461 -#, no-wrap -msgid "@code{tmpdir} (default: @code{#f})" -msgstr "@code{tmpdir} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10463 -msgid "A directory path where the @command{guix-daemon} will perform builds." -msgstr "Un répertoire où @command{guix-daemon} effectuera ses constructions." - -#. type: deffn -#: doc/guix.texi:10467 -#, no-wrap -msgid "{Scheme Procedure} guix-service @var{config}" -msgstr "{Procédure Scheme} guix-service @var{config}" - -#. type: deffn -#: doc/guix.texi:10470 -msgid "Return a service that runs the Guix build daemon according to @var{config}." -msgstr "Renvoie un service qui fait tourner le démon de construction de Guix en suivant @var{config}." - -#. type: deffn -#: doc/guix.texi:10472 -#, no-wrap -msgid "{Scheme Procedure} udev-service [#:udev @var{eudev} #:rules @code{'()}]" -msgstr "{Procédure Scheme} udev-service [#:udev @var{eudev} #:rules @code{'()}]" - -#. type: deffn -#: doc/guix.texi:10477 -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 @var{udev-rule} and @var{file->udev-rule} from @code{(gnu services base)} simplify the creation of such rule files." -msgstr "Lance @var{udev}, qui rempli le répertoire @file{/dev} dynamiquement. Les règles udev peuvent être fournies comme une liste de fichier via la variable @var{rules}. Les procédures @var{udev-rule} et @var{file->udev-rule} de @code{(gnu services base)} simplifient la création de ces fichiers de règle." - -#. type: deffn -#: doc/guix.texi:10478 -#, no-wrap -msgid "{Scheme Procedure} udev-rule [@var{file-name} @var{contents}]" -msgstr "{Procédure Scheme} udev-rule [@var{file-name} @var{contents}]" - -#. type: deffn -#: doc/guix.texi:10481 -msgid "Return a udev-rule file named @var{file-name} containing the rules defined by the @var{contents} literal." -msgstr "Renvoie un fichier de règle udev nommé @var{file-name} contenant les règles définie par le litéral @var{contents}." - -#. type: deffn -#: doc/guix.texi:10485 -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 "Dans l'exemple suivant, on définie une règle pour un périphérique USB qui sera stockée dans le fichier @file{90-usb-thing.rules}. La règle lance un script à la détection du périphérique USB avec l'identifiant de produit donné." - -#. type: example -#: doc/guix.texi:10493 -#, no-wrap +#: guix/scripts/import.scm:86 msgid "" -"(define %example-udev-rule\n" -" (udev-rule\n" -" \"90-usb-thing.rules\"\n" -" (string-append \"ACTION==\\\"add\\\", SUBSYSTEM==\\\"usb\\\", \"\n" -" \"ATTR@{product@}==\\\"Example\\\", \"\n" -" \"RUN+=\\\"/path/to/script\\\"\")))\n" +"Usage: guix import IMPORTER ARGS ...\n" +"Run IMPORTER with ARGS.\n" msgstr "" -"(define %example-udev-rule\n" -" (udev-rule\n" -" \"90-usb-thing.rules\"\n" -" (string-append \"ACTION==\\\"add\\\", SUBSYSTEM==\\\"usb\\\", \"\n" -" \"ATTR@{product@}==\\\"Example\\\", \"\n" -" \"RUN+=\\\"/path/to/script\\\"\")))\n" - -#. type: deffn -#: doc/guix.texi:10497 -msgid "Here we show how the default @var{udev-service} can be extended with it." -msgstr "Ici on montre comment le service @var{udev-service} par défaut peut être étendu avec cette règle." - -#. type: example -#: doc/guix.texi:10507 -#, no-wrap +"Usage : guix import IMPORTATEUR ARGS...\n" +"Lancer IMPORTATEUR avec ARGS.\n" + +#: guix/scripts/import.scm:89 +msgid "IMPORTER must be one of the importers listed below:\n" +msgstr "IMPORTATEUR doit être un des importateurs listés ci-dessous:\n" + +#: guix/scripts/import.scm:103 +#, scheme-format +msgid "guix import: missing importer name~%" +msgstr "guix import: nom d'importateur manquant~%" + +#: guix/scripts/import.scm:123 +#, scheme-format +msgid "'~a' import failed~%" +msgstr "l'importateur « ~a » a échoué~%" + +#: guix/scripts/import.scm:124 +#, scheme-format +msgid "~a: invalid importer~%" +msgstr "~a : importateur non valide~%" + +#: guix/scripts/import/cran.scm:43 msgid "" -"(operating-system\n" -" ;; @dots{}\n" -" (services\n" -" (modify-services %desktop-services\n" -" (udev-service-type config =>\n" -" (udev-configuration (inherit config)\n" -" (rules (append (udev-configuration-rules config)\n" -" (list %example-udev-rule))))))))\n" +"Usage: guix import cran PACKAGE-NAME\n" +"Import and convert the CRAN package for PACKAGE-NAME.\n" msgstr "" -"(operating-system\n" -" ;; @dots{}\n" -" (services\n" -" (modify-services %desktop-services\n" -" (udev-service-type config =>\n" -" (udev-configuration (inherit config)\n" -" (rules (append (udev-configuration-rules config)\n" -" (list %example-udev-rule))))))))\n" - -#. type: deffn -#: doc/guix.texi:10509 -#, no-wrap -msgid "{Scheme Procedure} file->udev-rule [@var{file-name} @var{file}]" -msgstr "{Procédure Scheme} file->udev-rule [@var{file-name} @var{file}]" - -#. type: deffn -#: doc/guix.texi:10512 -msgid "Return a udev file named @var{file-name} containing the rules defined within @var{file}, a file-like object." -msgstr "Renvoie un fichier udev nommé @var{file-name} contenant les règles définies dans @var{file}, un objet simili-fichier." - -#. type: deffn -#: doc/guix.texi:10514 -msgid "The following example showcases how we can use an existing rule file." -msgstr "L'exemple suivant montre comment utiliser un fichier de règles existant." - -#. type: example -#: doc/guix.texi:10519 -#, no-wrap +"Usage : guix import cran NOM-DU-PAQUET\n" +"Importer et convertir le paquet CAN pour NOM-DU-PAQUET.\n" + +#: guix/scripts/import/cran.scm:45 msgid "" -"(use-modules (guix download) ;for url-fetch\n" -" (guix packages) ;for origin\n" -" ;; @dots{})\n" "\n" +" -a, --archive=ARCHIVE specify the archive repository" msgstr "" -"(use-modules (guix download) ;pour url-fetch\n" -" (guix packages) ;pour origin\n" -" ;; @dots{})\n" "\n" +" -a, --archive=ARCHIVE spécifier le dépôt de l'archive" -#. type: example -#: doc/guix.texi:10530 -#, no-wrap +#: guix/scripts/import/cran.scm:110 +#, scheme-format +msgid "failed to download description for package '~a'~%" +msgstr "échec lors du téléchargement de la description du paquet « ~a »~%" + +#: guix/scripts/import/cran.scm:114 guix/scripts/import/elpa.scm:113 +#, scheme-format +msgid "too few arguments~%" +msgstr "trop peu d'arguments~%" + +#: guix/scripts/import/cran.scm:116 guix/scripts/import/elpa.scm:115 +#, scheme-format +msgid "too many arguments~%" +msgstr "trop d'arguments~%" + +#: guix/scripts/import/elpa.scm:44 msgid "" -"(define %android-udev-rules\n" -" (file->udev-rule\n" -" \"51-android-udev.rules\"\n" -" (let ((version \"20170910\"))\n" -" (origin\n" -" (method url-fetch)\n" -" (uri (string-append \"https://raw.githubusercontent.com/M0Rf30/\"\n" -" \"android-udev-rules/\" version \"/51-android.rules\"))\n" -" (sha256\n" -" (base32 \"0lmmagpyb6xsq6zcr2w1cyx9qmjqmajkvrdbhjx32gqf1d9is003\"))))))\n" +"Usage: guix import elpa PACKAGE-NAME\n" +"Import the latest package named PACKAGE-NAME from an ELPA repository.\n" msgstr "" -"(define %android-udev-rules\n" -" (file->udev-rule\n" -" \"51-android-udev.rules\"\n" -" (let ((version \"20170910\"))\n" -" (origin\n" -" (method url-fetch)\n" -" (uri (string-append \"https://raw.githubusercontent.com/M0Rf30/\"\n" -" \"android-udev-rules/\" version \"/51-android.rules\"))\n" -" (sha256\n" -" (base32 \"0lmmagpyb6xsq6zcr2w1cyx9qmjqmajkvrdbhjx32gqf1d9is003\"))))))\n" - -#. type: deffn -#: doc/guix.texi:10539 -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 "En plus, les définitions des paquets de Guix peuvent être inclus dans @var{rules} pour étendre les règles avec les définitions trouvées dans leur sous-répertoire @file{lib/udev/rules.d}. Au lieu de l'exemple @var{file->udev-rule} précédent, on aurait pu utiliser le paquet @var{android-udev-rules} qui existe dans le module @code{(gnu packages android)}." - -#. type: deffn -#: doc/guix.texi:10548 -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 "L'exemple suivant montre comment utiliser le paquet @var{android-udev-rules} pour que l'outil Android @command{adb} puisse détecter les appareils sans privilège root. Il détaille aussi comment créer le grope @code{adbusers}, requis pour le bon fonctionnement des règles définies dans le paquet @var{android-udev-rules}. Pour créer ce groupe, on doit le définir dans les @var{supplementary-groups} de la déclaration @var{user-account} ainsi que dans le champ @var{groups} de l'enregistrement @var{operating-system}." - -#. type: example -#: doc/guix.texi:10553 -#, no-wrap +"Usage : guix import elpa NOM-DU-PAQUET\n" +"Importer le dernier paquet nommé NOM-DU-PAQUET d'un dépôt ELPA.\n" + +#: guix/scripts/import/elpa.scm:46 msgid "" -"(use-modules (gnu packages android) ;for android-udev-rules\n" -" (gnu system shadow) ;for user-group\n" -" ;; @dots{})\n" "\n" +" -a, --archive=ARCHIVE specify the archive repository" msgstr "" -"(use-modules (gnu packages android) ;for android-udev-rules\n" -" (gnu system shadow) ;for user-group\n" -" ;; @dots{})\n" "\n" +" -a, --archive=ARCHIVE spécifier le dépôt de l'archive" -#. type: example -#: doc/guix.texi:10562 -#, no-wrap +#: guix/scripts/import/elpa.scm:48 msgid "" -"(operating-system\n" -" ;; @dots{}\n" -" (users (cons (user-acount\n" -" ;; @dots{}\n" -" (supplementary-groups\n" -" '(\"adbusers\" ;for adb\n" -" \"wheel\" \"netdev\" \"audio\" \"video\"))\n" -" ;; @dots{})))\n" "\n" +" -h, --help display this help and exit" msgstr "" -"(operating-system\n" -" ;; @dots{}\n" -" (users (cons (user-acount\n" -" ;; @dots{}\n" -" (supplementary-groups\n" -" '(\"adbusers\" ;for adb\n" -" \"wheel\" \"netdev\" \"audio\" \"video\"))\n" -" ;; @dots{})))\n" -"\n" - -#. type: example -#: doc/guix.texi:10565 -#, no-wrap +"\n" +" -h, --help afficher cette aide et quitter" + +#: guix/scripts/import/elpa.scm:50 msgid "" -" (groups (cons (user-group (system? #t) (name \"adbusers\"))\n" -" %base-groups))\n" "\n" +" -r, --recursive generate package expressions for all Emacs packages that are not yet in Guix" msgstr "" -" (groups (cons (user-group (system? #t) (name \"adbusers\"))\n" -" %base-groups))\n" "\n" +" -r, --recursive générer des expressions de paquets pour tous les paquets Emacs qui ne sont pas encore dans Guix" -#. type: example -#: doc/guix.texi:10567 -#, no-wrap +#: guix/scripts/import/elpa.scm:52 msgid "" -" ;; @dots{}\n" "\n" +" -V, --version display version information and exit" msgstr "" -" ;; @dots{}\n" "\n" +" -V, --version afficher les informations sur la version et quitter" -#. type: example -#: doc/guix.texi:10574 -#, no-wrap -msgid "" -" (services\n" -" (modify-services %desktop-services\n" -" (udev-service-type config =>\n" -" (udev-configuration (inherit config)\n" -" (rules (cons* android-udev-rules\n" -" (udev-configuration-rules config))))))))\n" -msgstr "" -" (services\n" -" (modify-services %desktop-services\n" -" (udev-service-type config =>\n" -" (udev-configuration (inherit config)\n" -" (rules (cons* android-udev-rules\n" -" (udev-configuration-rules config))))))))\n" - -#. type: defvr -#: doc/guix.texi:10577 -#, no-wrap -msgid "{Scheme Variable} urandom-seed-service-type" -msgstr "{Variable Scheme} urandom-seed-service-type" - -#. type: defvr -#: doc/guix.texi:10582 -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 "Garde de l'entropie dans @var{%random-seed-file} pour démarrer @file{/dev/urandom} au redémarrage. Ce service essaye aussi de démarrer @file{/dev/urandom} à partir de @file{/dev/hwrng} au démarrage si @file{/dev/hwrng} existe et peut être lu." - -#. type: defvr -#: doc/guix.texi:10584 -#, no-wrap -msgid "{Scheme Variable} %random-seed-file" -msgstr "{Variable Scheme} %random-seed-file" - -#. type: defvr -#: doc/guix.texi:10588 -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 "C'est le nom du fichier où des octets aléatoires sont sauvegardés par @var{urandom-seed-service} pour démarrer @file{/dev/urandom} au redémarrage. Sa valeur par défaut est @file{/var/lib/random-seed}." - -#. type: cindex -#: doc/guix.texi:10590 doc/guix.texi:11930 -#, no-wrap -msgid "keymap" -msgstr "disposition clavier" - -#. type: cindex -#: doc/guix.texi:10591 -#, no-wrap -msgid "keyboard" -msgstr "clavier" - -#. type: deffn -#: doc/guix.texi:10592 -#, no-wrap -msgid "{Scheme Procedure} console-keymap-service @var{files} ..." -msgstr "{Procédure Scheme} console-keymap-service @var{files} ..." - -#. type: deffn -#: doc/guix.texi:10597 -msgid "Return a service to load console keymaps from @var{files} using @command{loadkeys} command. Most likely, you want to load some default keymap, which can be done like this:" -msgstr "Renvoie un service qui charge les dispositions claviers de @var{files} avec la commande @command{loadkeys}. Vraisemblablement, vous voudrez charger une disposition par défaut, ce qui se fait ainsi :" - -#. type: example -#: doc/guix.texi:10600 -#, no-wrap -msgid "(console-keymap-service \"dvorak\")\n" -msgstr "(console-keymap-service \"dvorak\")\n" - -#. type: deffn -#: doc/guix.texi:10604 -msgid "Or, for example, for a Swedish keyboard, you may need to combine the following keymaps:" -msgstr "Ou par exemple pour un clavier suédois, vous pourriez avoir besoin de combiner les dispositions suivantes :" - -#. type: example -#: doc/guix.texi:10606 -#, no-wrap -msgid "(console-keymap-service \"se-lat6\" \"se-fi-lat6\")\n" -msgstr "(console-keymap-service \"se-lat6\" \"se-fi-lat6\")\n" - -#. type: deffn -#: doc/guix.texi:10610 -msgid "Also you can specify a full file name (or file names) of your keymap(s). See @code{man loadkeys} for details." -msgstr "Vous pouvez aussi spécifier le nom de fichier (ou les noms de fichiers) complets de vos dispositions. Voir @code{man loadkeys} pour des détails." - -#. type: cindex -#: doc/guix.texi:10613 -#, no-wrap -msgid "mouse" -msgstr "souris" - -#. type: cindex -#: doc/guix.texi:10614 -#, no-wrap -msgid "gpm" -msgstr "gpm" - -#. type: defvr -#: doc/guix.texi:10615 -#, no-wrap -msgid "{Scheme Variable} gpm-service-type" -msgstr "{Variable Scheme} gpm-service-type" - -#. type: defvr -#: doc/guix.texi:10620 -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 "C'est le type du service qui lance GPM, le @dfn{démon de souris à but général}, qui fournit le support de la souris sur la console Linux. GPM permet aux utilisateurs d'utiliser la souris dans la console, entre autres pour sélectionner, copier et coller du texte." - -#. type: defvr -#: doc/guix.texi:10623 -msgid "The value for services of this type must be a @code{gpm-configuration} (see below). This service is not part of @var{%base-services}." -msgstr "La valeur pour les services de ce type doit être un @code{gpm-configuration} (voir plus bas). Ce service ne fait pas partie de @var{%base-services}." - -#. type: deftp -#: doc/guix.texi:10625 -#, no-wrap -msgid "{Data Type} gpm-configuration" -msgstr "{Type de données} gpm-configuration" - -#. type: deftp -#: doc/guix.texi:10627 -msgid "Data type representing the configuration of GPM." -msgstr "Type de données représentant la configuration de GPM." - -#. type: item -#: doc/guix.texi:10629 -#, no-wrap -msgid "@code{options} (default: @code{%default-gpm-options})" -msgstr "@code{options} (par défaut : @code{%default-gpm-options})" - -#. type: table -#: doc/guix.texi:10634 -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 "Les options de la ligne de commande à passer à @command{gpm}. L'ensemble des options par défaut dit à @command{gpm} d'écouter les événements de la souris dans @file{/dev/input/mice}. @xref{Command Line,,, gpm, gpm manual}, pour plus d'informations." - -#. type: item -#: doc/guix.texi:10635 -#, no-wrap -msgid "@code{gpm} (default: @code{gpm})" -msgstr "@code{gpm} (par défaut : @code{gpm})" - -#. type: table -#: doc/guix.texi:10637 -msgid "The GPM package to use." -msgstr "Le paquet GPM à utiliser." - -#. type: anchor{#1} -#: doc/guix.texi:10642 -msgid "guix-publish-service-type" -msgstr "guix-publish-service-type" - -#. type: deffn -#: doc/guix.texi:10642 -#, no-wrap -msgid "{Scheme Variable} guix-publish-service-type" -msgstr "{Variable Scheme} guix-publish-service-type" - -#. type: deffn -#: doc/guix.texi:10646 -msgid "This is the service type for @command{guix publish} (@pxref{Invoking guix publish}). Its value must be a @code{guix-configuration} object, as described below." -msgstr "C'est le type de service pour @command{guix publish} (@pxref{Invoking guix publish}). Sa valeur doit être un objet @code{guix-configuration} décrit plus bas." - -#. type: deffn -#: doc/guix.texi:10650 -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 "Ce service suppose que @file{/etc/guix} contient déjà une paire de clefs créée par @command{guix archive --generate-key} (@pxref{Invoking guix archive}). Si ce n'est pas le cas, le service ne démarrera pas." - -#. type: deftp -#: doc/guix.texi:10652 -#, no-wrap -msgid "{Data Type} guix-publish-configuration" -msgstr "{Type de données} guix-publish-configuration" - -#. type: deftp -#: doc/guix.texi:10655 -msgid "Data type representing the configuration of the @code{guix publish} service." -msgstr "Le type de données représentant la configuration du service @code{guix publish}." - -#. type: item -#: doc/guix.texi:10657 -#, no-wrap -msgid "@code{guix} (default: @code{guix})" -msgstr "@code{guix} (par défaut : @code{guix})" - -#. type: item -#: doc/guix.texi:10660 -#, no-wrap -msgid "@code{port} (default: @code{80})" -msgstr "@code{port} (par défaut : @code{80})" - -#. type: table -#: doc/guix.texi:10662 -msgid "The TCP port to listen for connections." -msgstr "Le port TCP sur lequel écouter les connexions." - -#. type: item -#: doc/guix.texi:10663 -#, no-wrap -msgid "@code{host} (default: @code{\"localhost\"})" -msgstr "@code{host} (par défaut : @code{\"localhost\"})" - -#. type: table -#: doc/guix.texi:10666 -msgid "The host (and thus, network interface) to listen to. Use @code{\"0.0.0.0\"} to listen on all the network interfaces." -msgstr "L'hôte (et donc, l'interface réseau) sur lequel écouter. Utilisez @code{\"0.0.0.0\"} pour écouter sur toutes les interfaces réseaux." - -#. type: table -#: doc/guix.texi:10671 -msgid "The gzip compression level at which substitutes are compressed. Use @code{0} to disable compression altogether, and @code{9} to get the best compression ratio at the expense of increased CPU usage." -msgstr "Le niveau de compression gzip auquel les substituts sont compressés. Utilisez @code{0} pour désactiver complètement la compression, et @code{9} pour avoir le meilleur taux de compression contre une plus grande utilisation du CPU." - -#. type: item -#: doc/guix.texi:10672 -#, no-wrap -msgid "@code{nar-path} (default: @code{\"nar\"})" -msgstr "@code{nar-path} (par défaut : @code{\"nar\"})" - -#. type: table -#: doc/guix.texi:10675 -msgid "The URL path at which ``nars'' can be fetched. @xref{Invoking guix publish, @code{--nar-path}}, for details." -msgstr "Le chemin d'URL où les « nars » se trouvent. @xref{Invoking guix publish, @code{--nar-path}}, pour des détails." - -#. type: item -#: doc/guix.texi:10676 -#, no-wrap -msgid "@code{cache} (default: @code{#f})" -msgstr "@code{cache} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10682 -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 "Lorsque la valeur est @code{#f}, désactive le cache et génère les archives à la demande. Sinon, cela devrait être le nom d'un répertoire — p.@: ex.@: @code{\"/var/cache/guix/publish\"} — où @command{guix publish} gère le cache des archives et des métadonnées prêtes à être envoyées. @xref{Invoking guix publish, @option{--cache}}, pour plus d'informations sur les compromis impliqués." - -#. type: item -#: doc/guix.texi:10683 -#, no-wrap -msgid "@code{workers} (default: @code{#f})" -msgstr "@code{workers} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10687 -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 "Lorsque la valeur est un entier, c'est le nombre de threads de travail utilisés pour le cache ; lorsque la valeur est @code{#f}, le nombre de processeurs est utilisé. @xref{Invoking guix publish, @option{--workers}}, pour plus d'informations." - -#. type: item -#: doc/guix.texi:10688 -#, no-wrap -msgid "@code{ttl} (default: @code{#f})" -msgstr "@code{ttl} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10692 -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 "Lorsque la valeur est un entier, il dénote la @dfn{durée de vie} en secondes des archives publiées. @xref{Invoking guix publish, @option{--ttl}}, pour plus d'informations." - -#. type: anchor{#1} -#: doc/guix.texi:10696 -msgid "rngd-service" -msgstr "rngd-service" - -#. type: deffn -#: doc/guix.texi:10696 -#, no-wrap -msgid "{Scheme Procedure} rngd-service [#:rng-tools @var{rng-tools}] @" -msgstr "{Procédure Scheme} rngd-service [#:rng-tools @var{rng-tools}] @" - -#. type: deffn -#: doc/guix.texi:10701 -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 "" -"[#:device \"/dev/hwrng\"]\n" -"Renvoie un service qui lance le programme @command{rngd} de @var{rng-tools} pour ajouter @var{device} à la réserve d'entropie du noyau. Le service échouera si @var{device} n'existe pas." - -#. type: anchor{#1} -#: doc/guix.texi:10704 -msgid "pam-limits-service" -msgstr "pam-limits-service" - -#. type: cindex -#: doc/guix.texi:10704 -#, no-wrap -msgid "session limits" -msgstr "limites de session" - -#. type: cindex -#: doc/guix.texi:10705 -#, no-wrap -msgid "ulimit" -msgstr "ulimit" - -#. type: cindex -#: doc/guix.texi:10706 -#, no-wrap -msgid "priority" -msgstr "priorités" - -#. type: cindex -#: doc/guix.texi:10707 -#, no-wrap -msgid "realtime" -msgstr "temps réel" - -#. type: cindex -#: doc/guix.texi:10708 -#, no-wrap -msgid "jackd" -msgstr "jackd" - -#. type: deffn -#: doc/guix.texi:10709 -#, no-wrap -msgid "{Scheme Procedure} pam-limits-service [#:limits @code{'()}]" -msgstr "{Procédure Scheme} pam-limits-service [#:limits @code{'()}]" - -#. type: deffn -#: doc/guix.texi:10716 -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 "Renvoie un service qui installe un fichier de configuration pour le @uref{http://linux-pam.org/Linux-PAM-html/sag-pam_limits.html, module @code{pam_limits}}. La procédure prend éventuellement une liste de valeurs @code{pam-limits-entry} qui peuvent être utilisées pour spécifier les limites @code{ulimit} et les priorités des sessions utilisateurs." - -#. type: deffn -#: doc/guix.texi:10719 -msgid "The following limits definition sets two hard and soft limits for all login sessions of users in the @code{realtime} group:" -msgstr "La définition de limites suivante défini deux limites matérielles et logicielles pour toutes les sessions connectées des utilisateurs du groupe @code{realtime} :" - -#. type: example -#: doc/guix.texi:10725 -#, no-wrap -msgid "" -"(pam-limits-service\n" -" (list\n" -" (pam-limits-entry \"@@realtime\" 'both 'rtprio 99)\n" -" (pam-limits-entry \"@@realtime\" 'both 'memlock 'unlimited)))\n" -msgstr "" -"(pam-limits-service\n" -" (list\n" -" (pam-limits-entry \"@@realtime\" 'both 'rtprio 99)\n" -" (pam-limits-entry \"@@realtime\" 'both 'memlock 'unlimited)))\n" - -#. type: deffn -#: doc/guix.texi:10731 -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 "La première entrée augment la priorité en temps réel maximale des processus non privilégiés ; la deuxième entrée abandonne les restrictions sur l'espace d'adressage maximal qui peut être verrouillé en mémoire. Ces paramètres sont souvent utilisés sur les systèmes audio temps-réel." - -#. type: cindex -#: doc/guix.texi:10736 -#, no-wrap -msgid "cron" -msgstr "cron" - -#. type: cindex -#: doc/guix.texi:10737 -#, no-wrap -msgid "mcron" -msgstr "mcron" - -#. type: cindex -#: doc/guix.texi:10738 -#, no-wrap -msgid "scheduling jobs" -msgstr "tâches planifiées" - -#. type: Plain text -#: doc/guix.texi:10745 -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 "Le module @code{(gnu services mcron)} fournit une interface pour GNU@tie{}mcron, un démon qui lance des tâches planifiées (@pxref{Top,,, mcron, GNU@tie{}mcron}). GNU@tie{}mcron est similaire au démon Unix traditionel @command{cron} ; la principale différence est qu'il est implémenté en Guile Scheme, qui fournit beaucoup de flexibilité lors de la spécification de la planification des tâches et de leurs actions." - -#. type: Plain text -#: doc/guix.texi:10753 -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 "L'exemple en dessous définit un système d'exploitation qu lance les commandes @command{updatebd} (@pxref{Invoking updatedb,,, find, Finding Files}) et @command{guix gc} (@pxref{Invoking guix gc}) tous les jours, ainsi que la commande @command{mkid} en tant qu'utilisateur non privilégié (@pxref{mkid invocation,,, idutils, ID Database Utilities}). Il utilise des gexps pour introduire des définitions de tâches qui sont passées à mcron (@pxref{G-Expressions})." - -#. type: lisp -#: doc/guix.texi:10757 -#, no-wrap +#: guix/scripts/import/elpa.scm:110 +#, scheme-format +msgid "failed to download package '~a'~%" +msgstr "échec lors du téléchargement du paquet « ~a »~%" + +#: guix/scripts/pull.scm:66 +#, scheme-format msgid "" -"(use-modules (guix) (gnu) (gnu services mcron))\n" -"(use-package-modules base idutils)\n" +"Guile-Git is missing but it is now required by 'guix pull'.\n" +"Install it by running:\n" +"\n" +" guix package -i ~a\n" +" export GUILE_LOAD_PATH=$HOME/.guix-profile/share/guile/site/~a:$GUILE_LOAD_PATH\n" +" export GUILE_LOAD_COMPILED_PATH=$HOME/.guix-profile/lib/guile/~a/site-ccache:$GUILE_LOAD_COMPILED_PATH\n" "\n" msgstr "" -"(use-modules (guix) (gnu) (gnu services mcron))\n" -"(use-package-modules base idutils)\n" +"Il vous manque Guile-Git qui est désormais requis par « guix pull ».\n" +"Installez-le en lançant :\n" +"\n" +" guix package -i ~a\n" +" export GUILE_LOAD_PATH=$HOME/.guix-profile/share/guile/site/~a:$GUILE_LOAD_PATH\n" +" export GUILE_LOAD_COMPILED_PATH=$HOME/.guix-profile/lib/guile/~a/site-ccache:$GUILE_LOAD_COMPILED_PATH\n" "\n" -#. type: lisp -#: doc/guix.texi:10766 -#, no-wrap +#: guix/scripts/pull.scm:103 msgid "" -"(define updatedb-job\n" -" ;; Run 'updatedb' at 3AM every day. Here we write the\n" -" ;; job's action as a Scheme procedure.\n" -" #~(job '(next-hour '(3))\n" -" (lambda ()\n" -" (execl (string-append #$findutils \"/bin/updatedb\")\n" -" \"updatedb\"\n" -" \"--prunepaths=/tmp /var/tmp /gnu/store\"))))\n" -"\n" +"Usage: guix pull [OPTION]...\n" +"Download and deploy the latest version of Guix.\n" msgstr "" -"(define updatedb-job\n" -" ;; Lance « updatedb » à 3h du matin chaque jour. Ici nous spécifions\n" -" ;; l'action de la tâche comme une procédure Scheme.\n" -" #~(job '(next-hour '(3))\n" -" (lambda ()\n" -" (execl (string-append #$findutils \"/bin/updatedb\")\n" -" \"updatedb\"\n" -" \"--prunepaths=/tmp /var/tmp /gnu/store\"))))\n" -"\n" - -#. type: lisp -#: doc/guix.texi:10772 -#, no-wrap +"Usage : guix pull [OPTION]...\n" +"Télécharger et déployer la dernière version de Guix.\n" + +#: guix/scripts/pull.scm:107 msgid "" -"(define garbage-collector-job\n" -" ;; Collect garbage 5 minutes after midnight every day.\n" -" ;; The job's action is a shell command.\n" -" #~(job \"5 0 * * *\" ;Vixie cron syntax\n" -" \"guix gc -F 1G\"))\n" "\n" +" --url=URL download from the Git repository at URL" msgstr "" -"(define garbage-collector-job\n" -" ;; Lance le ramasse-miettes tous les jours à minuit cinq.\n" -" ;; L'action de la tâche est une commande shell.\n" -" #~(job \"5 0 * * *\" ;Vixie cron syntax\n" -" \"guix gc -F 1G\"))\n" "\n" +" --url=URL télécharger le dépôt Git depuis URL" -#. type: lisp -#: doc/guix.texi:10779 -#, no-wrap +#: guix/scripts/pull.scm:109 msgid "" -"(define idutils-job\n" -" ;; Update the index database as user \"charlie\" at 12:15PM\n" -" ;; and 19:15PM. This runs from the user's home directory.\n" -" #~(job '(next-minute-from (next-hour '(12 19)) '(15))\n" -" (string-append #$idutils \"/bin/mkid src\")\n" -" #:user \"charlie\"))\n" "\n" +" --commit=COMMIT download the specified COMMIT" msgstr "" -"(define idutils-job\n" -" ;; Met à jour la base de données d'index en tant que « charlie » à 12h15\n" -" ;; et 19h15. La commande est lancée depuis le répertoire personnel de l'utilisateur.\n" -" #~(job '(next-minute-from (next-hour '(12 19)) '(15))\n" -" (string-append #$idutils \"/bin/mkid src\")\n" -" #:user \"charlie\"))\n" "\n" +" --commit=COMMIT télécharger le COMMIT indiqué" -#. type: lisp -#: doc/guix.texi:10786 -#, no-wrap +#: guix/scripts/pull.scm:111 msgid "" -"(operating-system\n" -" ;; @dots{}\n" -" (services (cons (mcron-service (list garbage-collector-job\n" -" updatedb-job\n" -" idutils-job))\n" -" %base-services)))\n" -msgstr "" -"(operating-system\n" -" ;; @dots{}\n" -" (services (cons (mcron-service (list garbage-collector-job\n" -" updatedb-job\n" -" idutils-job))\n" -" %base-services)))\n" - -#. type: Plain text -#: doc/guix.texi:10791 -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 "@xref{Guile Syntax, mcron job specifications,, mcron, GNU@tie{}mcron}, pour plus d'informations sur les spécifications des tâche de mcron. Ci-dessous est la référence du service mcron." - -#. type: deffn -#: doc/guix.texi:10792 -#, no-wrap -msgid "{Scheme Procedure} mcron-service @var{jobs} [#:mcron @var{mcron}]" -msgstr "{Procédure Scheme} mcron-service @var{jobs} [#:mcron @var{mcron}]" - -#. type: deffn -#: doc/guix.texi:10795 -msgid "Return an mcron service running @var{mcron} that schedules @var{jobs}, a list of gexps denoting mcron job specifications." -msgstr "Renvoie un service mcron qui lance @var{mcron} qui planifie les tâches @var{jobs}, une liste de gexps qui dénotent des spécifications de tâches de mcron." - -#. type: deffn -#: doc/guix.texi:10797 -msgid "This is a shorthand for:" -msgstr "C'est un raccourci pour :" - -#. type: example -#: doc/guix.texi:10800 -#, no-wrap -msgid "" -"(service mcron-service-type\n" -" (mcron-configuration (mcron mcron) (jobs jobs)))\n" -msgstr "" -"(service mcron-service-type\n" -" (mcron-configuration (mcron mcron) (jobs jobs)))\n" - -#. type: defvr -#: doc/guix.texi:10803 -#, no-wrap -msgid "{Scheme Variable} mcron-service-type" -msgstr "{Variable Scheme} mcron-service-type" - -#. type: defvr -#: doc/guix.texi:10806 -msgid "This is the type of the @code{mcron} service, whose value is an @code{mcron-configuration} object." -msgstr "C'est le type du service @code{mcron}, dont la valeur est un objet @code{mcron-configuration}" - -#. type: defvr -#: doc/guix.texi:10811 -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 "Ce type de service peut être la cible d'une extension de service qui lui fournit des spécifications de tâches supplémentaires (@pxref{Service Composition}). En d'autres termes, il est possible de définir des services qui fournissent des tâches mcron à lancer." - -#. type: deftp -#: doc/guix.texi:10813 -#, no-wrap -msgid "{Data Type} mcron-configuration" -msgstr "{Type de données} mcron-configuration" - -#. type: deftp -#: doc/guix.texi:10815 -msgid "Data type representing the configuration of mcron." -msgstr "Type données qui représente la configuration de mcron." - -#. type: item -#: doc/guix.texi:10817 -#, no-wrap -msgid "@code{mcron} (default: @var{mcron})" -msgstr "@code{mcron} (par défaut : @var{mcron})" - -#. type: table -#: doc/guix.texi:10819 -msgid "The mcron package to use." -msgstr "Le paquet mcron à utiliser" - -#. type: code{#1} -#: doc/guix.texi:10820 doc/guix.texi:10879 -#, no-wrap -msgid "jobs" -msgstr "jobs" - -#. type: table -#: doc/guix.texi:10824 -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 "C'est la liste des gexps (@pxref{G-Expressions}), où chaque gexp correspond à une spécification de tâche de mcron (@pxref{Syntax, mcron job specifications,, mcron, GNU@tie{}mcron})." - -#. type: cindex -#: doc/guix.texi:10831 -#, no-wrap -msgid "rottlog" -msgstr "rottlog" - -#. type: cindex -#: doc/guix.texi:10832 -#, no-wrap -msgid "log rotation" -msgstr "journaux, rotation" - -#. type: Plain text -#: doc/guix.texi:10839 -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 "Les fichiers journaux comme ceux qui se trouvent dans @file{/var/log} ont tendance à grandir sans fin, donc c'est une bonne idée de le @dfn{faire tourner} de temps à autres — c.-à-d.@: archiver leur contenu dans des fichiers séparés, potentiellement compressés. Le module @code{(gnu services admin)} fournit une interface pour GNU@tie{}Rot[t]log, un outil de rotation de journaux (@pxref{Top,,, rottlog, GNU Rot[t]log Manual})." - -#. type: Plain text -#: doc/guix.texi:10842 -msgid "The example below defines an operating system that provides log rotation with the default settings, for commonly encountered log files." -msgstr "L'exemple ci-dessous définit un système d'exploitation qui fournit la rotation des journaux avec les paramètres par défaut, pour les journaux les plus courants." - -#. type: lisp -#: doc/guix.texi:10847 -#, no-wrap -msgid "" -"(use-modules (guix) (gnu))\n" -"(use-service-modules admin mcron)\n" -"(use-package-modules base idutils)\n" "\n" +" --branch=BRANCH download the tip of the specified BRANCH" msgstr "" -"(use-modules (guix) (gnu))\n" -"(use-service-modules admin mcron)\n" -"(use-package-modules base idutils)\n" "\n" +" --branch=BRANCHE télécharger le bout de la BRANCHE indiquée" -#. type: lisp -#: doc/guix.texi:10852 -#, no-wrap +#: guix/scripts/pull.scm:116 msgid "" -"(operating-system\n" -" ;; @dots{}\n" -" (services (cons (service rottlog-service-type)\n" -" %base-services)))\n" -msgstr "" -"(operating-system\n" -" ;; @dots{}\n" -" (services (cons (service rottlog-service-type)\n" -" %base-services)))\n" - -#. type: defvr -#: doc/guix.texi:10854 -#, no-wrap -msgid "{Scheme Variable} rottlog-service-type" -msgstr "{Variable Scheme} rottlog-service-type" - -#. type: defvr -#: doc/guix.texi:10857 -msgid "This is the type of the Rottlog service, whose value is a @code{rottlog-configuration} object." -msgstr "C'est le type du service Rotlog, dont la valeur est un objet @code{rottlog-configuration}." - -#. type: defvr -#: doc/guix.texi:10860 -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 "D'autres services peuvent étendre celui-ci avec de nouveaux objets @code{log-rotation} (voir plus bas), en augmentant ainsi l'ensemble des fichiers à faire tourner." - -#. type: defvr -#: doc/guix.texi:10863 -msgid "This service type can define mcron jobs (@pxref{Scheduled Job Execution}) to run the rottlog service." -msgstr "Ce type de service peut définir des taches (@pxref{Scheduled Job Execution}) pour lancer le service rottlog." - -#. type: deftp -#: doc/guix.texi:10865 -#, no-wrap -msgid "{Data Type} rottlog-configuration" -msgstr "{Type de données} rottlog-configuration" - -#. type: deftp -#: doc/guix.texi:10867 -msgid "Data type representing the configuration of rottlog." -msgstr "Type de données représentant la configuration de rottlog." - -#. type: item -#: doc/guix.texi:10869 -#, no-wrap -msgid "@code{rottlog} (default: @code{rottlog})" -msgstr "@code{rottlog} (par défaut : @code{rottlog})" - -#. type: table -#: doc/guix.texi:10871 -msgid "The Rottlog package to use." -msgstr "Le paquet Rottlog à utiliser." - -#. type: item -#: doc/guix.texi:10872 -#, no-wrap -msgid "@code{rc-file} (default: @code{(file-append rottlog \"/etc/rc\")})" -msgstr "@code{rc-file} (par défaut : @code{(file-append rottlog \"/etc/rc\")})" - -#. type: table -#: doc/guix.texi:10875 -msgid "The Rottlog configuration file to use (@pxref{Mandatory RC Variables,,, rottlog, GNU Rot[t]log Manual})." -msgstr "Le fichier de configuration Rottlog à utiliser (@pxref{Mandatory RC Variables,,, rottlog, GNU Rot[t]log Manual})." - -#. type: item -#: doc/guix.texi:10876 -#, no-wrap -msgid "@code{rotations} (default: @code{%default-rotations})" -msgstr "@code{rotations} (par défaut : @code{%default-rotations})" - -#. type: table -#: doc/guix.texi:10878 -msgid "A list of @code{log-rotation} objects as defined below." -msgstr "" - -#. type: table -#: doc/guix.texi:10882 -msgid "This is a list of gexps where each gexp corresponds to an mcron job specification (@pxref{Scheduled Job Execution})." +"\n" +" --bootstrap use the bootstrap Guile to build the new Guix" msgstr "" +"\n" +" --bootstrap utiliser le programme d'amorçage Guile pour compiler le nouveau Guix" -#. type: deftp -#: doc/guix.texi:10885 -#, no-wrap -msgid "{Data Type} log-rotation" -msgstr "{Type de données} log-rotation" +#: guix/scripts/pull.scm:263 +#, scheme-format +msgid "cannot enforce use of the Let's Encrypt certificates~%" +msgstr "impossible d'imposer l'utilisation des certificats Let's Encrypt~%" -#. type: deftp -#: doc/guix.texi:10887 -msgid "Data type representing the rotation of a group of log files." -msgstr "" +#: guix/scripts/pull.scm:265 +#, scheme-format +msgid "please upgrade Guile-Git~%" +msgstr "veuillez mettre à jour Guile-Git~%" -#. type: deftp -#: doc/guix.texi:10891 -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 "" +#: guix/scripts/pull.scm:273 +#, scheme-format +msgid "Git error ~a~%" +msgstr "Erreur Git : ~a~%" -#. type: example -#: doc/guix.texi:10900 -#, no-wrap -msgid "" -"(log-rotation\n" -" (frequency 'daily)\n" -" (files '(\"/var/log/apache/*\"))\n" -" (options '(\"storedir apache-archives\"\n" -" \"rotate 6\"\n" -" \"notifempty\"\n" -" \"nocompress\")))\n" -msgstr "" +#: guix/scripts/pull.scm:275 +#, scheme-format +msgid "Git error: ~a~%" +msgstr "Erreur Git : ~a~%" -#. type: deftp -#: doc/guix.texi:10903 -msgid "The list of fields is as follows:" -msgstr "" +#: guix/scripts/pull.scm:302 +#, scheme-format +msgid " repository URL: ~a~%" +msgstr " URL du répertoire : ~a~%" -#. type: item -#: doc/guix.texi:10905 -#, no-wrap -msgid "@code{frequency} (default: @code{'weekly})" -msgstr "@code{frequency} (par défaut : @code{'weekly})" +#: guix/scripts/pull.scm:304 +#, scheme-format +msgid " branch: ~a~%" +msgstr " branche: ~a~%" -#. type: table -#: doc/guix.texi:10907 -msgid "The log rotation frequency, a symbol." -msgstr "" +#: guix/scripts/pull.scm:305 +#, scheme-format +msgid " commit: ~a~%" +msgstr " commit : ~a~%" -#. type: code{#1} -#: doc/guix.texi:10908 -#, no-wrap -msgid "files" -msgstr "files" +#: guix/scripts/pull.scm:373 +#, scheme-format +msgid "Updating from Git repository at '~a'...~%" +msgstr "Mise à jour depuis le dépôt Git « ~a »...~%" -#. type: table -#: doc/guix.texi:10910 -msgid "The list of files or file glob patterns to rotate." -msgstr "" +#: guix/scripts/pull.scm:383 +#, scheme-format +msgid "Building from Git commit ~a...~%" +msgstr "Construction depuis le commit Git « ~a »...~%" -#. type: item -#: doc/guix.texi:10911 -#, no-wrap -msgid "@code{options} (default: @code{'()})" -msgstr "@code{options} (par défaut : @code{'()})" +#: guix/scripts/substitute.scm:125 +#, scheme-format +msgid "authentication and authorization of substitutes disabled!~%" +msgstr "authentification et autorisation des substituts désactivées !~%" -#. type: table -#: doc/guix.texi:10914 -msgid "The list of rottlog options for this rotation (@pxref{Configuration parameters,,, rottlog, GNU Rot[t]lg Manual})." -msgstr "" +#: guix/scripts/substitute.scm:200 +#, scheme-format +msgid "download from '~a' failed: ~a, ~s~%" +msgstr "le téléchargement depuis « ~a » a échoué : ~a, ~s~%" -#. type: item -#: doc/guix.texi:10915 -#, no-wrap -msgid "@code{post-rotate} (default: @code{#f})" -msgstr "@code{post-rotate} (par défaut : @code{#f})" +#: guix/scripts/substitute.scm:213 +#, scheme-format +msgid "while fetching ~a: server is somewhat slow~%" +msgstr "pendant la récupération de ~a : le serveur est plutôt lent~%" -#. type: table -#: doc/guix.texi:10917 -msgid "Either @code{#f} or a gexp to execute once the rotation has completed." -msgstr "" +#: guix/scripts/substitute.scm:215 +#, scheme-format +msgid "try `--no-substitutes' if the problem persists~%" +msgstr "essayez l'option « --no-substitutes » si le problème persiste~%" -#. type: defvr -#: doc/guix.texi:10920 -#, no-wrap -msgid "{Scheme Variable} %default-rotations" -msgstr "{Variable Scheme} %default-rotations" +#: guix/scripts/substitute.scm:225 +#, scheme-format +msgid "unsupported substitute URI scheme: ~a~%" +msgstr "schéma de substitution URI non supporté : ~a~%" -#. type: defvr -#: doc/guix.texi:10923 -msgid "Specifies weekly rotation of @var{%rotated-files} and a couple of other files." -msgstr "" +#: guix/scripts/substitute.scm:260 +#, scheme-format +msgid "while fetching '~a': ~a (~s)~%" +msgstr "pendant la récupération de « ~a » : ~a (~s)~%" -#. type: defvr -#: doc/guix.texi:10925 -#, no-wrap -msgid "{Scheme Variable} %rotated-files" -msgstr "{Variable Scheme} %rotated-files" +#: guix/scripts/substitute.scm:265 +#, scheme-format +msgid "ignoring substitute server at '~s'~%" +msgstr "ignore le serveur de substitution à « ~s »~%" -#. type: defvr -#: doc/guix.texi:10928 -msgid "The list of syslog-controlled files to be rotated. By default it is: @code{'(\"/var/log/messages\" \"/var/log/secure\")}." -msgstr "" +#: guix/scripts/substitute.scm:315 +#, scheme-format +msgid "signature version must be a number: ~s~%" +msgstr "la version de la signature doit être un nombre: ~s~%" -#. type: Plain text -#: doc/guix.texi:10935 -msgid "The @code{(gnu services networking)} module provides services to configure the network interface." -msgstr "" +#: guix/scripts/substitute.scm:319 +#, scheme-format +msgid "unsupported signature version: ~a~%" +msgstr "version de signature non supportée : ~a~%" -#. type: cindex -#: doc/guix.texi:10936 -#, no-wrap -msgid "DHCP, networking service" -msgstr "" +#: guix/scripts/substitute.scm:327 +#, scheme-format +msgid "signature is not a valid s-expression: ~s~%" +msgstr "la signature n'est pas une s-expression valide : ~s~%" -#. type: deffn -#: doc/guix.texi:10937 -#, no-wrap -msgid "{Scheme Procedure} dhcp-client-service [#:dhcp @var{isc-dhcp}]" -msgstr "{Procédure Scheme} dhcp-client-service [#:dhcp @var{isc-dhcp}]" +#: guix/scripts/substitute.scm:331 +#, scheme-format +msgid "invalid format of the signature field: ~a~%" +msgstr "format invalide du champ de signature : ~a~%" + +#: guix/scripts/substitute.scm:366 +#, scheme-format +msgid "invalid signature for '~a'~%" +msgstr "signature non valide pour « ~a »~%" + +#: guix/scripts/substitute.scm:368 +#, scheme-format +msgid "hash mismatch for '~a'~%" +msgstr "l'empreinte ne correspond pas pour « ~a »~%" + +#: guix/scripts/substitute.scm:370 +#, scheme-format +msgid "'~a' is signed with an unauthorized key~%" +msgstr "« ~a » est signé avec une clé non autorisée~%" + +#: guix/scripts/substitute.scm:372 +#, scheme-format +msgid "signature on '~a' is corrupt~%" +msgstr "la signature de « ~a » est corrompue~%" + +#: guix/scripts/substitute.scm:457 +#, scheme-format +msgid "'~a' does not name a store item~%" +msgstr "« ~a » ne nomme pas un élément du stockage~%" + +#: guix/scripts/substitute.scm:619 +#, scheme-format +msgid "updating substitutes from '~a'... ~5,1f%" +msgstr "mise à jour des substituts depuis « ~a »... ~5,1f%" + +#: guix/scripts/substitute.scm:683 +#, scheme-format +msgid "~s: unsupported server URI scheme~%" +msgstr "~s : schéma de URI serveur non supporté~%" + +#: guix/scripts/substitute.scm:693 +#, scheme-format +msgid "'~a' uses different store '~a'; ignoring it~%" +msgstr "« ~a » utilise un stockage « ~a » différent. Il est ignoré~%" + +#: guix/scripts/substitute.scm:853 +#, scheme-format +msgid "host name lookup error: ~a~%" +msgstr "erreur lors de la consultation du nom d'hôte : ~a~%" + +#: guix/scripts/substitute.scm:858 +#, scheme-format +msgid "TLS error in procedure '~a': ~a~%" +msgstr "Erreur TLS dans la procédure « ~a » : ~a~%" + +#: guix/scripts/substitute.scm:869 +msgid "" +"Usage: guix substitute [OPTION]...\n" +"Internal tool to substitute a pre-built binary to a local build.\n" +msgstr "" +"Usage : guix substitute [OPTION]...\n" +"Outil interne pour substituer un binaire pré-compilé à une compilation locale.\n" + +#: guix/scripts/substitute.scm:871 +msgid "" +"\n" +" --query report on the availability of substitutes for the\n" +" store file names passed on the standard input" +msgstr "" +"\n" +" --query afficher les substituts disponibles pour les\n" +" noms de fichiers de dépôt passés sur l'entrée\n" +" standard" + +#: guix/scripts/substitute.scm:874 +msgid "" +"\n" +" --substitute STORE-FILE DESTINATION\n" +" download STORE-FILE and store it as a Nar in file\n" +" DESTINATION" +msgstr "" +"\n" +" --substitute FICHIER-DÉPÔT DESTINATION\n" +" télécharger FICHIER-DÉPÔT et l'enregistrer comme un Nar\n" +" dans le fichier DESTINATION" + +#: guix/scripts/substitute.scm:939 +#, scheme-format +msgid "no valid substitute for '~a'~%" +msgstr "pas de substitut valide pour « ~a »~%" + +#: guix/scripts/substitute.scm:946 +#, scheme-format +msgid "Downloading ~a...~%" +msgstr "Téléchargement de « ~a »...~%" + +#: guix/scripts/substitute.scm:1002 +msgid "ACL for archive imports seems to be uninitialized, substitutes may be unavailable\n" +msgstr "L'ACL pour l'import d'archives ne semble pas initialisée ; les substituts pourraient être indisponibles\n" + +#: guix/scripts/substitute.scm:1056 +#, scheme-format +msgid "~a: invalid URI~%" +msgstr "~a : URI invalide~%" + +#: guix/scripts/substitute.scm:1116 +#, scheme-format +msgid "~a: unrecognized options~%" +msgstr "~a : options non reconnues~%" + +#: guix/scripts/authenticate.scm:59 +#, scheme-format +msgid "cannot find public key for secret key '~a'~%" +msgstr "impossible de trouver la clé publique correspondant à la clé secrète « ~a »~%" + +#: guix/scripts/authenticate.scm:79 +#, scheme-format +msgid "error: invalid signature: ~a~%" +msgstr "erreur : signature non valide: ~a~%" + +#: guix/scripts/authenticate.scm:81 +#, scheme-format +msgid "error: unauthorized public key: ~a~%" +msgstr "erreur : clé publique non autorisée: ~a~%" + +#: guix/scripts/authenticate.scm:83 +#, scheme-format +msgid "error: corrupt signature data: ~a~%" +msgstr "erreur : signature corrompue : ~a~%" + +#: guix/scripts/authenticate.scm:121 +msgid "" +"Usage: guix authenticate OPTION...\n" +"Sign or verify the signature on the given file. This tool is meant to\n" +"be used internally by 'guix-daemon'.\n" +msgstr "" +"Usage : guix authenticate OPTION...\n" +"Signer ou vérifier la signature du fichier donné. Cet outil est destiné\n" +"à être utilisé en interne par « guix-daemon ».\n" + +#: guix/scripts/authenticate.scm:127 +msgid "wrong arguments" +msgstr "mauvais arguments" + +#: guix/scripts/system.scm:143 +#, scheme-format +msgid "failed to register '~a' under '~a'~%" +msgstr "impossible d'enregistrer « ~a » sous « ~a »~%" + +#: guix/scripts/system.scm:154 +#, scheme-format +msgid "copying to '~a'..." +msgstr "copie vers « ~a »..." + +#: guix/scripts/system.scm:189 +#, scheme-format +msgid "failed to install bootloader ~a~%" +msgstr "impossible d'installer le chargeur de démarrage : ~a~%" + +#: guix/scripts/system.scm:209 +#, scheme-format +msgid "initializing the current root file system~%" +msgstr "initialisation du système de fichier racine courant~%" + +#: guix/scripts/system.scm:223 +#, scheme-format +msgid "not running as 'root', so the ownership of '~a' may be incorrect!~%" +msgstr "n'est pas exécuté en tant que « root » donc le propriétaire de « ~a » pourrait être incorrect !~%" + +#: guix/scripts/system.scm:268 +#, scheme-format +msgid "while talking to shepherd: ~a~%" +msgstr "en parlant au shepherd : ~a~%" + +#: guix/scripts/system.scm:275 +#, scheme-format +msgid "service '~a' could not be found~%" +msgstr "service: « ~a » introuvable~%" + +#: guix/scripts/system.scm:278 +#, scheme-format +msgid "service '~a' does not have an action '~a'~%" +msgstr "le service « ~a » n'a pas d'action « ~a »~%" + +#: guix/scripts/system.scm:282 +#, scheme-format +msgid "exception caught while executing '~a' on service '~a':~%" +msgstr "exception interceptée pendant l'exécution de « ~a » sur le service « ~a »:~%" + +#: guix/scripts/system.scm:290 +#, scheme-format +msgid "something went wrong: ~s~%" +msgstr "quelque chose s'est mal passé : ~s~%" + +#: guix/scripts/system.scm:293 +#, scheme-format +msgid "shepherd error~%" +msgstr "erreur du shepherd~%" + +#: guix/scripts/system.scm:310 +#, scheme-format +msgid "failed to obtain list of shepherd services~%" +msgstr "erreur en essayant d'obtenir la liste des services du shepherd~%" + +#: guix/scripts/system.scm:330 +#, scheme-format +msgid "unloading service '~a'...~%" +msgstr "déchargement du service « ~a »...~%" + +#: guix/scripts/system.scm:338 +#, scheme-format +msgid "loading new services:~{ ~a~}...~%" +msgstr "chargement des nouveaux services :~{ ~a~}...~%" + +#: guix/scripts/system.scm:364 +#, scheme-format +msgid "activating system...~%" +msgstr "activation du système...~%" + +#: guix/scripts/system.scm:442 +#, scheme-format +msgid "cannot switch to system generation '~a'~%" +msgstr "impossible de passer à la génération « ~a » du système~%" + +#: guix/scripts/system.scm:513 +msgid "the DAG of services" +msgstr "le graphe orienté acyclique (DAG) des services" + +#: guix/scripts/system.scm:526 +msgid "the dependency graph of shepherd services" +msgstr "le graphique des dépendances des services du shepherd" + +#: guix/scripts/system.scm:550 +#, scheme-format +msgid " file name: ~a~%" +msgstr " nom de fichier: ~a~%" + +#: guix/scripts/system.scm:551 +#, scheme-format +msgid " canonical file name: ~a~%" +msgstr " nom de fichier canonique : ~a~%" + +#. TRANSLATORS: Please preserve the two-space indentation. +#: guix/scripts/system.scm:553 +#, scheme-format +msgid " label: ~a~%" +msgstr " étiquette : ~a~%" + +#: guix/scripts/system.scm:554 +#, scheme-format +msgid " bootloader: ~a~%" +msgstr " chargeur de démarrage : ~a~%" + +#. TRANSLATORS: The '~[', '~;', and '~]' sequences in this string must +#. be preserved. They denote conditionals, such that the result will +#. look like: +#. root device: UUID: 12345-678 +#. or: +#. root device: label: "my-root" +#. or just: +#. root device: /dev/sda3 +#: guix/scripts/system.scm:564 +#, scheme-format +msgid " root device: ~[UUID: ~a~;label: ~s~;~a~]~%" +msgstr " périphérique racine : ~[UUID : ~a~;étiquette : ~s~;~a~]~%" + +#: guix/scripts/system.scm:575 +#, scheme-format +msgid " kernel: ~a~%" +msgstr " noyau : ~a~%" + +#: guix/scripts/system.scm:646 +#, scheme-format +msgid "~a: error: device '~a' not found: ~a~%" +msgstr "~a : erreur : périphérique « ~a » non trouvé : ~a~%" + +#: guix/scripts/system.scm:650 +#, scheme-format +msgid "" +"If '~a' is a file system\n" +"label, write @code{(file-system-label ~s)} in your @code{device} field." +msgstr "" +"Si « ~a » est une étiquette de système de fichiers, écrivez\n" +"@code{(file-system-label ~s)} dans votre champ @code{device}." + +#: guix/scripts/system.scm:658 +#, scheme-format +msgid "~a: error: file system with label '~a' not found~%" +msgstr "~a : erreur : le système de fichier étiqueté « ~a » est introuvable~%" + +#: guix/scripts/system.scm:663 +#, scheme-format +msgid "~a: error: file system with UUID '~a' not found~%" +msgstr "~a : erreur : le système de fichier avec l'UUID « ~a » est introuvable~%" + +#: guix/scripts/system.scm:764 +#, scheme-format +msgid "~a not found: 'guix pull' was never run~%" +msgstr "~a pas trouvé : « guix pull » n'a jamais été exécuté~%" -#. type: deffn -#: doc/guix.texi:10940 -msgid "Return a service that runs @var{dhcp}, a Dynamic Host Configuration Protocol (DHCP) client, on all the non-loopback network interfaces." -msgstr "" +#: guix/scripts/system.scm:765 +#, scheme-format +msgid "Consider running 'guix pull' before 'reconfigure'.~%" +msgstr "Envisagez d'exécuter « guix pull » avant « reconfigure ».~%" -#. type: deffn -#: doc/guix.texi:10942 -#, no-wrap -msgid "{Scheme Procedure} dhcpd-service-type" -msgstr "{Procédure Scheme} dhcpd-service-type" +#: guix/scripts/system.scm:766 +#, scheme-format +msgid "Failing to do that may downgrade your system!~%" +msgstr "Si vous ne le faites pas, votre système pourrait être amené à une version inférieure !~%" -#. type: deffn -#: doc/guix.texi:10946 -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 "" +#: guix/scripts/system.scm:883 +#, scheme-format +msgid "initializing operating system under '~a'...~%" +msgstr "initialisation du système d'exploitation sous « ~a »...~%" -#. type: example -#: doc/guix.texi:10952 -#, no-wrap +#: guix/scripts/system.scm:928 msgid "" -"(service dhcpd-service-type\n" -" (dhcpd-configuration\n" -" (config-file (local-file \"my-dhcpd.conf\"))\n" -" (interfaces '(\"enp0s25\"))))\n" -msgstr "" -"(service dhcpd-service-type\n" -" (dhcpd-configuration\n" -" (config-file (local-file \"my-dhcpd.conf\"))\n" -" (interfaces '(\"enp0s25\"))))\n" - -#. type: deftp -#: doc/guix.texi:10955 -#, no-wrap -msgid "{Data Type} dhcpd-configuration" -msgstr "{Type de données} dhcpd-configuration" - -#. type: item -#: doc/guix.texi:10957 -#, no-wrap -msgid "@code{package} (default: @code{isc-dhcp})" -msgstr "@code{package} (par défaut : @code{isc-dhcp})" - -#. type: table -#: doc/guix.texi:10962 -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{http://www.isc.org/products/DHCP, ISC's DHCP server}." -msgstr "" - -#. type: item -#: doc/guix.texi:10962 doc/guix.texi:14707 -#, no-wrap -msgid "@code{config-file} (default: @code{#f})" -msgstr "@code{config-file} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:10967 -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." +"Usage: guix system [OPTION ...] ACTION [ARG ...] [FILE]\n" +"Build the operating system declared in FILE according to ACTION.\n" +"Some ACTIONS support additional ARGS.\n" msgstr "" +"Usage : guix system [OPTION ...] ACTION [ARG ...] [FICHIER]\n" +"Compiler le système d'exploitation déclaré dans FICHER en suivant ACTION.\n" +"Certaines ACTIONS supportent des ARGUMENTS supplémentaires.\n" -#. type: item -#: doc/guix.texi:10967 -#, no-wrap -msgid "@code{version} (default: @code{\"4\"})" -msgstr "@code{version} (par défaut : @code{\"4\"})" +#: guix/scripts/system.scm:932 guix/scripts/container.scm:28 +msgid "The valid values for ACTION are:\n" +msgstr "Les valeurs possibles pour ACTION sont :\n" -#. type: table -#: doc/guix.texi:10972 -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:10972 -#, no-wrap -msgid "@code{run-directory} (default: @code{\"/run/dhcpd\"})" -msgstr "@code{run-directory} (par défaut : @code{\"/run/dhcpd\"})" - -#. type: table -#: doc/guix.texi:10975 -msgid "The run directory to use. At service activation time, this directory will be created if it does not exist." -msgstr "" +#: guix/scripts/system.scm:934 +msgid " search search for existing service types\n" +msgstr " search chercher des types de services existants\n" -#. type: item -#: doc/guix.texi:10975 -#, no-wrap -msgid "@code{pid-file} (default: @code{\"/run/dhcpd/dhcpd.pid\"})" -msgstr "@code{pid-file} (par défaut : @code{\"/run/dhcpd/dhcpd.pid\"})" +#: guix/scripts/system.scm:936 +msgid " reconfigure switch to a new operating system configuration\n" +msgstr " reconfigure basculer vers une nouvelle configuration du système d'exploitation\n" -#. type: table -#: doc/guix.texi:10978 -msgid "The PID file to use. This corresponds to the @code{-pf} option of @code{dhcpd}. See @code{man dhcpd} for details." -msgstr "" +#: guix/scripts/system.scm:938 +msgid " roll-back switch to the previous operating system configuration\n" +msgstr " roll-back basculer vers la configuration du système d'exploitation précédente\n" -#. type: item -#: doc/guix.texi:10978 -#, no-wrap -msgid "@code{interfaces} (default: @code{'()})" -msgstr "@code{interfaces} (par défaut : @code{'()})" +#: guix/scripts/system.scm:940 +msgid " switch-generation switch to an existing operating system configuration\n" +msgstr " switch-generation basculer vers une configuration du système d'exploitation existante\n" -#. type: table -#: doc/guix.texi:10984 -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 "" +#: guix/scripts/system.scm:942 +msgid " list-generations list the system generations\n" +msgstr " list-generations lister les générations du système\n" -#. type: defvr -#: doc/guix.texi:10987 -#, no-wrap -msgid "{Scheme Variable} static-networking-service-type" -msgstr "{Variable Scheme} static-networking-service-type" +#: guix/scripts/system.scm:944 +msgid " build build the operating system without installing anything\n" +msgstr " build compiler le système d'exploitation sans rien installer\n" -#. type: defvr -#: doc/guix.texi:10990 -msgid "This is the type for statically-configured network interfaces." -msgstr "" +#: guix/scripts/system.scm:946 +msgid " container build a container that shares the host's store\n" +msgstr " container compiler un conteneur qui partage le dépôt de l'hôte\n" -#. type: deffn -#: doc/guix.texi:10992 -#, no-wrap -msgid "{Scheme Procedure} static-networking-service @var{interface} @var{ip} @" -msgstr "{Procédure Scheme} static-networking-service @var{interface} @var{ip} @" +#: guix/scripts/system.scm:948 +msgid " vm build a virtual machine image that shares the host's store\n" +msgstr " vm compiler une machine virtuelle partageant le dépôt de l'hôte\n" -#. type: deffn -#: doc/guix.texi:11000 -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 "" +#: guix/scripts/system.scm:950 +msgid " vm-image build a freestanding virtual machine image\n" +msgstr " vm-image compiler une image autonome de machine virtuelle\n" -#. type: deffn -#: doc/guix.texi:11005 -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 "" +#: guix/scripts/system.scm:952 +msgid " disk-image build a disk image, suitable for a USB stick\n" +msgstr " disk-image compiler une image disque adaptée pour une clé USB\n" -#. type: cindex -#: doc/guix.texi:11007 -#, no-wrap -msgid "wicd" -msgstr "wicd" - -#. type: cindex -#: doc/guix.texi:11010 -#, no-wrap -msgid "network management" -msgstr "gestion du réseau" - -#. type: deffn -#: doc/guix.texi:11011 -#, no-wrap -msgid "{Scheme Procedure} wicd-service [#:wicd @var{wicd}]" -msgstr "{Procédure Scheme} wicd-service [#:wicd @var{wicd}]" - -#. type: deffn -#: doc/guix.texi:11014 -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 "" +#: guix/scripts/system.scm:954 +msgid " docker-image build a Docker image\n" +msgstr " docker-image compiler une image Docker\n" -#. type: deffn -#: doc/guix.texi:11019 -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 "" +#: guix/scripts/system.scm:956 +msgid " init initialize a root file system to run GNU\n" +msgstr " init initialiser un système de fichier racine pour lancer GNU.\n" -#. type: cindex -#: doc/guix.texi:11021 -#, no-wrap -msgid "ModemManager" -msgstr "" +#: guix/scripts/system.scm:958 +msgid " extension-graph emit the service extension graph in Dot format\n" +msgstr " extension-graph produire le graphique des extensions de service au format Dot\n" -#. type: defvr -#: doc/guix.texi:11023 -#, no-wrap -msgid "{Scheme Variable} modem-manager-service-type" -msgstr "{Variable Scheme} modem-manager-service-type" +#: guix/scripts/system.scm:960 +msgid " shepherd-graph emit the graph of shepherd services in Dot format\n" +msgstr " shepherd-graph produire le graphique des services du shepherd au format Dot\n" -#. type: defvr -#: doc/guix.texi:11028 -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." +#: guix/scripts/system.scm:964 +msgid "" +"\n" +" -d, --derivation return the derivation of the given system" msgstr "" +"\n" +" -d, --derivation retourner les dérivations pour le système donné" -#. type: defvr -#: doc/guix.texi:11031 doc/guix.texi:11053 -msgid "This service is part of @code{%desktop-services} (@pxref{Desktop Services})." +#: guix/scripts/system.scm:966 +msgid "" +"\n" +" -e, --expression=EXPR consider the operating-system EXPR evaluates to\n" +" instead of reading FILE, when applicable" msgstr "" +"\n" +" -e, --expression=EXPR considère le paquet évalué par EXPR\n" +" au lieu de lire FICHIER, lorsque c'est possible" -#. type: deftp -#: doc/guix.texi:11033 -#, no-wrap -msgid "{Data Type} modem-manager-configuration" -msgstr "{Type de donnée} modem-manager-configuration" - -#. type: deftp -#: doc/guix.texi:11035 -msgid "Data type representing the configuration of ModemManager." -msgstr "Type de donnée représentant la configuration de ModemManager." - -#. type: item -#: doc/guix.texi:11037 -#, no-wrap -msgid "@code{modem-manager} (default: @code{modem-manager})" -msgstr "@code{modem-manager} (par défaut : @code{modem-manager})" - -#. type: table -#: doc/guix.texi:11039 -msgid "The ModemManager package to use." -msgstr "Le paquet ModemManager à utiliser." - -#. type: cindex -#: doc/guix.texi:11043 -#, no-wrap -msgid "NetworkManager" -msgstr "NetworkManager" - -#. type: defvr -#: doc/guix.texi:11045 -#, no-wrap -msgid "{Scheme Variable} network-manager-service-type" -msgstr "{Variable Scheme} network-manager-service-type" - -#. type: defvr -#: doc/guix.texi:11050 -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." +#: guix/scripts/system.scm:969 +msgid "" +"\n" +" --on-error=STRATEGY\n" +" apply STRATEGY when an error occurs while reading FILE" msgstr "" +"\n" +" --on-error=STRATÉGIE\n" +" appliquer la STRATÉGIE quand une erreur survient en lisant le FICHIER" -#. type: deftp -#: doc/guix.texi:11055 -#, no-wrap -msgid "{Data Type} network-manager-configuration" -msgstr "{Type de données} network-manager-configuration" - -#. type: deftp -#: doc/guix.texi:11057 -msgid "Data type representing the configuration of NetworkManager." +#: guix/scripts/system.scm:972 +msgid "" +"\n" +" --file-system-type=TYPE\n" +" for 'disk-image', produce a root file system of TYPE\n" +" (one of 'ext4', 'iso9660')" msgstr "" +"\n" +" --file-system-type=TYPE\n" +" avec « disk-image », produit un système de fichiers racine de TYPE\n" +" (parmis « ext4» et « iso9660 »)" -#. type: item -#: doc/guix.texi:11059 -#, no-wrap -msgid "@code{network-manager} (default: @code{network-manager})" -msgstr "@code{network-manager} (par défaut : @code{network-manager})" - -#. type: table -#: doc/guix.texi:11061 -msgid "The NetworkManager package to use." -msgstr "Le paquet NetworkManager à utiliser." - -#. type: item -#: doc/guix.texi:11062 -#, no-wrap -msgid "@code{dns} (default: @code{\"default\"})" -msgstr "@code{dns} (par défaut : @code{\"default\"})" - -#. type: table -#: doc/guix.texi:11065 -msgid "Processing mode for DNS, which affects how NetworkManager uses the @code{resolv.conf} configuration file." +#: guix/scripts/system.scm:976 +msgid "" +"\n" +" --image-size=SIZE for 'vm-image', produce an image of SIZE" msgstr "" +"\n" +" --image-size=TAILLE\n" +" pour « vm-image », produire une image de TAILLE" -#. type: item -#: doc/guix.texi:11067 -#, no-wrap -msgid "default" +#: guix/scripts/system.scm:978 +msgid "" +"\n" +" --no-bootloader for 'init', do not install a bootloader" msgstr "" +"\n" +" --no-bootloader pour « init », ne pas installer un chargeur de démarrage" -#. type: table -#: doc/guix.texi:11070 -msgid "NetworkManager will update @code{resolv.conf} to reflect the nameservers provided by currently active connections." +#: guix/scripts/system.scm:980 +msgid "" +"\n" +" --share=SPEC for 'vm', share host file system according to SPEC" msgstr "" +"\n" +" --share=SPEC pour « vm », partager le système de fichiers hôte selon\n" +" SPEC" -#. type: item -#: doc/guix.texi:11071 -#, no-wrap -msgid "dnsmasq" +#: guix/scripts/system.scm:982 +msgid "" +"\n" +" -r, --root=FILE for 'vm', 'vm-image', 'disk-image', 'container',\n" +" and 'build', make FILE a symlink to the result, and\n" +" register it as a garbage collector root" msgstr "" +"\n" +" -r, --root=FICHIER pour « vm », « vm-image », « disk-image », « container »\n" +" et « build », faire de FICHIER un lien symbolique pointant\n" +" sur le résultat et l'enregistrer en tant que racine du\n" +" ramasse-miettes" -#. type: table -#: doc/guix.texi:11075 -msgid "NetworkManager will run @code{dnsmasq} as a local caching nameserver, using a \"split DNS\" configuration if you are connected to a VPN, and then update @code{resolv.conf} to point to the local nameserver." +#: guix/scripts/system.scm:986 +msgid "" +"\n" +" --expose=SPEC for 'vm', expose host file system according to SPEC" msgstr "" +"\n" +" --expose=SPEC pour « vm », exposer le système de fichiers hôte selon\n" +" SPEC" -#. type: item -#: doc/guix.texi:11076 doc/guix.texi:12100 -#, no-wrap -msgid "none" +#: guix/scripts/system.scm:988 +msgid "" +"\n" +" --full-boot for 'vm', make a full boot sequence" msgstr "" +"\n" +" --full-boot pour « vm », accomplir une séquence complète de démarrage" -#. type: table -#: doc/guix.texi:11078 -msgid "NetworkManager will not modify @code{resolv.conf}." +#: guix/scripts/system.scm:990 +msgid "" +"\n" +" --skip-checks skip file system and initrd module safety checks" msgstr "" +"\n" +" --skip-checks ignorer les tests de sécurité des systèmes de fichiers et\n" +" des modules de l'initrd" -#. type: item -#: doc/guix.texi:11080 -#, no-wrap -msgid "@code{vpn-plugins} (default: @code{'()})" -msgstr "@code{vpn-plugins} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:11084 -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 "" +#: guix/scripts/system.scm:1089 +#, scheme-format +msgid "both file and expression cannot be specified~%" +msgstr "on ne peut pas spécifier à la fois un fichier et une expression~%" -#. type: cindex -#: doc/guix.texi:11088 -#, no-wrap -msgid "Connman" -msgstr "" +#: guix/scripts/system.scm:1096 +#, scheme-format +msgid "no configuration specified~%" +msgstr "aucune configuration spécifiée~%" -#. type: deffn -#: doc/guix.texi:11089 -#, no-wrap -msgid "{Scheme Variable} connman-service-type" -msgstr "{Variable Scheme} connman-service-type" +#: guix/scripts/system.scm:1196 +#, scheme-format +msgid "~a: unknown action~%" +msgstr "~a : action inconnue~%" -#. type: deffn -#: doc/guix.texi:11092 -msgid "This is the service type to run @url{https://01.org/connman,Connman}, a network connection manager." -msgstr "" +#: guix/scripts/system.scm:1212 +#, scheme-format +msgid "wrong number of arguments for action '~a'~%" +msgstr "nombre d'arguments incorrect pour l'action « ~a »~%" -#. type: deffn -#: doc/guix.texi:11095 -msgid "Its value must be an @code{connman-configuration} record as in this example:" -msgstr "" +#: guix/scripts/system.scm:1217 +#, scheme-format +msgid "guix system: missing command name~%" +msgstr "guix system : nom de commande manquant~%" -#. type: example -#: doc/guix.texi:11100 -#, no-wrap -msgid "" -"(service connman-service-type\n" -" (connman-configuration\n" -" (disable-vpn? #t)))\n" -msgstr "" +#: guix/scripts/system.scm:1219 +#, scheme-format +msgid "Try 'guix system --help' for more information.~%" +msgstr "Essayez « guix system --help » pour plus d'informations.~%" -#. type: deffn -#: doc/guix.texi:11103 -msgid "See below for details about @code{connman-configuration}." -msgstr "" +#: guix/scripts/system/search.scm:88 guix/ui.scm:1162 guix/ui.scm:1176 +msgid "unknown" +msgstr "inconnu" -#. type: deftp -#: doc/guix.texi:11105 -#, no-wrap -msgid "{Data Type} connman-configuration" -msgstr "{Type de données} connman-configuration" +#: guix/scripts/lint.scm:139 +#, scheme-format +msgid "Available checkers:~%" +msgstr "Vérificateurs disponibles :~%" -#. type: deftp -#: doc/guix.texi:11107 -msgid "Data Type representing the configuration of connman." -msgstr "" +#: guix/scripts/lint.scm:163 +msgid "description should not be empty" +msgstr "la description ne devrait pas être vide" -#. type: item -#: doc/guix.texi:11109 -#, no-wrap -msgid "@code{connman} (default: @var{connman})" -msgstr "@code{connman} (par défaut : @var{connman})" - -#. type: table -#: doc/guix.texi:11111 -msgid "The connman package to use." -msgstr "Le paquet connman à utiliser." - -#. type: item -#: doc/guix.texi:11112 -#, no-wrap -msgid "@code{disable-vpn?} (default: @code{#f})" -msgstr "@code{disable-vpn?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:11114 -msgid "When true, enable connman's vpn plugin." -msgstr "" +#: guix/scripts/lint.scm:173 +msgid "Texinfo markup in description is invalid" +msgstr "Des balises Texinfo dans la description sont invalides" -#. type: cindex -#: doc/guix.texi:11117 -#, no-wrap -msgid "WPA Supplicant" +#: guix/scripts/lint.scm:183 +#, scheme-format +msgid "" +"description should not contain ~\n" +"trademark sign '~a' at ~d" msgstr "" +"la description ne devrait pas contenir ~\n" +"le signe de marque déposée « ~a » à ~d" -#. type: defvr -#: doc/guix.texi:11118 -#, no-wrap -msgid "{Scheme Variable} wpa-supplicant-service-type" -msgstr "{Variable Scheme} wpa-supplicant-service-type" - -#. type: defvr -#: doc/guix.texi:11123 -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. It is configured to listen for requests on D-Bus." -msgstr "" +#. TRANSLATORS: '@code' is Texinfo markup and must be kept +#. as is. +#: guix/scripts/lint.scm:196 +msgid "use @code or similar ornament instead of quotes" +msgstr "utiliser @code ou une décoration similaire au lieu des guillemets" -#. type: defvr -#: doc/guix.texi:11126 -msgid "The value of this service is the @code{wpa-supplicant} package to use. Thus, it can be instantiated like this:" -msgstr "" +#: guix/scripts/lint.scm:203 +msgid "description should start with an upper-case letter or digit" +msgstr "la description devrait commencer par une majuscule ou un chiffre" -#. type: lisp -#: doc/guix.texi:11129 -#, no-wrap +#: guix/scripts/lint.scm:219 +#, scheme-format msgid "" -"(use-modules (gnu services networking))\n" -"\n" +"sentences in description should be followed ~\n" +"by two spaces; possible infraction~p at ~{~a~^, ~}" msgstr "" +"les phrases dans la description devraient être suivies ~\n" +"par deux espaces. Infraction probable~p à ~{~a~^, ~}" -#. type: lisp -#: doc/guix.texi:11131 -#, no-wrap -msgid "(service wpa-supplicant-service-type)\n" -msgstr "" +#: guix/scripts/lint.scm:237 +#, scheme-format +msgid "invalid description: ~s" +msgstr "description invalide : ~s" -#. type: cindex -#: doc/guix.texi:11134 -#, no-wrap -msgid "NTP" -msgstr "" +#: guix/scripts/lint.scm:282 +#, scheme-format +msgid "'~a' should probably be a native input" +msgstr "« ~a » devrait sans doute être une entrée native" -#. type: cindex -#: doc/guix.texi:11135 -#, no-wrap -msgid "real time clock" -msgstr "" +#: guix/scripts/lint.scm:298 +#, scheme-format +msgid "'~a' should probably not be an input at all" +msgstr "« ~a » ne devrait probablement pas être une entrée du tout" + +#: guix/scripts/lint.scm:315 +msgid "synopsis should not be empty" +msgstr "le synopsis ne devrait pas être vide" + +#: guix/scripts/lint.scm:323 +msgid "no period allowed at the end of the synopsis" +msgstr "un point n'est pas autorisé à la fin du synopsis" + +#: guix/scripts/lint.scm:335 +msgid "no article allowed at the beginning of the synopsis" +msgstr "les articles ne sont pas permis au début du synopsis" + +#: guix/scripts/lint.scm:342 +msgid "synopsis should be less than 80 characters long" +msgstr "le synopsis devrait être plus court que 80 caractères" + +#: guix/scripts/lint.scm:348 +msgid "synopsis should start with an upper-case letter or digit" +msgstr "le synopsis devrait commencer par une majuscule ou un chiffre" + +#: guix/scripts/lint.scm:355 +msgid "synopsis should not start with the package name" +msgstr "le synopsis ne devrait pas commencer par un nom de paquet" + +#: guix/scripts/lint.scm:365 +msgid "Texinfo markup in synopsis is invalid" +msgstr "La balise Texinfo dans le synopsis est invalide" + +#: guix/scripts/lint.scm:384 +#, scheme-format +msgid "invalid synopsis: ~s" +msgstr "synopsis non valide : ~s" + +#: guix/scripts/lint.scm:503 +#, scheme-format +msgid "URI ~a returned suspiciously small file (~a bytes)" +msgstr "L'URI ~a a renvoyé un fichier étrangement petit (~a octets)" + +#: guix/scripts/lint.scm:513 +#, scheme-format +msgid "permanent redirect from ~a to ~a" +msgstr "redirection permanente de ~a vers ~a" + +#: guix/scripts/lint.scm:520 +#, scheme-format +msgid "invalid permanent redirect from ~a" +msgstr "redirection permanente invalide : ~a" + +#: guix/scripts/lint.scm:527 guix/scripts/lint.scm:539 +#, scheme-format +msgid "URI ~a not reachable: ~a (~s)" +msgstr "L'URI ~a n'a pu être atteinte : ~a (~s)" + +#: guix/scripts/lint.scm:546 +#, scheme-format +msgid "URI ~a domain not found: ~a" +msgstr "Le domaine de l'URI ~a n'a pas été trouvé : ~a" + +#: guix/scripts/lint.scm:554 +#, scheme-format +msgid "URI ~a unreachable: ~a" +msgstr "L'URI ~a n'a pu être atteinte : ~a" + +#: guix/scripts/lint.scm:563 +#, scheme-format +msgid "TLS certificate error: ~a" +msgstr "Erreur de certificat TLS : ~a" + +#: guix/scripts/lint.scm:584 +msgid "invalid value for home page" +msgstr "valeur invalide pour la page d'accueil" + +#: guix/scripts/lint.scm:587 +#, scheme-format +msgid "invalid home page URL: ~s" +msgstr "URL de la page d'accueil invalide : ~s" + +#: guix/scripts/lint.scm:613 +msgid "file names of patches should start with the package name" +msgstr "les noms de fichiers des correctifs devraient commencer par le nom du paquet" + +#: guix/scripts/lint.scm:629 +#, scheme-format +msgid "~a: file name is too long" +msgstr "~a : le nom de fichier est trop long" + +#: guix/scripts/lint.scm:670 +#, scheme-format +msgid "~a: ~a: proposed synopsis: ~s~%" +msgstr "~a : ~a : synopsis proposé : ~s~%" + +#: guix/scripts/lint.scm:683 +#, scheme-format +msgid "~a: ~a: proposed description:~% \"~a\"~%" +msgstr "~a : ~a : description proposée :~% « ~a »~%" + +#: guix/scripts/lint.scm:725 +msgid "all the source URIs are unreachable:" +msgstr "toutes les URI sources sont inatteignables :" + +#: guix/scripts/lint.scm:747 +msgid "the source file name should contain the package name" +msgstr "le nom du fichier source devrait contenir le nom du paquet" + +#: guix/scripts/lint.scm:763 +#, scheme-format +msgid "URL should be 'mirror://~a/~a'" +msgstr "L'URL devrait être « mirror://~a/~a »" + +#: guix/scripts/lint.scm:781 guix/scripts/lint.scm:785 +#, scheme-format +msgid "failed to create derivation: ~a" +msgstr "échec à la création de la dérivation : ~a" + +#: guix/scripts/lint.scm:799 +#, scheme-format +msgid "failed to create derivation: ~s~%" +msgstr "échec à la création de la dérivation : ~s~%" + +#: guix/scripts/lint.scm:809 +msgid "invalid license field" +msgstr "champ de licence invalide" + +#: guix/scripts/lint.scm:816 +#, scheme-format +msgid "~a: HTTP GET error for ~a: ~a (~s)~%" +msgstr "~a : erreur HTTP GET pour ~a : ~a (~s)~%" + +#: guix/scripts/lint.scm:826 +#, scheme-format +msgid "~a: host lookup failure: ~a~%" +msgstr "~a : erreur lors de la consultation du nom d'hôte : ~a~%" + +#: guix/scripts/lint.scm:831 +#, scheme-format +msgid "~a: TLS certificate error: ~a" +msgstr "~a : erreur de certificat TLS : ~a" + +#: guix/scripts/lint.scm:846 +msgid "while retrieving CVE vulnerabilities" +msgstr "pendant la récupération des vulnérabilités CVE" + +#: guix/scripts/lint.scm:883 +#, scheme-format +msgid "probably vulnerable to ~a" +msgstr "probablement vulnérable à ~a" + +#: guix/scripts/lint.scm:890 +#, scheme-format +msgid "while retrieving upstream info for '~a'" +msgstr "pendant la récupération des informations en amont de « ~a »" + +#: guix/scripts/lint.scm:898 +#, scheme-format +msgid "can be upgraded to ~a" +msgstr "peut être mis à jour vers ~a" + +#: guix/scripts/lint.scm:913 +#, scheme-format +msgid "tabulation on line ~a, column ~a" +msgstr "tabulation à la ligne ~a, colonne ~a" -#. type: deffn -#: doc/guix.texi:11136 -#, no-wrap -msgid "{Scheme Procedure} ntp-service [#:ntp @var{ntp}] @" -msgstr "{Procédure Scheme} ntp-service [#:ntp @var{ntp}] @" +#: guix/scripts/lint.scm:922 +#, scheme-format +msgid "trailing white space on line ~a" +msgstr "espace à la fin de la ligne ~a" -#. type: deffn -#: doc/guix.texi:11144 -msgid "[#:servers @var{%ntp-servers}] @ [#:allow-large-adjustment? #f] Return a service that runs the daemon from @var{ntp}, the @uref{http://www.ntp.org, Network Time Protocol package}. The daemon will keep the system clock synchronized with that of @var{servers}. @var{allow-large-adjustment?} determines whether @command{ntpd} is allowed to make an initial adjustment of more than 1,000 seconds." -msgstr "" +#: guix/scripts/lint.scm:932 +#, scheme-format +msgid "line ~a is way too long (~a characters)" +msgstr "la ligne ~a est beaucoup trop longue (~a caractères)" -#. type: defvr -#: doc/guix.texi:11146 -#, no-wrap -msgid "{Scheme Variable} %ntp-servers" -msgstr "{Variable Scheme} %ntp-servers" +#: guix/scripts/lint.scm:943 +#, scheme-format +msgid "line ~a: parentheses feel lonely, move to the previous or next line" +msgstr "ligne ~a : des parenthèses se sentent seules. À déplacer à la ligne suivante ou précédente" -#. type: defvr -#: doc/guix.texi:11148 -msgid "List of host names used as the default NTP servers." -msgstr "" +#: guix/scripts/lint.scm:1013 +msgid "Validate package descriptions" +msgstr "Valider des descriptions de paquets" -#. type: cindex -#: doc/guix.texi:11150 -#, no-wrap -msgid "OpenNTPD" -msgstr "" +#: guix/scripts/lint.scm:1017 +msgid "Validate synopsis & description of GNU packages" +msgstr "Valider le synopsis et la description de paquets GNU" -#. type: deffn -#: doc/guix.texi:11151 -#, no-wrap -msgid "{Scheme Procedure} openntpd-service-type" -msgstr "{Procédure Scheme} openntpd-service-type" +#: guix/scripts/lint.scm:1021 +msgid "Identify inputs that should be native inputs" +msgstr "Identifier les entrées qui devraient être natives" -#. type: deffn -#: doc/guix.texi:11155 -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 "" +#: guix/scripts/lint.scm:1025 +msgid "Identify inputs that shouldn't be inputs at all" +msgstr "Identifier les entrées qui ne devraient pas être des entrées du tout" -#. type: example -#: doc/guix.texi:11165 -#, no-wrap -msgid "" -"(service\n" -" openntpd-service-type\n" -" (openntpd-configuration\n" -" (listen-on '(\"127.0.0.1\" \"::1\"))\n" -" (sensor '(\"udcf0 correction 70000\"))\n" -" (constraint-from '(\"www.gnu.org\"))\n" -" (constraints-from '(\"https://www.google.com/\"))\n" -" (allow-large-adjustment? #t)))\n" -"\n" -msgstr "" +#: guix/scripts/lint.scm:1029 +msgid "Validate file names and availability of patches" +msgstr "Valider les noms de fichiers et la disponibilité de correctifs" -#. type: deftp -#: doc/guix.texi:11169 -#, no-wrap -msgid "{Data Type} openntpd-configuration" -msgstr "{Type de données} openntpd-configuration" - -#. type: item -#: doc/guix.texi:11171 -#, no-wrap -msgid "@code{openntpd} (default: @code{(file-append openntpd \"/sbin/ntpd\")})" -msgstr "@code{openntpd} (par défaut : @code{(file-append openntpd \"/sbin/ntpd\")})" - -#. type: table -#: doc/guix.texi:11173 -msgid "The openntpd executable to use." -msgstr "" +#: guix/scripts/lint.scm:1033 +msgid "Validate home-page URLs" +msgstr "Valider les URL des pages d'accueil" -#. type: item -#: doc/guix.texi:11173 -#, no-wrap -msgid "@code{listen-on} (default: @code{'(\"127.0.0.1\" \"::1\")})" -msgstr "@code{listen-on} (par défaut : @code{'(\"127.0.0.1\" \"::1\")})" +#. TRANSLATORS: is the name of a data type and must not be +#. translated. +#: guix/scripts/lint.scm:1039 +msgid "Make sure the 'license' field is a or a list thereof" +msgstr "Assurez vous que le champ « licence » est une ou une telle liste" -#. type: table -#: doc/guix.texi:11175 -msgid "A list of local IP addresses or hostnames the ntpd daemon should listen on." -msgstr "" +#: guix/scripts/lint.scm:1044 +msgid "Validate source URLs" +msgstr "Valider les URL sources" -#. type: item -#: doc/guix.texi:11175 -#, no-wrap -msgid "@code{query-from} (default: @code{'()})" -msgstr "@code{query-from} (par défaut : @code{'()})" +#: guix/scripts/lint.scm:1048 +msgid "Suggest 'mirror://' URLs" +msgstr "Suggérer les URL « mirror:// »" -#. type: table -#: doc/guix.texi:11177 -msgid "A list of local IP address the ntpd daemon should use for outgoing queries." -msgstr "" +#: guix/scripts/lint.scm:1052 +msgid "Validate file names of sources" +msgstr "Valider les noms des fichiers des sources" -#. type: item -#: doc/guix.texi:11177 -#, no-wrap -msgid "@code{sensor} (default: @code{'()})" -msgstr "@code{sensor} (par défaut : @code{'()})" +#: guix/scripts/lint.scm:1056 +msgid "Report failure to compile a package to a derivation" +msgstr "Signaler l'échec de la compilation d'un paquet d'une dérivation" -#. type: table -#: doc/guix.texi:11182 -msgid "Specify a list of timedelta sensor devices ntpd should use. @code{ntpd} will listen to each sensor that acutally exists and ignore non-existant ones. See @uref{https://man.openbsd.org/ntpd.conf, upstream documentation} for more information." -msgstr "" +#: guix/scripts/lint.scm:1060 +msgid "Validate package synopses" +msgstr "Valider les synopsis des paquets" -#. type: item -#: doc/guix.texi:11182 -#, no-wrap -msgid "@code{server} (default: @var{%ntp-servers})" -msgstr "@code{server} (par défaut : @var{%ntp-servers})" +#: guix/scripts/lint.scm:1064 +msgid "Check the Common Vulnerabilities and Exposures (CVE) database" +msgstr "Vérifier la base de données des vulnérabilités et failles connues (CVE)" -#. type: table -#: doc/guix.texi:11184 -msgid "Specify a list of IP addresses or hostnames of NTP servers to synchronize to." -msgstr "" +#: guix/scripts/lint.scm:1069 +msgid "Check the package for new upstream releases" +msgstr "Vérifier s'il y a une nouvelle version en amont pour le paquet" -#. type: item -#: doc/guix.texi:11184 doc/guix.texi:16965 -#, no-wrap -msgid "@code{servers} (default: @code{'()})" -msgstr "@code{servers} (par défaut : @code{'()})" +#: guix/scripts/lint.scm:1073 +msgid "Look for formatting issues in the source" +msgstr "Rechercher des problèmes de format dans la source" -#. type: table -#: doc/guix.texi:11186 -msgid "Specify a list of IP addresses or hostnames of NTP pools to synchronize to." +#: guix/scripts/lint.scm:1101 +msgid "" +"Usage: guix lint [OPTION]... [PACKAGE]...\n" +"Run a set of checkers on the specified package; if none is specified,\n" +"run the checkers on all packages.\n" msgstr "" +"Usage : guix lint [OPTION]... [PAQUET]...\n" +"Lancer un ensemble de vérificateurs sur le paquet spécifié ; si aucun n'est spécifié,\n" +"lancer les vérificateurs sur tous les paquets.\n" -#. type: item -#: doc/guix.texi:11186 -#, no-wrap -msgid "@code{constraint-from} (default: @code{'()})" -msgstr "@code{constraint-from} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:11193 -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." +#: guix/scripts/lint.scm:1104 +msgid "" +"\n" +" -c, --checkers=CHECKER1,CHECKER2...\n" +" only run the specified checkers" msgstr "" +"\n" +" -c, --checkers=CHECKER1,CHECKER2...\n" +" lancer uniquement les vérificateurs spécifiés" -#. type: item -#: doc/guix.texi:11193 -#, no-wrap -msgid "@code{constraints-from} (default: @code{'()})" -msgstr "@code{constraints-from} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:11197 -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." +#: guix/scripts/lint.scm:1109 +msgid "" +"\n" +" -l, --list-checkers display the list of available lint checkers" msgstr "" +"\n" +" -l, --list-checkers afficher la liste des vérificateurs disponibles" -#. type: item -#: doc/guix.texi:11197 -#, no-wrap -msgid "@code{allow-large-adjustment?} (default: @code{#f})" -msgstr "@code{allow-large-adjustment?} (par défaut : @code{#f})" +#: guix/scripts/lint.scm:1129 +#, scheme-format +msgid "~a: invalid checker~%" +msgstr "~a : vérificateur non valide~%" -#. type: table -#: doc/guix.texi:11200 -msgid "Determines if @code{ntpd} is allowed to make an initial adjustment of more than 180 seconds." +#: guix/scripts/publish.scm:68 +#, scheme-format +msgid "" +"Usage: guix publish [OPTION]...\n" +"Publish ~a over HTTP.\n" msgstr "" +"Usage : guix publish [OPTION]...\n" +"Diffuser ~a via HTTP.\n" -#. type: cindex -#: doc/guix.texi:11203 -#, no-wrap -msgid "inetd" +#: guix/scripts/publish.scm:70 +msgid "" +"\n" +" -p, --port=PORT listen on PORT" msgstr "" +"\n" +" -p, --port=PORT écouter sur le PORT" -#. type: deffn -#: doc/guix.texi:11204 -#, no-wrap -msgid "{Scheme variable} inetd-service-type" +#: guix/scripts/publish.scm:72 +msgid "" +"\n" +" --listen=HOST listen on the network interface for HOST" msgstr "" +"\n" +" --listen=HÔTE écouter sur l'interface réseau HÔTE" -#. type: deffn -#: doc/guix.texi:11209 -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." +#: guix/scripts/publish.scm:74 +msgid "" +"\n" +" -u, --user=USER change privileges to USER as soon as possible" msgstr "" +"\n" +" -u, --user=UTILISATEUR\n" +" changer les privilèges de UTILISATEUR aussi vite\n" +" que possible" -#. type: deffn -#: doc/guix.texi:11215 -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}:" +#: guix/scripts/publish.scm:76 +msgid "" +"\n" +" -C, --compression[=LEVEL]\n" +" compress archives at LEVEL" msgstr "" +"\n" +" -C, --compression[=NIVEAU]\n" +" compresser les archives au NIVEAU" -#. type: example -#: doc/guix.texi:11238 -#, no-wrap +#: guix/scripts/publish.scm:79 msgid "" -"(service\n" -" inetd-service-type\n" -" (inetd-configuration\n" -" (entries (list\n" -" (inetd-entry\n" -" (name \"echo\")\n" -" (socket-type 'stream)\n" -" (protocol \"tcp\")\n" -" (wait? #f)\n" -" (user \"root\"))\n" -" (inetd-entry\n" -" (node \"127.0.0.1\")\n" -" (name \"smtp\")\n" -" (socket-type 'stream)\n" -" (protocol \"tcp\")\n" -" (wait? #f)\n" -" (user \"root\")\n" -" (program (file-append openssh \"/bin/ssh\"))\n" -" (arguments\n" -" '(\"ssh\" \"-qT\" \"-i\" \"/path/to/ssh_key\"\n" -" \"-W\" \"smtp-server:25\" \"user@@hostname\")))))\n" +"\n" +" -c, --cache=DIRECTORY cache published items to DIRECTORY" msgstr "" +"\n" +" -c, --cache=RÉPERTOIRE mettre les éléments publiés en cache dans le RÉPERTOIRE" -#. type: deffn -#: doc/guix.texi:11241 -msgid "See below for more details about @code{inetd-configuration}." -msgstr "" - -#. type: deftp -#: doc/guix.texi:11243 -#, no-wrap -msgid "{Data Type} inetd-configuration" -msgstr "{Type de données} inetd-configuration" - -#. type: deftp -#: doc/guix.texi:11245 -msgid "Data type representing the configuration of @command{inetd}." -msgstr "" - -#. type: item -#: doc/guix.texi:11247 -#, no-wrap -msgid "@code{program} (default: @code{(file-append inetutils \"/libexec/inetd\")})" -msgstr "@code{program} (par défaut : @code{(file-append inetutils \"/libexec/inetd\")})" - -#. type: table -#: doc/guix.texi:11249 -msgid "The @command{inetd} executable to use." -msgstr "" - -#. type: item -#: doc/guix.texi:11250 doc/guix.texi:16671 -#, no-wrap -msgid "@code{entries} (default: @code{'()})" -msgstr "@code{entries} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:11253 -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:11256 -#, no-wrap -msgid "{Data Type} inetd-entry" -msgstr "{Type de données} inetd-entry" - -#. type: deftp -#: doc/guix.texi:11260 -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:11262 -#, no-wrap -msgid "@code{node} (default: @code{#f})" -msgstr "@code{node} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:11267 -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:11269 -msgid "A string, the name must correspond to an entry in @code{/etc/services}." -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:11269 -#, no-wrap -msgid "socket-type" -msgstr "" - -#. type: table -#: doc/guix.texi:11272 -msgid "One of @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} or @code{'seqpacket}." -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:11272 -#, no-wrap -msgid "protocol" -msgstr "" - -#. type: table -#: doc/guix.texi:11274 -msgid "A string, must correspond to an entry in @code{/etc/protocols}." -msgstr "" - -#. type: item -#: doc/guix.texi:11274 -#, no-wrap -msgid "@code{wait?} (default: @code{#t})" -msgstr "@code{wait?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:11277 -msgid "Whether @command{inetd} should wait for the server to exit before listening to new service requests." -msgstr "" - -#. type: table -#: doc/guix.texi:11282 -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:11282 -#, no-wrap -msgid "@code{program} (default: @code{\"internal\"})" -msgstr "@code{program} (par défaut : @code{\"internal\"})" - -#. type: table -#: doc/guix.texi:11285 -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:11290 -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:11294 -msgid "@xref{Configuration file,,, inetutils, GNU Inetutils} for a more detailed discussion of each configuration field." -msgstr "" - -#. type: cindex -#: doc/guix.texi:11296 -#, no-wrap -msgid "Tor" -msgstr "" - -#. type: deffn -#: doc/guix.texi:11297 -#, no-wrap -msgid "{Scheme Procedure} tor-service [@var{config-file}] [#:tor @var{tor}]" -msgstr "{Procédure Scheme} tor-service [@var{config-file}] [#:tor @var{tor}]" - -#. type: deffn -#: doc/guix.texi:11300 -msgid "Return a service to run the @uref{https://torproject.org, Tor} anonymous networking daemon." -msgstr "" - -#. type: deffn -#: doc/guix.texi:11305 -msgid "The daemon runs as the @code{tor} unprivileged user. It is passed @var{config-file}, a file-like object, with an additional @code{User tor} line and lines for hidden services added via @code{tor-hidden-service}. Run @command{man tor} for information about the configuration file." -msgstr "" - -#. type: cindex -#: doc/guix.texi:11307 -#, no-wrap -msgid "hidden service" -msgstr "" - -#. type: deffn -#: doc/guix.texi:11308 -#, no-wrap -msgid "{Scheme Procedure} tor-hidden-service @var{name} @var{mapping}" -msgstr "{Procédure Scheme} tor-hidden-service @var{name} @var{mapping}" - -#. type: deffn -#: doc/guix.texi:11311 -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:11315 -#, no-wrap -msgid "" -" '((22 \"127.0.0.1:22\")\n" -" (80 \"127.0.0.1:8080\"))\n" -msgstr "" - -#. type: deffn -#: doc/guix.texi:11319 -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:11323 -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:11326 -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:11329 -msgid "The @code{(gnu services rsync)} module provides the following services:" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:11333 -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:11334 -#, no-wrap -msgid "{Scheme Variable} rsync-service-type" -msgstr "{Variable Scheme} rsync-service-type" - -#. type: deffn -#: doc/guix.texi:11337 -msgid "This is the type for the @uref{https://rsync.samba.org, rsync} rsync daemon, @command{rsync-configuration} record as in this example:" -msgstr "" - -#. type: example -#: doc/guix.texi:11340 -#, no-wrap -msgid "(service rsync-service-type)\n" -msgstr "" - -#. type: deffn -#: doc/guix.texi:11343 -msgid "See below for details about @code{rsync-configuration}." -msgstr "" - -#. type: deftp -#: doc/guix.texi:11345 -#, no-wrap -msgid "{Data Type} rsync-configuration" -msgstr "{Type de données} rsync-configuration" - -#. type: deftp -#: doc/guix.texi:11347 -msgid "Data type representing the configuration for @code{rsync-service}." -msgstr "" - -#. type: item -#: doc/guix.texi:11349 -#, no-wrap -msgid "@code{package} (default: @var{rsync})" -msgstr "@code{package} (par défaut : @var{rsync})" - -#. type: table -#: doc/guix.texi:11351 -msgid "@code{rsync} package to use." -msgstr "" - -#. type: item -#: doc/guix.texi:11352 -#, no-wrap -msgid "@code{port-number} (default: @code{873})" -msgstr "@code{port-number} (par défaut : @code{873})" - -#. type: table -#: doc/guix.texi:11356 -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:11357 -#, no-wrap -msgid "@code{pid-file} (default: @code{\"/var/run/rsyncd/rsyncd.pid\"})" -msgstr "@code{pid-file} (par défaut : @code{\"/var/run/rsyncd/rsyncd.pid\"})" - -#. type: table -#: doc/guix.texi:11359 -msgid "Name of the file where @command{rsync} writes its PID." -msgstr "" - -#. type: item -#: doc/guix.texi:11360 -#, no-wrap -msgid "@code{lock-file} (default: @code{\"/var/run/rsyncd/rsyncd.lock\"})" -msgstr "@code{lock-file} (par défaut : @code{\"/var/run/rsyncd/rsyncd.lock\"})" - -#. type: table -#: doc/guix.texi:11362 -msgid "Name of the file where @command{rsync} writes its lock file." -msgstr "" - -#. type: item -#: doc/guix.texi:11363 -#, no-wrap -msgid "@code{log-file} (default: @code{\"/var/log/rsyncd.log\"})" -msgstr "@code{log-file} (par défaut : @code{\"/var/log/rsyncd.log\"})" - -#. type: table -#: doc/guix.texi:11365 -msgid "Name of the file where @command{rsync} writes its log file." -msgstr "" - -#. type: item -#: doc/guix.texi:11366 -#, no-wrap -msgid "@code{use-chroot?} (default: @var{#t})" -msgstr "@code{use-chroot?} (par défaut : @var{#t})" - -#. type: table -#: doc/guix.texi:11368 -msgid "Whether to use chroot for @command{rsync} shared directory." -msgstr "" - -#. type: item -#: doc/guix.texi:11369 -#, no-wrap -msgid "@code{share-path} (default: @file{/srv/rsync})" -msgstr "" - -#. type: table -#: doc/guix.texi:11371 -msgid "Location of the @command{rsync} shared directory." -msgstr "" - -#. type: item -#: doc/guix.texi:11372 -#, no-wrap -msgid "@code{share-comment} (default: @code{\"Rsync share\"})" -msgstr "@code{share-comment} (par défaut : @code{\"Rsync share\"})" - -#. type: table -#: doc/guix.texi:11374 -msgid "Comment of the @command{rsync} shared directory." -msgstr "" - -#. type: item -#: doc/guix.texi:11375 -#, no-wrap -msgid "@code{read-only?} (default: @var{#f})" -msgstr "@code{read-only?} (par défaut : @var{#f})" - -#. type: table -#: doc/guix.texi:11377 -msgid "Read-write permissions to shared directory." -msgstr "" - -#. type: item -#: doc/guix.texi:11378 -#, no-wrap -msgid "@code{timeout} (default: @code{300})" -msgstr "@code{timeout} (par défaut : @code{300})" - -#. type: table -#: doc/guix.texi:11380 -msgid "I/O timeout in seconds." -msgstr "" - -#. type: item -#: doc/guix.texi:11381 -#, no-wrap -msgid "@code{user} (default: @var{\"root\"})" -msgstr "@code{user} (par défaut : @var{\"root\"})" - -#. type: table -#: doc/guix.texi:11383 -msgid "Owner of the @code{rsync} process." -msgstr "" - -#. type: item -#: doc/guix.texi:11384 -#, no-wrap -msgid "@code{group} (default: @var{\"root\"})" -msgstr "@code{group} (par défaut : @var{\"root\"})" - -#. type: table -#: doc/guix.texi:11386 -msgid "Group of the @code{rsync} process." -msgstr "" - -#. type: item -#: doc/guix.texi:11387 -#, no-wrap -msgid "@code{uid} (default: @var{\"rsyncd\"})" -msgstr "@code{uid} (par défaut : @var{\"rsyncd\"})" - -#. type: table -#: doc/guix.texi:11390 -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:11391 -#, no-wrap -msgid "@code{gid} (default: @var{\"rsyncd\"})" -msgstr "@code{gid} (par défaut : @var{\"rsyncd\"})" - -#. type: table -#: doc/guix.texi:11393 -msgid "Group name or group ID that will be used when accessing the module." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:11398 -msgid "Furthermore, @code{(gnu services ssh)} provides the following services." -msgstr "" - -#. type: cindex -#: doc/guix.texi:11398 doc/guix.texi:11437 doc/guix.texi:21275 -#, no-wrap -msgid "SSH" -msgstr "" - -#. type: cindex -#: doc/guix.texi:11399 doc/guix.texi:11438 doc/guix.texi:21276 -#, no-wrap -msgid "SSH server" -msgstr "" - -#. type: deffn -#: doc/guix.texi:11401 -#, no-wrap -msgid "{Scheme Procedure} lsh-service [#:host-key \"/etc/lsh/host-key\"] @" -msgstr "{Procédure Scheme} lsh-service [#:host-key \"/etc/lsh/host-key\"] @" - -#. type: deffn -#: doc/guix.texi:11410 -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:11416 -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:11420 -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:11425 -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:11429 -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:11433 -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:11435 -msgid "The other options should be self-descriptive." -msgstr "" - -#. type: deffn -#: doc/guix.texi:11439 -#, no-wrap -msgid "{Scheme Variable} openssh-service-type" -msgstr "{Variable Scheme} openssh-service-type" - -#. type: deffn -#: doc/guix.texi:11443 -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: example -#: doc/guix.texi:11452 -#, no-wrap -msgid "" -"(service openssh-service-type\n" -" (openssh-configuration\n" -" (x11-forwarding? #t)\n" -" (permit-root-login 'without-password)\n" -" (authorized-keys\n" -" `((\"alice\" ,(local-file \"alice.pub\"))\n" -" (\"bob\" ,(local-file \"bob.pub\"))))))\n" -msgstr "" - -#. type: deffn -#: doc/guix.texi:11455 -msgid "See below for details about @code{openssh-configuration}." -msgstr "" - -#. type: deffn -#: doc/guix.texi:11458 -msgid "This service can be extended with extra authorized keys, as in this example:" -msgstr "" - -#. type: example -#: doc/guix.texi:11463 -#, no-wrap -msgid "" -"(service-extension openssh-service-type\n" -" (const `((\"charlie\"\n" -" ,(local-file \"charlie.pub\")))))\n" -msgstr "" - -#. type: deftp -#: doc/guix.texi:11466 -#, no-wrap -msgid "{Data Type} openssh-configuration" -msgstr "{Type de données} openssh-configuration" - -#. type: deftp -#: doc/guix.texi:11468 -msgid "This is the configuration record for OpenSSH's @command{sshd}." -msgstr "" - -#. type: item -#: doc/guix.texi:11470 -#, no-wrap -msgid "@code{pid-file} (default: @code{\"/var/run/sshd.pid\"})" -msgstr "@code{pid-file} (par défaut : @code{\"/var/run/sshd.pid\"})" - -#. type: table -#: doc/guix.texi:11472 -msgid "Name of the file where @command{sshd} writes its PID." -msgstr "" - -#. type: item -#: doc/guix.texi:11473 -#, no-wrap -msgid "@code{port-number} (default: @code{22})" -msgstr "@code{port-number} (par défaut : @code{22})" - -#. type: table -#: doc/guix.texi:11475 -msgid "TCP port on which @command{sshd} listens for incoming connections." -msgstr "" - -#. type: item -#: doc/guix.texi:11476 -#, no-wrap -msgid "@code{permit-root-login} (default: @code{#f})" -msgstr "@code{permit-root-login} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:11481 -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:11482 doc/guix.texi:11615 -#, no-wrap -msgid "@code{allow-empty-passwords?} (default: @code{#f})" -msgstr "@code{allow-empty-passwords?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:11485 -msgid "When true, users with empty passwords may log in. When false, they may not." -msgstr "" - -#. type: item -#: doc/guix.texi:11486 doc/guix.texi:11618 -#, no-wrap -msgid "@code{password-authentication?} (default: @code{#t})" -msgstr "@code{password-authentication?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:11489 -msgid "When true, users may log in with their password. When false, they have other authentication methods." -msgstr "" - -#. type: item -#: doc/guix.texi:11490 -#, no-wrap -msgid "@code{public-key-authentication?} (default: @code{#t})" -msgstr "@code{public-key-authentication?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:11493 -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:11496 -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:11497 -#, no-wrap -msgid "@code{x11-forwarding?} (default: @code{#f})" -msgstr "@code{x11-forwarding?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:11501 -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:11502 -#, no-wrap -msgid "@code{challenge-response-authentication?} (default: @code{#f})" -msgstr "@code{challenge-response-authentication?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:11505 -msgid "Specifies whether challenge response authentication is allowed (e.g. via PAM)." -msgstr "" - -#. type: item -#: doc/guix.texi:11506 -#, no-wrap -msgid "@code{use-pam?} (default: @code{#t})" -msgstr "@code{use-pam?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:11512 -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:11517 -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:11518 -#, no-wrap -msgid "@code{print-last-log?} (default: @code{#t})" -msgstr "@code{print-last-log?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:11521 -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:11522 -#, no-wrap -msgid "@code{subsystems} (default: @code{'((\"sftp\" \"internal-sftp\"))})" -msgstr "@code{subsystems} (par défaut : @code{'((\"sftp\" \"internal-sftp\"))})" - -#. type: table -#: doc/guix.texi:11524 -msgid "Configures external subsystems (e.g. file transfer daemon)." -msgstr "" - -#. type: table -#: doc/guix.texi:11528 -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:11531 -msgid "The command @command{internal-sftp} implements an in-process SFTP server. Alternately, one can specify the @command{sftp-server} command:" -msgstr "" - -#. type: example -#: doc/guix.texi:11536 -#, no-wrap -msgid "" -"(service openssh-service-type\n" -" (openssh-configuration\n" -" (subsystems\n" -" `((\"sftp\" ,(file-append openssh \"/libexec/sftp-server\"))))))\n" -msgstr "" - -#. type: item -#: doc/guix.texi:11538 -#, no-wrap -msgid "@code{accepted-environment} (default: @code{'()})" -msgstr "@code{accepted-environment} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:11540 -msgid "List of strings describing which environment variables may be exported." -msgstr "" - -#. type: table -#: doc/guix.texi:11543 -msgid "Each string gets on its own line. See the @code{AcceptEnv} option in @code{man sshd_config}." -msgstr "" - -#. type: table -#: doc/guix.texi:11548 -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." -msgstr "" - -#. type: example -#: doc/guix.texi:11553 -#, no-wrap -msgid "" -"(service openssh-service-type\n" -" (openssh-configuration\n" -" (accepted-environment '(\"COLORTERM\"))))\n" -msgstr "" - -#. type: item -#: doc/guix.texi:11555 -#, no-wrap -msgid "@code{authorized-keys} (default: @code{'()})" -msgstr "@code{authorized-keys} (par défaut : @code{'()})" - -#. type: cindex -#: doc/guix.texi:11556 -#, no-wrap -msgid "authorized keys, SSH" -msgstr "" - -#. type: cindex -#: doc/guix.texi:11557 -#, no-wrap -msgid "SSH authorized keys" -msgstr "" - -#. type: table -#: doc/guix.texi:11561 -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: example -#: doc/guix.texi:11568 -#, no-wrap -msgid "" -"(openssh-configuration\n" -" (authorized-keys\n" -" `((\"rekado\" ,(local-file \"rekado.pub\"))\n" -" (\"chris\" ,(local-file \"chris.pub\"))\n" -" (\"root\" ,(local-file \"rekado.pub\") ,(local-file \"chris.pub\")))))\n" -msgstr "" - -#. type: table -#: doc/guix.texi:11573 -msgid "registers the specified public keys for user accounts @code{rekado}, @code{chris}, and @code{root}." -msgstr "" - -#. type: table -#: doc/guix.texi:11576 -msgid "Additional authorized keys can be specified @i{via} @code{service-extension}." -msgstr "" - -#. type: table -#: doc/guix.texi:11579 -msgid "Note that this does @emph{not} interfere with the use of @file{~/.ssh/authorized_keys}." -msgstr "" - -#. type: deffn -#: doc/guix.texi:11582 -#, no-wrap -msgid "{Scheme Procedure} dropbear-service [@var{config}]" -msgstr "{Procédure Scheme} dropbear-service [@var{config}]" - -#. type: deffn -#: doc/guix.texi:11586 -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:11589 -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: example -#: doc/guix.texi:11593 -#, no-wrap -msgid "" -"(dropbear-service (dropbear-configuration\n" -" (port-number 1234)))\n" -msgstr "" - -#. type: deftp -#: doc/guix.texi:11596 -#, no-wrap -msgid "{Data Type} dropbear-configuration" -msgstr "{Type de données} dropbear-configuration" - -#. type: deftp -#: doc/guix.texi:11598 -msgid "This data type represents the configuration of a Dropbear SSH daemon." -msgstr "" - -#. type: item -#: doc/guix.texi:11600 -#, no-wrap -msgid "@code{dropbear} (default: @var{dropbear})" -msgstr "@code{dropbear} (par défaut : @var{dropbear})" - -#. type: table -#: doc/guix.texi:11602 -msgid "The Dropbear package to use." -msgstr "Le paquet Dropbear à utiliser." - -#. type: item -#: doc/guix.texi:11603 -#, no-wrap -msgid "@code{port-number} (default: 22)" -msgstr "" - -#. type: table -#: doc/guix.texi:11605 -msgid "The TCP port where the daemon waits for incoming connections." -msgstr "" - -#. type: item -#: doc/guix.texi:11606 -#, no-wrap -msgid "@code{syslog-output?} (default: @code{#t})" -msgstr "@code{syslog-output?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:11608 -msgid "Whether to enable syslog output." -msgstr "" - -#. type: item -#: doc/guix.texi:11609 -#, no-wrap -msgid "@code{pid-file} (default: @code{\"/var/run/dropbear.pid\"})" -msgstr "@code{pid-file} (par défaut : @code{\"/var/run/dropbear.pid\"})" - -#. type: table -#: doc/guix.texi:11611 -msgid "File name of the daemon's PID file." -msgstr "" - -#. type: item -#: doc/guix.texi:11612 -#, no-wrap -msgid "@code{root-login?} (default: @code{#f})" -msgstr "@code{root-login?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:11614 -msgid "Whether to allow @code{root} logins." -msgstr "" - -#. type: table -#: doc/guix.texi:11617 -msgid "Whether to allow empty passwords." -msgstr "" - -#. type: table -#: doc/guix.texi:11620 -msgid "Whether to enable password-based authentication." -msgstr "" - -#. type: defvr -#: doc/guix.texi:11623 -#, no-wrap -msgid "{Scheme Variable} %facebook-host-aliases" -msgstr "{Variable Scheme} %facebook-host-aliases" - -#. type: defvr -#: doc/guix.texi:11629 -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:11633 -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: example -#: doc/guix.texi:11636 -#, no-wrap -msgid "" -"(use-modules (gnu) (guix))\n" -"\n" -msgstr "" - -#. type: example -#: doc/guix.texi:11646 -#, no-wrap -msgid "" -"(operating-system\n" -" (host-name \"mymachine\")\n" -" ;; ...\n" -" (hosts-file\n" -" ;; Create a /etc/hosts file with aliases for \"localhost\"\n" -" ;; and \"mymachine\", as well as for Facebook servers.\n" -" (plain-file \"hosts\"\n" -" (string-append (local-host-aliases host-name)\n" -" %facebook-host-aliases))))\n" -msgstr "" - -#. type: defvr -#: doc/guix.texi:11650 -msgid "This mechanism can prevent programs running locally, such as Web browsers, from accessing Facebook." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:11653 -msgid "The @code{(gnu services avahi)} provides the following definition." -msgstr "" - -#. type: deffn -#: doc/guix.texi:11654 -#, no-wrap -msgid "{Scheme Procedure} avahi-service [#:avahi @var{avahi}] @" -msgstr "{Procédure Scheme} avahi-service [#:avahi @var{avahi}] @" - -#. type: deffn -#: doc/guix.texi:11666 -msgid "[#:host-name #f] [#:publish? #t] [#:ipv4? #t] @ [#:ipv6? #t] [#:wide-area? #f] @ [#:domains-to-browse '()] [#:debug? #f] Return a 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{http://avahi.org/}), and 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}. Additionally, add the @var{avahi} package to the system profile so that commands such as @command{avahi-browse} are directly usable." -msgstr "" - -#. type: deffn -#: doc/guix.texi:11669 -msgid "If @var{host-name} is 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: deffn -#: doc/guix.texi:11673 -msgid "When @var{publish?} is true, publishing of host names and services is allowed; in particular, avahi-daemon will publish the machine's host name and IP address via mDNS on the local network." -msgstr "" - -#. type: deffn -#: doc/guix.texi:11675 -msgid "When @var{wide-area?} is true, DNS-SD over unicast DNS is enabled." -msgstr "" - -#. type: deffn -#: doc/guix.texi:11678 -msgid "Boolean values @var{ipv4?} and @var{ipv6?} determine whether to use IPv4/IPv6 sockets." -msgstr "" - -#. type: deffn -#: doc/guix.texi:11680 -#, no-wrap -msgid "{Scheme Variable} openvswitch-service-type" -msgstr "{Variable Scheme} openvswitch-service-type" - -#. type: deffn -#: doc/guix.texi:11684 -msgid "This is the type of the @uref{http://www.openvswitch.org, Open vSwitch} service, whose value should be an @code{openvswitch-configuration} object." -msgstr "" - -#. type: deftp -#: doc/guix.texi:11686 -#, no-wrap -msgid "{Data Type} openvswitch-configuration" -msgstr "{Type de données} openvswitch-configuration" - -#. type: deftp -#: doc/guix.texi:11690 -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:11692 -#, no-wrap -msgid "@code{package} (default: @var{openvswitch})" -msgstr "@code{package} (par défaut : @var{openvswitch})" - -#. type: table -#: doc/guix.texi:11694 -msgid "Package object of the Open vSwitch." -msgstr "" - -#. type: cindex -#: doc/guix.texi:11701 -#, no-wrap -msgid "X11" -msgstr "" - -#. type: cindex -#: doc/guix.texi:11702 -#, no-wrap -msgid "X Window System" -msgstr "" - -#. type: cindex -#: doc/guix.texi:11703 doc/guix.texi:11880 -#, no-wrap -msgid "login manager" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:11708 -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 SLiM." -msgstr "" - -#. type: cindex -#: doc/guix.texi:11709 -#, no-wrap -msgid "window manager" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:11714 -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:11715 -#, no-wrap -msgid "{Scheme Variable} slim-service-type" -msgstr "{Variable Scheme} slim-service-type" - -#. type: defvr -#: doc/guix.texi:11717 -msgid "This is the type for the SLiM graphical login manager for X11." -msgstr "" - -#. type: cindex -#: doc/guix.texi:11718 -#, no-wrap -msgid "session types (X11)" -msgstr "" - -#. type: cindex -#: doc/guix.texi:11719 -#, no-wrap -msgid "X11 session types" -msgstr "" - -#. type: defvr -#: doc/guix.texi:11726 -msgid "SLiM 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 using @kbd{F1}. Packages such as @code{xfce}, @code{sawfish}, and @code{ratpoison} 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:11730 -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:11732 -#, no-wrap -msgid "{Data Type} slim-configuration" -msgstr "{Type de données} slim-configuration" - -#. type: deftp -#: doc/guix.texi:11734 -msgid "Data type representing the configuration of @code{slim-service-type}." -msgstr "" - -#. type: table -#: doc/guix.texi:11738 -msgid "Whether to allow logins with empty passwords." -msgstr "" - -#. type: item -#: doc/guix.texi:11739 -#, no-wrap -msgid "@code{auto-login?} (default: @code{#f})" -msgstr "@code{auto-login?} (par défaut : @code{#f})" - -#. type: itemx -#: doc/guix.texi:11740 -#, no-wrap -msgid "@code{default-user} (default: @code{\"\"})" -msgstr "@code{default-user} (par défaut : @code{\"\"})" - -#. type: table -#: doc/guix.texi:11742 -msgid "When @code{auto-login?} is false, SLiM presents a log-in screen." -msgstr "" - -#. type: table -#: doc/guix.texi:11745 -msgid "When @code{auto-login?} is true, SLiM logs in directly as @code{default-user}." -msgstr "" - -#. type: item -#: doc/guix.texi:11746 -#, no-wrap -msgid "@code{theme} (default: @code{%default-slim-theme})" -msgstr "@code{theme} (par défaut : @code{%default-slim-theme})" - -#. type: itemx -#: doc/guix.texi:11747 -#, no-wrap -msgid "@code{theme-name} (default: @code{%default-slim-theme-name})" -msgstr "@code{theme-name} (par défaut : @code{%default-slim-theme-name})" - -#. type: table -#: doc/guix.texi:11749 -msgid "The graphical theme to use and its name." -msgstr "" - -#. type: item -#: doc/guix.texi:11750 -#, no-wrap -msgid "@code{auto-login-session} (default: @code{#f})" -msgstr "@code{auto-login-session} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:11753 -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:11757 -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:11762 -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:11764 -#, no-wrap -msgid "@code{startx} (default: @code{(xorg-start-command)})" -msgstr "@code{startx} (par défaut : @code{(xorg-start-command)})" - -#. type: table -#: doc/guix.texi:11766 -msgid "The command used to start the X11 graphical server." -msgstr "" - -#. type: item -#: doc/guix.texi:11767 -#, no-wrap -msgid "@code{xauth} (default: @code{xauth})" -msgstr "@code{xauth} (par défaut : @code{xauth})" - -#. type: table -#: doc/guix.texi:11769 -msgid "The XAuth package to use." -msgstr "Le paquet XAuth à utiliser." - -#. type: item -#: doc/guix.texi:11770 -#, no-wrap -msgid "@code{shepherd} (default: @code{shepherd})" -msgstr "@code{shepherd} (par défaut : @code{shepherd})" - -#. type: table -#: doc/guix.texi:11773 -msgid "The Shepherd package used when invoking @command{halt} and @command{reboot}." -msgstr "" - -#. type: item -#: doc/guix.texi:11774 -#, no-wrap -msgid "@code{sessreg} (default: @code{sessreg})" -msgstr "@code{sessreg} (par défaut : @code{sessreg})" - -#. type: table -#: doc/guix.texi:11776 -msgid "The sessreg package used in order to register the session." -msgstr "" - -#. type: item -#: doc/guix.texi:11777 -#, no-wrap -msgid "@code{slim} (default: @code{slim})" -msgstr "@code{slim} (par défaut : @code{slim})" - -#. type: table -#: doc/guix.texi:11779 -msgid "The SLiM package to use." -msgstr "Le paquet SLiM à utiliser." - -#. type: defvr -#: doc/guix.texi:11782 doc/guix.texi:20772 -#, no-wrap -msgid "{Scheme Variable} %default-theme" -msgstr "{Variable Scheme} %default-theme" - -#. type: defvrx -#: doc/guix.texi:11783 -#, no-wrap -msgid "{Scheme Variable} %default-theme-name" -msgstr "{Variable Scheme} %default-theme-name" - -#. type: defvr -#: doc/guix.texi:11785 -msgid "The default SLiM theme and its name." -msgstr "" - -#. type: deftp -#: doc/guix.texi:11788 -#, no-wrap -msgid "{Data Type} sddm-configuration" -msgstr "{Type de données} sddm-configuration" - -#. type: deftp -#: doc/guix.texi:11790 -msgid "This is the data type representing the sddm service configuration." -msgstr "" - -#. type: item -#: doc/guix.texi:11792 -#, no-wrap -msgid "@code{display-server} (default: \"x11\")" -msgstr "@code{display-server} (par défaut : \"x11\")" - -#. type: table -#: doc/guix.texi:11795 -msgid "Select display server to use for the greeter. Valid values are \"x11\" or \"wayland\"." -msgstr "" - -#. type: item -#: doc/guix.texi:11796 -#, no-wrap -msgid "@code{numlock} (default: \"on\")" -msgstr "@code{numlock} (par défaut : \"on\")" - -#. type: table -#: doc/guix.texi:11798 -msgid "Valid values are \"on\", \"off\" or \"none\"." -msgstr "" - -#. type: item -#: doc/guix.texi:11799 -#, no-wrap -msgid "@code{halt-command} (default @code{#~(string-apppend #$shepherd \"/sbin/halt\")})" -msgstr "" - -#. type: table -#: doc/guix.texi:11801 -msgid "Command to run when halting." -msgstr "" - -#. type: item -#: doc/guix.texi:11802 -#, no-wrap -msgid "@code{reboot-command} (default @code{#~(string-append #$shepherd \"/sbin/reboot\")})" -msgstr "" - -#. type: table -#: doc/guix.texi:11804 -msgid "Command to run when rebooting." -msgstr "" - -#. type: item -#: doc/guix.texi:11805 -#, no-wrap -msgid "@code{theme} (default \"maldives\")" -msgstr "" - -#. type: table -#: doc/guix.texi:11807 -msgid "Theme to use. Default themes provided by SDDM are \"elarun\" or \"maldives\"." -msgstr "" - -#. type: item -#: doc/guix.texi:11808 -#, no-wrap -msgid "@code{themes-directory} (default \"/run/current-system/profile/share/sddm/themes\")" -msgstr "" - -#. type: table -#: doc/guix.texi:11810 -msgid "Directory to look for themes." -msgstr "" - -#. type: item -#: doc/guix.texi:11811 -#, no-wrap -msgid "@code{faces-directory} (default \"/run/current-system/profile/share/sddm/faces\")" -msgstr "" - -#. type: table -#: doc/guix.texi:11813 -msgid "Directory to look for faces." -msgstr "" - -#. type: item -#: doc/guix.texi:11814 -#, no-wrap -msgid "@code{default-path} (default \"/run/current-system/profile/bin\")" -msgstr "" - -#. type: table -#: doc/guix.texi:11816 -msgid "Default PATH to use." -msgstr "" - -#. type: item -#: doc/guix.texi:11817 -#, no-wrap -msgid "@code{minimum-uid} (default 1000)" -msgstr "" - -#. type: table -#: doc/guix.texi:11819 -msgid "Minimum UID to display in SDDM." -msgstr "" - -#. type: item -#: doc/guix.texi:11820 -#, no-wrap -msgid "@code{maximum-uid} (default 2000)" -msgstr "" - -#. type: table -#: doc/guix.texi:11822 -msgid "Maximum UID to display in SDDM" -msgstr "" - -#. type: item -#: doc/guix.texi:11823 -#, no-wrap -msgid "@code{remember-last-user?} (default #t)" -msgstr "" - -#. type: table -#: doc/guix.texi:11825 -msgid "Remember last user." -msgstr "" - -#. type: item -#: doc/guix.texi:11826 -#, no-wrap -msgid "@code{remember-last-session?} (default #t)" -msgstr "" - -#. type: table -#: doc/guix.texi:11828 -msgid "Remember last session." -msgstr "" - -#. type: item -#: doc/guix.texi:11829 -#, no-wrap -msgid "@code{hide-users} (default \"\")" -msgstr "" - -#. type: table -#: doc/guix.texi:11831 -msgid "Usernames to hide from SDDM greeter." -msgstr "" - -#. type: item -#: doc/guix.texi:11832 -#, no-wrap -msgid "@code{hide-shells} (default @code{#~(string-append #$shadow \"/sbin/nologin\")})" -msgstr "" - -#. type: table -#: doc/guix.texi:11834 -msgid "Users with shells listed will be hidden from the SDDM greeter." -msgstr "" - -#. type: item -#: doc/guix.texi:11835 -#, no-wrap -msgid "@code{session-command} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/wayland-session\")})" -msgstr "" - -#. type: table -#: doc/guix.texi:11837 -msgid "Script to run before starting a wayland session." -msgstr "" - -#. type: item -#: doc/guix.texi:11838 -#, no-wrap -msgid "@code{sessions-directory} (default \"/run/current-system/profile/share/wayland-sessions\")" -msgstr "" - -#. type: table -#: doc/guix.texi:11840 -msgid "Directory to look for desktop files starting wayland sessions." -msgstr "" - -#. type: item -#: doc/guix.texi:11841 -#, no-wrap -msgid "@code{xorg-server-path} (default @code{xorg-start-command})" -msgstr "" - -#. type: table -#: doc/guix.texi:11843 -msgid "Path to xorg-server." -msgstr "" - -#. type: item -#: doc/guix.texi:11844 -#, no-wrap -msgid "@code{xauth-path} (default @code{#~(string-append #$xauth \"/bin/xauth\")})" -msgstr "" - -#. type: table -#: doc/guix.texi:11846 -msgid "Path to xauth." -msgstr "" - -#. type: item -#: doc/guix.texi:11847 -#, no-wrap -msgid "@code{xephyr-path} (default @code{#~(string-append #$xorg-server \"/bin/Xephyr\")})" -msgstr "" - -#. type: table -#: doc/guix.texi:11849 -msgid "Path to Xephyr." -msgstr "" - -#. type: item -#: doc/guix.texi:11850 -#, no-wrap -msgid "@code{xdisplay-start} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xsetup\")})" -msgstr "" - -#. type: table -#: doc/guix.texi:11852 -msgid "Script to run after starting xorg-server." -msgstr "" - -#. type: item -#: doc/guix.texi:11853 -#, no-wrap -msgid "@code{xdisplay-stop} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xstop\")})" -msgstr "" - -#. type: table -#: doc/guix.texi:11855 -msgid "Script to run before stopping xorg-server." -msgstr "" - -#. type: item -#: doc/guix.texi:11856 -#, no-wrap -msgid "@code{xsession-command} (default: @code{xinitrc})" -msgstr "@code{xsession-command} (par défaut : @code{xinitrc})" - -#. type: table -#: doc/guix.texi:11858 -msgid "Script to run before starting a X session." -msgstr "" - -#. type: item -#: doc/guix.texi:11859 -#, no-wrap -msgid "@code{xsessions-directory} (default: \"/run/current-system/profile/share/xsessions\")" -msgstr "@code{xsessions-directory} (par défaut : \"/run/current-system/profile/share/xsessions\")" - -#. type: table -#: doc/guix.texi:11861 -msgid "Directory to look for desktop files starting X sessions." -msgstr "" - -#. type: item -#: doc/guix.texi:11862 -#, no-wrap -msgid "@code{minimum-vt} (default: 7)" -msgstr "" - -#. type: table -#: doc/guix.texi:11864 -msgid "Minimum VT to use." -msgstr "" - -#. type: item -#: doc/guix.texi:11865 -#, no-wrap -msgid "@code{xserver-arguments} (default \"-nolisten tcp\")" -msgstr "" - -#. type: table -#: doc/guix.texi:11867 -msgid "Arguments to pass to xorg-server." -msgstr "" - -#. type: item -#: doc/guix.texi:11868 -#, no-wrap -msgid "@code{auto-login-user} (default \"\")" -msgstr "" - -#. type: table -#: doc/guix.texi:11870 -msgid "User to use for auto-login." -msgstr "" - -#. type: item -#: doc/guix.texi:11871 -#, no-wrap -msgid "@code{auto-login-session} (default \"\")" -msgstr "" - -#. type: table -#: doc/guix.texi:11873 -msgid "Desktop file to use for auto-login." -msgstr "" - -#. type: item -#: doc/guix.texi:11874 -#, no-wrap -msgid "@code{relogin?} (default #f)" -msgstr "" - -#. type: table -#: doc/guix.texi:11876 -msgid "Relogin after logout." -msgstr "" - -#. type: cindex -#: doc/guix.texi:11881 -#, no-wrap -msgid "X11 login" -msgstr "" - -#. type: deffn -#: doc/guix.texi:11882 -#, no-wrap -msgid "{Scheme Procedure} sddm-service config" -msgstr "{Procédure Scheme} sddm-service config" - -#. type: deffn -#: doc/guix.texi:11885 -msgid "Return a service that spawns the SDDM graphical login manager for config of type @code{}." -msgstr "" - -#. type: example -#: doc/guix.texi:11890 -#, no-wrap -msgid "" -" (sddm-service (sddm-configuration\n" -" (auto-login-user \"Alice\")\n" -" (auto-login-session \"xfce.desktop\")))\n" -msgstr "" - -#. type: deffn -#: doc/guix.texi:11893 -#, no-wrap -msgid "{Scheme Procedure} xorg-start-command [#:guile] @" -msgstr "{Procédure Scheme} xorg-start-command [#:guile] @" - -#. type: deffn -#: doc/guix.texi:11902 -msgid "[#:modules %default-xorg-modules] @ [#:fonts %default-xorg-fonts] @ [#:configuration-file (xorg-configuration-file @dots{})] @ [#:xorg-server @var{xorg-server}] Return a @code{startx} script in which @var{modules}, a list of X module packages, and @var{fonts}, a list of X font directories, are available. See @code{xorg-wrapper} for more details on the arguments. The result should be used in place of @code{startx}." -msgstr "" - -#. type: deffn -#: doc/guix.texi:11904 -msgid "Usually the X server is started by a login manager." -msgstr "" - -#. type: deffn -#: doc/guix.texi:11906 -#, no-wrap -msgid "{Scheme Procedure} xorg-configuration-file @" -msgstr "{Procédure Scheme} xorg-configuration-file @" - -#. type: deffn -#: doc/guix.texi:11912 -msgid "[#:modules %default-xorg-modules] @ [#:fonts %default-xorg-fonts] @ [#:drivers '()] [#:resolutions '()] [#:extra-config '()] Return a configuration file for the Xorg server containing search paths for all the common drivers." -msgstr "" - -#. type: deffn -#: doc/guix.texi:11917 -msgid "@var{modules} must be a list of @dfn{module packages} loaded by the Xorg server---e.g., @code{xf86-video-vesa}, @code{xf86-input-keyboard}, and so on. @var{fonts} must be a list of font directories to add to the server's @dfn{font path}." -msgstr "" - -#. type: deffn -#: doc/guix.texi:11921 -msgid "@var{drivers} 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: deffn -#: doc/guix.texi:11925 -msgid "Likewise, when @var{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: deffn -#: doc/guix.texi:11929 -msgid "Last, @var{extra-config} 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: deffn -#: doc/guix.texi:11935 -msgid "This procedure is especially useful to configure a different keyboard layout than the default US keymap. For instance, to use the ``bépo'' keymap by default on the display manager:" -msgstr "" - -#. type: example -#: doc/guix.texi:11945 -#, no-wrap -msgid "" -"(define bepo-evdev\n" -" \"Section \\\"InputClass\\\"\n" -" Identifier \\\"evdev keyboard catchall\\\"\n" -" Driver \\\"evdev\\\"\n" -" MatchIsKeyboard \\\"on\\\"\n" -" Option \\\"xkb_layout\\\" \\\"fr\\\"\n" -" Option \\\"xkb_variant\\\" \\\"bepo\\\"\n" -"EndSection\")\n" -"\n" -msgstr "" - -#. type: example -#: doc/guix.texi:11958 -#, no-wrap -msgid "" -"(operating-system\n" -" ...\n" -" (services\n" -" (modify-services %desktop-services\n" -" (slim-service-type config =>\n" -" (slim-configuration\n" -" (inherit config)\n" -" (startx (xorg-start-command\n" -" #:configuration-file\n" -" (xorg-configuration-file\n" -" #:extra-config\n" -" (list bepo-evdev)))))))))\n" -msgstr "" - -#. type: deffn -#: doc/guix.texi:11967 -msgid "The @code{MatchIsKeyboard} line specifies that we only apply the configuration to keyboards. Without this line, other devices such as touchpad may not work correctly because they will be attached to the wrong driver. In this example, the user typically used @code{setxkbmap fr bepo} to set their favorite keymap once logged in. The first argument corresponds to the layout, while the second argument corresponds to the variant. The @code{xkb_variant} line can be omitted to select the default variant." -msgstr "" - -#. type: deffn -#: doc/guix.texi:11969 -#, no-wrap -msgid "{Scheme Procedure} screen-locker-service @var{package} [@var{program}]" -msgstr "{Procédure Scheme} screen-locker-service @var{package} [@var{program}]" - -#. type: deffn -#: doc/guix.texi:11973 -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:11976 -#, no-wrap -msgid "(screen-locker-service xlockmore \"xlock\")\n" -msgstr "" - -#. type: deffn -#: doc/guix.texi:11979 -msgid "makes the good ol' XlockMore usable." -msgstr "" - -#. type: cindex -#: doc/guix.texi:11985 -#, no-wrap -msgid "printer support with CUPS" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:11989 -msgid "The @code{(gnu services cups)} module provides a Guix service definition for the CUPS printing service. To add printer support to a GuixSD system, add a @code{cups-service} to the operating system definition:" -msgstr "" - -#. type: deffn -#: doc/guix.texi:11990 -#, no-wrap -msgid "{Scheme Variable} cups-service-type" -msgstr "{Variable Scheme} cups-service-type" - -#. type: deffn -#: doc/guix.texi:11994 -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: example -#: doc/guix.texi:11996 -#, no-wrap -msgid "(service cups-service-type)\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:12006 -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:12011 -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} package. You can do that directly, like this (you need to use the @code{(gnu packages cups)} module):" -msgstr "" - -#. type: example -#: doc/guix.texi:12018 -#, no-wrap -msgid "" -"(service cups-service-type\n" -" (cups-configuration\n" -" (web-interface? #t)\n" -" (extensions\n" -" (list cups-filters escpr hplip))))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:12026 -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:12037 -msgid "Available @code{cups-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12038 -#, no-wrap -msgid "{@code{cups-configuration} parameter} package cups" -msgstr "{paramètre de @code{cups-configuration}} package cups" - -#. type: deftypevr -#: doc/guix.texi:12040 doc/guix.texi:12797 -msgid "The CUPS package." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12042 -#, no-wrap -msgid "{@code{cups-configuration} parameter} package-list extensions" -msgstr "{paramètre de @code{cups-configuration}} package-list extensions" - -#. type: deftypevr -#: doc/guix.texi:12044 -msgid "Drivers and other extensions to the CUPS package." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12046 -#, no-wrap -msgid "{@code{cups-configuration} parameter} files-configuration files-configuration" -msgstr "{paramètre de @code{cups-configuration}} files-configuration files-configuration" - -#. type: deftypevr -#: doc/guix.texi:12049 -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:12051 -msgid "Available @code{files-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12052 -#, no-wrap -msgid "{@code{files-configuration} parameter} log-location access-log" -msgstr "{paramètre de @code{files-configuration}} log-location access-log" - -#. type: deftypevr -#: doc/guix.texi:12060 -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:12062 -msgid "Defaults to @samp{\"/var/log/cups/access_log\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12064 -#, no-wrap -msgid "{@code{files-configuration} parameter} file-name cache-dir" -msgstr "{paramètre de @code{files-configuration}} file-name cache-dir" - -#. type: deftypevr -#: doc/guix.texi:12066 -msgid "Where CUPS should cache data." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12068 -msgid "Defaults to @samp{\"/var/cache/cups\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12070 -#, no-wrap -msgid "{@code{files-configuration} parameter} string config-file-perm" -msgstr "{paramètre de @code{files-configuration}} string config-file-perm" - -#. type: deftypevr -#: doc/guix.texi:12073 -msgid "Specifies the permissions for all configuration files that the scheduler writes." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12079 -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:12081 -msgid "Defaults to @samp{\"0640\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12083 -#, no-wrap -msgid "{@code{files-configuration} parameter} log-location error-log" -msgstr "{paramètre de @code{files-configuration}} log-location error-log" - -#. type: deftypevr -#: doc/guix.texi:12091 -msgid "Defines the error 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-error_log}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12093 -msgid "Defaults to @samp{\"/var/log/cups/error_log\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12095 -#, no-wrap -msgid "{@code{files-configuration} parameter} string fatal-errors" -msgstr "{paramètre de @code{files-configuration}} string fatal-errors" - -#. type: deftypevr -#: doc/guix.texi:12098 -msgid "Specifies which errors are fatal, causing the scheduler to exit. The kind strings are:" -msgstr "" - -#. type: table -#: doc/guix.texi:12102 -msgid "No errors are fatal." -msgstr "" - -#. type: table -#: doc/guix.texi:12105 -msgid "All of the errors below are fatal." -msgstr "" - -#. type: item -#: doc/guix.texi:12106 -#, no-wrap -msgid "browse" -msgstr "browse" - -#. type: table -#: doc/guix.texi:12109 -msgid "Browsing initialization errors are fatal, for example failed connections to the DNS-SD daemon." -msgstr "" - -#. type: item -#: doc/guix.texi:12110 -#, no-wrap -msgid "config" -msgstr "config" - -#. type: table -#: doc/guix.texi:12112 -msgid "Configuration file syntax errors are fatal." -msgstr "" - -#. type: item -#: doc/guix.texi:12113 -#, no-wrap -msgid "listen" -msgstr "listen" - -#. type: table -#: doc/guix.texi:12116 -msgid "Listen or Port errors are fatal, except for IPv6 failures on the loopback or @code{any} addresses." -msgstr "" - -#. type: item -#: doc/guix.texi:12117 -#, no-wrap -msgid "log" -msgstr "log" - -#. type: table -#: doc/guix.texi:12119 -msgid "Log file creation or write errors are fatal." -msgstr "" - -#. type: item -#: doc/guix.texi:12120 -#, no-wrap -msgid "permissions" -msgstr "permissions" - -#. type: table -#: doc/guix.texi:12123 -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:12126 -msgid "Defaults to @samp{\"all -browse\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12128 -#, no-wrap -msgid "{@code{files-configuration} parameter} boolean file-device?" -msgstr "{paramètre de @code{files-configuration}} boolean file-device?" - -#. type: deftypevr -#: doc/guix.texi:12131 -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:12133 doc/guix.texi:12203 doc/guix.texi:12239 -#: doc/guix.texi:12251 doc/guix.texi:12257 doc/guix.texi:12273 -#: doc/guix.texi:12361 doc/guix.texi:12455 doc/guix.texi:12771 -#: doc/guix.texi:12784 doc/guix.texi:17090 doc/guix.texi:17104 -#: doc/guix.texi:17226 doc/guix.texi:17247 doc/guix.texi:17268 -#: doc/guix.texi:17275 doc/guix.texi:17320 doc/guix.texi:17327 -#: doc/guix.texi:17730 doc/guix.texi:17744 doc/guix.texi:17916 -#: doc/guix.texi:17961 doc/guix.texi:18048 doc/guix.texi:18177 -#: doc/guix.texi:18210 doc/guix.texi:18350 doc/guix.texi:18361 -#: doc/guix.texi:18611 doc/guix.texi:19253 doc/guix.texi:19262 -#: doc/guix.texi:19270 doc/guix.texi:19278 doc/guix.texi:19294 -#: doc/guix.texi:19310 doc/guix.texi:19318 doc/guix.texi:19326 -#: doc/guix.texi:19335 doc/guix.texi:19344 doc/guix.texi:19360 -#: doc/guix.texi:19424 doc/guix.texi:19530 doc/guix.texi:19538 -#: doc/guix.texi:19546 doc/guix.texi:19571 doc/guix.texi:19625 -#: doc/guix.texi:19673 doc/guix.texi:19826 doc/guix.texi:19834 -#: doc/guix.texi:19842 doc/guix.texi:19850 doc/guix.texi:19858 -#: doc/guix.texi:19866 doc/guix.texi:19874 doc/guix.texi:19881 -msgid "Defaults to @samp{#f}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12135 -#, no-wrap -msgid "{@code{files-configuration} parameter} string group" -msgstr "{paramètre de @code{files-configuration}} string group" - -#. type: deftypevr -#: doc/guix.texi:12138 -msgid "Specifies the group name or ID that will be used when executing external programs." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12140 doc/guix.texi:12220 -msgid "Defaults to @samp{\"lp\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12142 -#, no-wrap -msgid "{@code{files-configuration} parameter} string log-file-perm" -msgstr "{paramètre de @code{files-configuration}} string log-file-perm" - -#. type: deftypevr -#: doc/guix.texi:12144 -msgid "Specifies the permissions for all log files that the scheduler writes." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12146 -msgid "Defaults to @samp{\"0644\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12148 -#, no-wrap -msgid "{@code{files-configuration} parameter} log-location page-log" -msgstr "{paramètre de @code{files-configuration}} log-location page-log" - -#. type: deftypevr -#: doc/guix.texi:12156 -msgid "Defines the page 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-page_log}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12158 -msgid "Defaults to @samp{\"/var/log/cups/page_log\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12160 -#, no-wrap -msgid "{@code{files-configuration} parameter} string remote-root" -msgstr "{paramètre de @code{files-configuration}} string remote-root" - -#. type: deftypevr -#: doc/guix.texi:12163 -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:12165 -msgid "Defaults to @samp{\"remroot\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12167 -#, no-wrap -msgid "{@code{files-configuration} parameter} file-name request-root" -msgstr "{paramètre de @code{files-configuration}} file-name request-root" - -#. type: deftypevr -#: doc/guix.texi:12170 -msgid "Specifies the directory that contains print jobs and other HTTP request data." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12172 -msgid "Defaults to @samp{\"/var/spool/cups\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12174 -#, no-wrap -msgid "{@code{files-configuration} parameter} sandboxing sandboxing" -msgstr "{paramètre de @code{files-configuration}} sandboxing sandboxing" - -#. type: deftypevr -#: doc/guix.texi:12179 -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:12181 -msgid "Defaults to @samp{strict}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12183 -#, no-wrap -msgid "{@code{files-configuration} parameter} file-name server-keychain" -msgstr "{paramètre de @code{files-configuration}} file-name server-keychain" - -#. type: deftypevr -#: doc/guix.texi:12188 -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:12190 -msgid "Defaults to @samp{\"/etc/cups/ssl\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12192 -#, no-wrap -msgid "{@code{files-configuration} parameter} file-name server-root" -msgstr "{paramètre de @code{files-configuration}} file-name server-root" - -#. type: deftypevr -#: doc/guix.texi:12194 -msgid "Specifies the directory containing the server configuration files." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12196 -msgid "Defaults to @samp{\"/etc/cups\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12198 -#, no-wrap -msgid "{@code{files-configuration} parameter} boolean sync-on-close?" -msgstr "{paramètre de @code{files-configuration}} boolean sync-on-close?" - -#. type: deftypevr -#: doc/guix.texi:12201 -msgid "Specifies whether the scheduler calls fsync(2) after writing configuration or state files." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12205 -#, no-wrap -msgid "{@code{files-configuration} parameter} space-separated-string-list system-group" -msgstr "{paramètre de @code{files-configuration}} space-separated-string-list system-group" - -#. type: deftypevr -#: doc/guix.texi:12207 -msgid "Specifies the group(s) to use for @code{@@SYSTEM} group authentication." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12209 -#, no-wrap -msgid "{@code{files-configuration} parameter} file-name temp-dir" -msgstr "{paramètre de @code{files-configuration}} file-name temp-dir" - -#. type: deftypevr -#: doc/guix.texi:12211 -msgid "Specifies the directory where temporary files are stored." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12213 -msgid "Defaults to @samp{\"/var/spool/cups/tmp\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12215 -#, no-wrap -msgid "{@code{files-configuration} parameter} string user" -msgstr "{paramètre de @code{files-configuration}} string user" - -#. type: deftypevr -#: doc/guix.texi:12218 -msgid "Specifies the user name or ID that is used when running external programs." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12223 -#, no-wrap -msgid "{@code{cups-configuration} parameter} access-log-level access-log-level" -msgstr "{paramètre de @code{cups-configuration}} access-log-level access-log-level" - -#. type: deftypevr -#: doc/guix.texi:12230 -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:12232 -msgid "Defaults to @samp{actions}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12234 -#, no-wrap -msgid "{@code{cups-configuration} parameter} boolean auto-purge-jobs?" -msgstr "{paramètre de @code{cups-configuration}} boolean auto-purge-jobs?" - -#. type: deftypevr -#: doc/guix.texi:12237 -msgid "Specifies whether to purge job history data automatically when it is no longer required for quotas." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12241 -#, no-wrap -msgid "{@code{cups-configuration} parameter} browse-local-protocols browse-local-protocols" -msgstr "{paramètre de @code{cups-configuration}} browse-local-protocols browse-local-protocols" - -#. type: deftypevr -#: doc/guix.texi:12243 -msgid "Specifies which protocols to use for local printer sharing." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12245 -msgid "Defaults to @samp{dnssd}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12247 -#, no-wrap -msgid "{@code{cups-configuration} parameter} boolean browse-web-if?" -msgstr "{paramètre de @code{cups-configuration}} boolean browse-web-if?" - -#. type: deftypevr -#: doc/guix.texi:12249 -msgid "Specifies whether the CUPS web interface is advertised." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12253 -#, no-wrap -msgid "{@code{cups-configuration} parameter} boolean browsing?" -msgstr "{paramètre de @code{cups-configuration}} boolean browsing?" - -#. type: deftypevr -#: doc/guix.texi:12255 -msgid "Specifies whether shared printers are advertised." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12259 -#, no-wrap -msgid "{@code{cups-configuration} parameter} string classification" -msgstr "{paramètre de @code{cups-configuration}} string classification" - -#. type: deftypevr -#: doc/guix.texi:12264 -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:12266 doc/guix.texi:12603 doc/guix.texi:14019 -#: doc/guix.texi:14031 doc/guix.texi:18316 doc/guix.texi:18324 -#: doc/guix.texi:18332 doc/guix.texi:18340 doc/guix.texi:18618 -#: doc/guix.texi:19096 doc/guix.texi:19104 doc/guix.texi:19112 -#: doc/guix.texi:19220 doc/guix.texi:19245 doc/guix.texi:19376 -#: doc/guix.texi:19384 doc/guix.texi:19392 doc/guix.texi:19400 -#: doc/guix.texi:19408 doc/guix.texi:19416 doc/guix.texi:19439 -#: doc/guix.texi:19447 doc/guix.texi:19499 doc/guix.texi:19515 -#: doc/guix.texi:19523 doc/guix.texi:19562 doc/guix.texi:19585 -#: doc/guix.texi:19607 doc/guix.texi:19614 doc/guix.texi:19649 -#: doc/guix.texi:19657 doc/guix.texi:19681 doc/guix.texi:19713 -#: doc/guix.texi:19742 doc/guix.texi:19749 doc/guix.texi:19756 -#: doc/guix.texi:19764 doc/guix.texi:19778 doc/guix.texi:19787 -#: doc/guix.texi:19797 doc/guix.texi:19804 doc/guix.texi:19811 -#: doc/guix.texi:19818 doc/guix.texi:19889 doc/guix.texi:19896 -#: doc/guix.texi:19903 doc/guix.texi:19912 doc/guix.texi:19928 -#: doc/guix.texi:19935 doc/guix.texi:19942 doc/guix.texi:19949 -#: doc/guix.texi:19957 doc/guix.texi:19965 -msgid "Defaults to @samp{\"\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12268 -#, no-wrap -msgid "{@code{cups-configuration} parameter} boolean classify-override?" -msgstr "{paramètre de @code{cups-configuration}} boolean classify-override?" - -#. type: deftypevr -#: doc/guix.texi:12271 -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:12275 -#, no-wrap -msgid "{@code{cups-configuration} parameter} default-auth-type default-auth-type" -msgstr "{paramètre de @code{cups-configuration}} default-auth-type default-auth-type" - -#. type: deftypevr -#: doc/guix.texi:12277 -msgid "Specifies the default type of authentication to use." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12279 -msgid "Defaults to @samp{Basic}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12281 -#, no-wrap -msgid "{@code{cups-configuration} parameter} default-encryption default-encryption" -msgstr "{paramètre de @code{cups-configuration}} default-encryption default-encryption" - -#. type: deftypevr -#: doc/guix.texi:12283 -msgid "Specifies whether encryption will be used for authenticated requests." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12285 -msgid "Defaults to @samp{Required}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12287 -#, no-wrap -msgid "{@code{cups-configuration} parameter} string default-language" -msgstr "{paramètre de @code{cups-configuration}} string default-language" - -#. type: deftypevr -#: doc/guix.texi:12289 -msgid "Specifies the default language to use for text and web content." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12291 -msgid "Defaults to @samp{\"en\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12293 -#, no-wrap -msgid "{@code{cups-configuration} parameter} string default-paper-size" -msgstr "{paramètre de @code{cups-configuration}} string default-paper-size" - -#. type: deftypevr -#: doc/guix.texi:12298 -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:12300 -msgid "Defaults to @samp{\"Auto\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12302 -#, no-wrap -msgid "{@code{cups-configuration} parameter} string default-policy" -msgstr "{paramètre de @code{cups-configuration}} string default-policy" - -#. type: deftypevr -#: doc/guix.texi:12304 -msgid "Specifies the default access policy to use." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12306 -msgid "Defaults to @samp{\"default\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12308 -#, no-wrap -msgid "{@code{cups-configuration} parameter} boolean default-shared?" -msgstr "{paramètre de @code{cups-configuration}} boolean default-shared?" - -#. type: deftypevr -#: doc/guix.texi:12310 -msgid "Specifies whether local printers are shared by default." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12312 doc/guix.texi:12392 doc/guix.texi:12688 -#: doc/guix.texi:17060 doc/guix.texi:17067 doc/guix.texi:17075 -#: doc/guix.texi:17097 doc/guix.texi:17111 doc/guix.texi:17196 -#: doc/guix.texi:17203 doc/guix.texi:17211 doc/guix.texi:17597 -#: doc/guix.texi:17737 doc/guix.texi:17923 doc/guix.texi:17930 -#: doc/guix.texi:17952 doc/guix.texi:17991 doc/guix.texi:18011 -#: doc/guix.texi:18025 doc/guix.texi:18165 doc/guix.texi:19198 -#: doc/guix.texi:19286 doc/guix.texi:19302 doc/guix.texi:19352 -msgid "Defaults to @samp{#t}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12314 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer dirty-clean-interval" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer dirty-clean-interval" - -#. type: deftypevr -#: doc/guix.texi:12318 -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:12320 doc/guix.texi:12368 doc/guix.texi:12377 -#: doc/guix.texi:12398 doc/guix.texi:12695 -msgid "Defaults to @samp{30}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12322 -#, no-wrap -msgid "{@code{cups-configuration} parameter} error-policy error-policy" -msgstr "{paramètre de @code{cups-configuration}} error-policy error-policy" - -#. type: deftypevr -#: doc/guix.texi:12328 -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-this-job}, which retries the failed job immediately; and @code{stop-printer}, which stops the printer." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12330 -msgid "Defaults to @samp{stop-printer}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12332 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer filter-limit" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer filter-limit" - -#. type: deftypevr -#: doc/guix.texi:12340 -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:12342 doc/guix.texi:12350 doc/guix.texi:12405 -#: doc/guix.texi:12521 doc/guix.texi:12535 doc/guix.texi:12542 -#: doc/guix.texi:14123 doc/guix.texi:14135 doc/guix.texi:17613 -#: doc/guix.texi:17938 doc/guix.texi:19191 doc/guix.texi:19491 -#: doc/guix.texi:19665 -msgid "Defaults to @samp{0}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12344 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer filter-nice" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer filter-nice" - -#. type: deftypevr -#: doc/guix.texi:12348 -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:12352 -#, no-wrap -msgid "{@code{cups-configuration} parameter} host-name-lookups host-name-lookups" -msgstr "{paramètre de @code{cups-configuration}} host-name-lookups host-name-lookups" - -#. type: deftypevr -#: doc/guix.texi:12359 -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:12363 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer job-kill-delay" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer job-kill-delay" - -#. type: deftypevr -#: doc/guix.texi:12366 -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:12370 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-interval" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer job-retry-interval" - -#. type: deftypevr -#: doc/guix.texi:12375 -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:12379 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-limit" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer job-retry-limit" - -#. type: deftypevr -#: doc/guix.texi:12384 -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:12386 doc/guix.texi:18417 doc/guix.texi:18437 -#: doc/guix.texi:18453 doc/guix.texi:18467 doc/guix.texi:18474 -#: doc/guix.texi:18481 doc/guix.texi:18488 doc/guix.texi:18647 -#: doc/guix.texi:18663 doc/guix.texi:18670 doc/guix.texi:18677 -#: doc/guix.texi:18688 doc/guix.texi:19143 doc/guix.texi:19151 -#: doc/guix.texi:19159 doc/guix.texi:19183 -msgid "Defaults to @samp{5}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12388 -#, no-wrap -msgid "{@code{cups-configuration} parameter} boolean keep-alive?" -msgstr "{paramètre de @code{cups-configuration}} boolean keep-alive?" - -#. type: deftypevr -#: doc/guix.texi:12390 -msgid "Specifies whether to support HTTP keep-alive connections." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12394 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer keep-alive-timeout" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer keep-alive-timeout" - -#. type: deftypevr -#: doc/guix.texi:12396 -msgid "Specifies how long an idle client connection remains open, in seconds." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12400 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer limit-request-body" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer limit-request-body" - -#. type: deftypevr -#: doc/guix.texi:12403 -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:12407 -#, no-wrap -msgid "{@code{cups-configuration} parameter} multiline-string-list listen" -msgstr "{paramètre de @code{cups-configuration}} multiline-string-list listen" - -#. type: deftypevr -#: doc/guix.texi:12414 -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:12416 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer listen-back-log" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer listen-back-log" - -#. type: deftypevr -#: doc/guix.texi:12423 -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:12425 -msgid "Defaults to @samp{128}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12427 -#, no-wrap -msgid "{@code{cups-configuration} parameter} location-access-control-list location-access-controls" -msgstr "{paramètre de @code{cups-configuration}} location-access-control-list location-access-controls" - -#. type: deftypevr -#: doc/guix.texi:12429 -msgid "Specifies a set of additional access controls." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12431 -msgid "Available @code{location-access-controls} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12432 -#, no-wrap -msgid "{@code{location-access-controls} parameter} file-name path" -msgstr "{paramètre de @code{location-access-controls}} file-name path" - -#. type: deftypevr -#: doc/guix.texi:12434 -msgid "Specifies the URI path to which the access control applies." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12436 -#, no-wrap -msgid "{@code{location-access-controls} parameter} access-control-list access-controls" -msgstr "{paramètre de @code{location-access-controls}} access-control-list access-controls" - -#. type: deftypevr -#: doc/guix.texi:12439 -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:12441 doc/guix.texi:12447 doc/guix.texi:12461 -#: doc/guix.texi:12468 doc/guix.texi:12610 doc/guix.texi:12669 -#: doc/guix.texi:12753 doc/guix.texi:12764 doc/guix.texi:14609 -#: doc/guix.texi:17118 doc/guix.texi:17306 doc/guix.texi:18308 -#: doc/guix.texi:18368 doc/guix.texi:18376 doc/guix.texi:19206 -#: doc/guix.texi:19213 doc/guix.texi:19555 doc/guix.texi:19633 -#: doc/guix.texi:19727 doc/guix.texi:19735 doc/guix.texi:19771 -#: doc/guix.texi:19921 doc/guix.texi:19972 doc/guix.texi:19981 -msgid "Defaults to @samp{()}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12443 -#, no-wrap -msgid "{@code{location-access-controls} parameter} method-access-control-list method-access-controls" -msgstr "{paramètre de @code{location-access-controls}} method-access-control-list method-access-controls" - -#. type: deftypevr -#: doc/guix.texi:12445 -msgid "Access controls for method-specific access to this path." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12449 -msgid "Available @code{method-access-controls} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12450 -#, no-wrap -msgid "{@code{method-access-controls} parameter} boolean reverse?" -msgstr "{paramètre de @code{method-access-controls}} boolean reverse?" - -#. type: deftypevr -#: doc/guix.texi:12453 -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:12457 -#, no-wrap -msgid "{@code{method-access-controls} parameter} method-list methods" -msgstr "{paramètre de @code{method-access-controls}} method-list methods" - -#. type: deftypevr -#: doc/guix.texi:12459 -msgid "Methods to which this access control applies." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12463 -#, no-wrap -msgid "{@code{method-access-controls} parameter} access-control-list access-controls" -msgstr "{paramètre de @code{method-access-controls}} access-control-list access-controls" - -#. type: deftypevr -#: doc/guix.texi:12466 -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:12472 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer log-debug-history" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer log-debug-history" - -#. type: deftypevr -#: doc/guix.texi:12476 -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:12478 doc/guix.texi:12499 doc/guix.texi:12506 -#: doc/guix.texi:14369 doc/guix.texi:17291 -msgid "Defaults to @samp{100}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12480 -#, no-wrap -msgid "{@code{cups-configuration} parameter} log-level log-level" -msgstr "{paramètre de @code{cups-configuration}} log-level log-level" - -#. type: deftypevr -#: doc/guix.texi:12483 -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:12485 -msgid "Defaults to @samp{info}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12487 -#, no-wrap -msgid "{@code{cups-configuration} parameter} log-time-format log-time-format" -msgstr "{paramètre de @code{cups-configuration}} log-time-format log-time-format" - -#. type: deftypevr -#: doc/guix.texi:12490 -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:12492 -msgid "Defaults to @samp{standard}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12494 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-clients" - -#. type: deftypevr -#: doc/guix.texi:12497 -msgid "Specifies the maximum number of simultaneous clients that are allowed by the scheduler." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12501 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients-per-host" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-clients-per-host" - -#. type: deftypevr -#: doc/guix.texi:12504 -msgid "Specifies the maximum number of simultaneous clients that are allowed from a single address." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12508 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer max-copies" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-copies" - -#. type: deftypevr -#: doc/guix.texi:12511 -msgid "Specifies the maximum number of copies that a user can print of each job." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12513 -msgid "Defaults to @samp{9999}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12515 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer max-hold-time" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-hold-time" - -#. type: deftypevr -#: doc/guix.texi:12519 -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:12523 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-jobs" - -#. type: deftypevr -#: doc/guix.texi:12526 -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:12528 -msgid "Defaults to @samp{500}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12530 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-printer" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-jobs-per-printer" - -#. type: deftypevr -#: doc/guix.texi:12533 -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:12537 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-user" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-jobs-per-user" - -#. type: deftypevr -#: doc/guix.texi:12540 -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:12544 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer max-job-time" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-job-time" - -#. type: deftypevr -#: doc/guix.texi:12547 -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:12549 -msgid "Defaults to @samp{10800}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12551 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer max-log-size" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer max-log-size" - -#. type: deftypevr -#: doc/guix.texi:12554 -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:12556 -msgid "Defaults to @samp{1048576}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12558 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer multiple-operation-timeout" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer multiple-operation-timeout" - -#. type: deftypevr -#: doc/guix.texi:12561 -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:12563 doc/guix.texi:12777 -msgid "Defaults to @samp{300}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12565 -#, no-wrap -msgid "{@code{cups-configuration} parameter} string page-log-format" -msgstr "{paramètre de @code{cups-configuration}} string page-log-format" - -#. type: deftypevr -#: doc/guix.texi:12570 -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:12572 -#, no-wrap -msgid "%%" -msgstr "%%" - -#. type: table -#: doc/guix.texi:12574 -msgid "insert a single percent character" -msgstr "" - -#. type: item -#: doc/guix.texi:12575 -#, no-wrap -msgid "%@{name@}" -msgstr "" - -#. type: table -#: doc/guix.texi:12577 -msgid "insert the value of the specified IPP attribute" -msgstr "" - -#. type: item -#: doc/guix.texi:12578 -#, no-wrap -msgid "%C" -msgstr "%C" - -#. type: table -#: doc/guix.texi:12580 -msgid "insert the number of copies for the current page" -msgstr "" - -#. type: item -#: doc/guix.texi:12581 -#, no-wrap -msgid "%P" -msgstr "%P" - -#. type: table -#: doc/guix.texi:12583 -msgid "insert the current page number" -msgstr "" - -#. type: item -#: doc/guix.texi:12584 -#, no-wrap -msgid "%T" -msgstr "%T" - -#. type: table -#: doc/guix.texi:12586 -msgid "insert the current date and time in common log format" -msgstr "" - -#. type: item -#: doc/guix.texi:12587 -#, no-wrap -msgid "%j" -msgstr "%j" - -#. type: table -#: doc/guix.texi:12589 -msgid "insert the job ID" -msgstr "" - -#. type: item -#: doc/guix.texi:12590 doc/guix.texi:13979 -#, no-wrap -msgid "%p" -msgstr "%p" - -#. type: table -#: doc/guix.texi:12592 -msgid "insert the printer name" -msgstr "" - -#. type: item -#: doc/guix.texi:12593 doc/guix.texi:14002 -#, no-wrap -msgid "%u" -msgstr "%u" - -#. type: table -#: doc/guix.texi:12595 -msgid "insert the username" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12601 -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:12605 -#, no-wrap -msgid "{@code{cups-configuration} parameter} environment-variables environment-variables" -msgstr "{paramètre de @code{cups-configuration}} environment-variables environment-variables" - -#. type: deftypevr -#: doc/guix.texi:12608 -msgid "Passes the specified environment variable(s) to child processes; a list of strings." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12612 -#, no-wrap -msgid "{@code{cups-configuration} parameter} policy-configuration-list policies" -msgstr "{paramètre de @code{cups-configuration}} policy-configuration-list policies" - -#. type: deftypevr -#: doc/guix.texi:12614 -msgid "Specifies named access control policies." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12616 -msgid "Available @code{policy-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12617 -#, no-wrap -msgid "{@code{policy-configuration} parameter} string name" -msgstr "{paramètre de @code{policy-configuration}} string name" - -#. type: deftypevr -#: doc/guix.texi:12619 -msgid "Name of the policy." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12621 -#, no-wrap -msgid "{@code{policy-configuration} parameter} string job-private-access" -msgstr "{paramètre de @code{policy-configuration}} string job-private-access" - -#. type: deftypevr -#: doc/guix.texi:12631 -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:12633 doc/guix.texi:12655 -msgid "Defaults to @samp{\"@@OWNER @@SYSTEM\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12635 -#, no-wrap -msgid "{@code{policy-configuration} parameter} string job-private-values" -msgstr "{paramètre de @code{policy-configuration}} string job-private-values" - -#. type: deftypevr -#: doc/guix.texi:12638 doc/guix.texi:12660 -msgid "Specifies the list of job values to make private, or @code{all}, @code{default}, or @code{none}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12641 -msgid "Defaults to @samp{\"job-name job-originating-host-name job-originating-user-name phone\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12643 -#, no-wrap -msgid "{@code{policy-configuration} parameter} string subscription-private-access" -msgstr "{paramètre de @code{policy-configuration}} string subscription-private-access" - -#. type: deftypevr -#: doc/guix.texi:12653 -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:12657 -#, no-wrap -msgid "{@code{policy-configuration} parameter} string subscription-private-values" -msgstr "{paramètre de @code{policy-configuration}} string subscription-private-values" - -#. type: deftypevr -#: doc/guix.texi:12663 -msgid "Defaults to @samp{\"notify-events notify-pull-method notify-recipient-uri notify-subscriber-user-name notify-user-data\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12665 -#, no-wrap -msgid "{@code{policy-configuration} parameter} operation-access-control-list access-controls" -msgstr "{paramètre de @code{policy-configuration}} operation-access-control-list access-controls" - -#. type: deftypevr -#: doc/guix.texi:12667 -msgid "Access control by IPP operation." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12672 -#, no-wrap -msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-files" -msgstr "{paramètre de @code{cups-configuration}} boolean-or-non-negative-integer preserve-job-files" - -#. type: deftypevr -#: doc/guix.texi:12677 -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:12679 -msgid "Defaults to @samp{86400}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12681 -#, no-wrap -msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-history" -msgstr "{paramètre de @code{cups-configuration}} boolean-or-non-negative-integer preserve-job-history" - -#. type: deftypevr -#: doc/guix.texi:12686 -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:12690 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer reload-timeout" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer reload-timeout" - -#. type: deftypevr -#: doc/guix.texi:12693 -msgid "Specifies the amount of time to wait for job completion before restarting the scheduler." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12697 -#, no-wrap -msgid "{@code{cups-configuration} parameter} string rip-cache" -msgstr "{paramètre de @code{cups-configuration}} string rip-cache" - -#. type: deftypevr -#: doc/guix.texi:12700 -msgid "Specifies the maximum amount of memory to use when converting documents into bitmaps for a printer." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12702 -msgid "Defaults to @samp{\"128m\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12704 -#, no-wrap -msgid "{@code{cups-configuration} parameter} string server-admin" -msgstr "{paramètre de @code{cups-configuration}} string server-admin" - -#. type: deftypevr -#: doc/guix.texi:12706 -msgid "Specifies the email address of the server administrator." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12708 -msgid "Defaults to @samp{\"root@@localhost.localdomain\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12710 -#, no-wrap -msgid "{@code{cups-configuration} parameter} host-name-list-or-* server-alias" -msgstr "{paramètre de @code{cups-configuration}} host-name-list-or-* server-alias" - -#. type: deftypevr -#: doc/guix.texi:12718 -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:12720 -msgid "Defaults to @samp{*}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12722 -#, no-wrap -msgid "{@code{cups-configuration} parameter} string server-name" -msgstr "{paramètre de @code{cups-configuration}} string server-name" - -#. type: deftypevr -#: doc/guix.texi:12724 -msgid "Specifies the fully-qualified host name of the server." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12726 -msgid "Defaults to @samp{\"localhost\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12728 -#, no-wrap -msgid "{@code{cups-configuration} parameter} server-tokens server-tokens" -msgstr "{paramètre de @code{cups-configuration}} server-tokens server-tokens" - -#. type: deftypevr -#: doc/guix.texi:12736 -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:12738 -msgid "Defaults to @samp{Minimal}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12740 -#, no-wrap -msgid "{@code{cups-configuration} parameter} string set-env" -msgstr "{paramètre de @code{cups-configuration}} string set-env" - -#. type: deftypevr -#: doc/guix.texi:12742 -msgid "Set the specified environment variable to be passed to child processes." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12744 -msgid "Defaults to @samp{\"variable value\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:12746 -#, no-wrap -msgid "{@code{cups-configuration} parameter} multiline-string-list ssl-listen" -msgstr "{paramètre de @code{cups-configuration}} multiline-string-list ssl-listen" - -#. type: deftypevr -#: doc/guix.texi:12751 -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:12755 -#, no-wrap -msgid "{@code{cups-configuration} parameter} ssl-options ssl-options" -msgstr "{paramètre de @code{cups-configuration}} ssl-options ssl-options" - -#. type: deftypevr -#: doc/guix.texi:12762 -msgid "Sets encryption options. By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites. The @code{AllowRC4} option enables the 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer ones. The @code{AllowSSL3} option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12766 -#, no-wrap -msgid "{@code{cups-configuration} parameter} boolean strict-conformance?" -msgstr "{paramètre de @code{cups-configuration}} boolean strict-conformance?" - -#. type: deftypevr -#: doc/guix.texi:12769 -msgid "Specifies whether the scheduler requires clients to strictly adhere to the IPP specifications." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12773 -#, no-wrap -msgid "{@code{cups-configuration} parameter} non-negative-integer timeout" -msgstr "{paramètre de @code{cups-configuration}} non-negative-integer timeout" - -#. type: deftypevr -#: doc/guix.texi:12775 -msgid "Specifies the HTTP request timeout, in seconds." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12780 -#, no-wrap -msgid "{@code{cups-configuration} parameter} boolean web-interface?" -msgstr "{paramètre de @code{cups-configuration}} boolean web-interface?" - -#. type: deftypevr -#: doc/guix.texi:12782 -msgid "Specifies whether the web interface is enabled." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:12792 -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:12794 -msgid "Available @code{opaque-cups-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12795 -#, no-wrap -msgid "{@code{opaque-cups-configuration} parameter} package cups" -msgstr "{paramètre de @code{opaque-cups-configuration}} package cups" - -#. type: deftypevr -#: doc/guix.texi:12799 -#, no-wrap -msgid "{@code{opaque-cups-configuration} parameter} string cupsd.conf" -msgstr "{paramètre de @code{opaque-cups-configuration}} string cupsd.conf" - -#. type: deftypevr -#: doc/guix.texi:12801 -msgid "The contents of the @code{cupsd.conf}, as a string." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:12803 -#, no-wrap -msgid "{@code{opaque-cups-configuration} parameter} string cups-files.conf" -msgstr "{paramètre de @code{opaque-cups-configuration}} string cups-files.conf" - -#. type: deftypevr -#: doc/guix.texi:12805 -msgid "The contents of the @code{cups-files.conf} file, as a string." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:12810 -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: example -#: doc/guix.texi:12816 -#, no-wrap -msgid "" -"(service cups-service-type\n" -" (opaque-cups-configuration\n" -" (cupsd.conf cupsd.conf)\n" -" (cups-files.conf cups-files.conf)))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:12827 -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:12831 -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:12832 -#, no-wrap -msgid "{Scheme Variable} %desktop-services" -msgstr "{Variable Scheme} %desktop-services" - -#. type: defvr -#: doc/guix.texi:12835 -msgid "This is a list of services that builds upon @var{%base-services} and adds or adjusts services for a typical ``desktop'' setup." -msgstr "" - -#. type: defvr -#: doc/guix.texi:12845 -msgid "In particular, it adds a graphical login manager (@pxref{X Window, @code{slim-service}}), screen lockers, a network management tool (@pxref{Networking Services, @code{network-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:12850 -msgid "The @var{%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:12873 -msgid "Additionally, the @code{gnome-desktop-service}, @code{xfce-desktop-service}, @code{mate-desktop-service} 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} 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 made by @code{mate-desktop-service} 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." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:12882 -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 the @code{slim-service} for 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: deffn -#: doc/guix.texi:12883 -#, no-wrap -msgid "{Scheme Procedure} gnome-desktop-service" -msgstr "{Procédure Scheme} gnome-desktop-service" - -#. type: deffn -#: doc/guix.texi:12887 -msgid "Return a service that adds the @code{gnome} package to the system profile, and extends polkit with the actions from @code{gnome-settings-daemon}." -msgstr "" - -#. type: deffn -#: doc/guix.texi:12889 -#, no-wrap -msgid "{Scheme Procedure} xfce-desktop-service" -msgstr "{Procédure Scheme} xfce-desktop-service" - -#. type: deffn -#: doc/guix.texi:12894 -msgid "Return a service that 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: deffn -#: doc/guix.texi:12896 -#, no-wrap -msgid "{Scheme Procedure} mate-desktop-service" -msgstr "{Procédure Scheme} mate-desktop-service" - -#. type: deffn -#: doc/guix.texi:12900 -msgid "Return a service that adds the @code{mate} package to the system profile, and extends polkit with the actions from @code{mate-settings-daemon}." -msgstr "" - -#. type: deffn -#: doc/guix.texi:12902 -#, no-wrap -msgid "{Scheme Procedure} enlightenment-desktop-service-type" -msgstr "{Procédure Scheme} enlightenment-desktop-service-type" - -#. type: deffn -#: doc/guix.texi:12905 -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:12907 -#, no-wrap -msgid "{Data Type} enlightenment-desktop-service-configuration" -msgstr "{Type de données} enlightenment-desktop-service-configuration" - -#. type: item -#: doc/guix.texi:12909 -#, no-wrap -msgid "@code{enlightenment} (default @code{enlightenment})" -msgstr "@code{enlightenment} (par défaut : @code{enlightenment})" - -#. type: table -#: doc/guix.texi:12911 -msgid "The enlightenment package to use." -msgstr "Le paquet enlightenment à utiliser." - -#. type: Plain text -#: doc/guix.texi:12919 -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: example -#: doc/guix.texi:12930 -#, no-wrap -msgid "" -"(use-modules (gnu))\n" -"(use-service-modules desktop)\n" -"(operating-system\n" -" ...\n" -" ;; cons* adds items to the list given as its last argument.\n" -" (services (cons* (gnome-desktop-service)\n" -" (xfce-desktop-service)\n" -" %desktop-services))\n" -" ...)\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:12934 -msgid "These desktop environments will then be available as options in the graphical login window." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:12938 -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:12939 -#, no-wrap -msgid "{Scheme Procedure} dbus-service [#:dbus @var{dbus}] [#:services '()]" -msgstr "{Procédure Scheme} dbus-service [#:dbus @var{dbus}] [#:services '()]" - -#. type: deffn -#: doc/guix.texi:12942 -msgid "Return a service that runs the ``system bus'', using @var{dbus}, with support for @var{services}." -msgstr "" - -#. type: deffn -#: doc/guix.texi:12946 -msgid "@uref{http://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:12951 -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:12953 -#, no-wrap -msgid "{Scheme Procedure} elogind-service [#:config @var{config}]" -msgstr "{Procédure Scheme} elogind-service [#:config @var{config}]" - -#. type: deffn -#: doc/guix.texi:12959 -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:12963 -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:12968 -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:12970 -#, no-wrap -msgid "kill-user-processes?" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:12972 doc/guix.texi:12990 doc/guix.texi:12992 -#: doc/guix.texi:12994 doc/guix.texi:13006 -msgid "#f" -msgstr "" - -#. type: item -#: doc/guix.texi:12972 -#, no-wrap -msgid "kill-only-users" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:12974 doc/guix.texi:13012 -msgid "()" -msgstr "" - -#. type: item -#: doc/guix.texi:12974 -#, no-wrap -msgid "kill-exclude-users" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:12976 -msgid "(\"root\")" -msgstr "" - -#. type: item -#: doc/guix.texi:12976 -#, no-wrap -msgid "inhibit-delay-max-seconds" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:12978 -msgid "5" -msgstr "" - -#. type: item -#: doc/guix.texi:12978 -#, no-wrap -msgid "handle-power-key" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:12980 -msgid "poweroff" -msgstr "" - -#. type: item -#: doc/guix.texi:12980 -#, no-wrap -msgid "handle-suspend-key" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:12982 doc/guix.texi:12986 -msgid "suspend" -msgstr "" - -#. type: item -#: doc/guix.texi:12982 -#, no-wrap -msgid "handle-hibernate-key" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:12984 -msgid "hibernate" -msgstr "" - -#. type: item -#: doc/guix.texi:12984 -#, no-wrap -msgid "handle-lid-switch" -msgstr "" - -#. type: item -#: doc/guix.texi:12986 -#, no-wrap -msgid "handle-lid-switch-docked" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:12988 doc/guix.texi:13000 -msgid "ignore" -msgstr "" - -#. type: item -#: doc/guix.texi:12988 -#, no-wrap -msgid "power-key-ignore-inhibited?" -msgstr "" - -#. type: item -#: doc/guix.texi:12990 -#, no-wrap -msgid "suspend-key-ignore-inhibited?" -msgstr "" - -#. type: item -#: doc/guix.texi:12992 -#, no-wrap -msgid "hibernate-key-ignore-inhibited?" -msgstr "" - -#. type: item -#: doc/guix.texi:12994 -#, no-wrap -msgid "lid-switch-ignore-inhibited?" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:12996 doc/guix.texi:13008 -msgid "#t" -msgstr "" - -#. type: item -#: doc/guix.texi:12996 -#, no-wrap -msgid "holdoff-timeout-seconds" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:12998 -msgid "30" -msgstr "" - -#. type: item -#: doc/guix.texi:12998 -#, no-wrap -msgid "idle-action" -msgstr "" - -#. type: item -#: doc/guix.texi:13000 -#, no-wrap -msgid "idle-action-seconds" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:13002 -msgid "(* 30 60)" -msgstr "" - -#. type: item -#: doc/guix.texi:13002 -#, no-wrap -msgid "runtime-directory-size-percent" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:13004 -msgid "10" -msgstr "" - -#. type: item -#: doc/guix.texi:13004 -#, no-wrap -msgid "runtime-directory-size" -msgstr "" - -#. type: item -#: doc/guix.texi:13006 -#, no-wrap -msgid "remove-ipc?" -msgstr "" - -#. type: item -#: doc/guix.texi:13008 -#, no-wrap -msgid "suspend-state" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:13010 -msgid "(\"mem\" \"standby\" \"freeze\")" -msgstr "" - -#. type: item -#: doc/guix.texi:13010 -#, no-wrap -msgid "suspend-mode" -msgstr "" - -#. type: item -#: doc/guix.texi:13012 -#, no-wrap -msgid "hibernate-state" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:13014 doc/guix.texi:13018 -msgid "(\"disk\")" -msgstr "" - -#. type: item -#: doc/guix.texi:13014 -#, no-wrap -msgid "hibernate-mode" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:13016 -msgid "(\"platform\" \"shutdown\")" -msgstr "" - -#. type: item -#: doc/guix.texi:13016 -#, no-wrap -msgid "hybrid-sleep-state" -msgstr "" - -#. type: item -#: doc/guix.texi:13018 -#, no-wrap -msgid "hybrid-sleep-mode" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:13020 -msgid "(\"suspend\" \"platform\" \"shutdown\")" -msgstr "" - -#. type: deffn -#: doc/guix.texi:13023 -#, no-wrap -msgid "{Scheme Procedure} accountsservice-service @" -msgstr "{Procédure Scheme} accountsservice-service @" - -#. type: deffn -#: doc/guix.texi:13031 -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:13034 -msgid "The @var{accountsservice} keyword argument is the @code{accountsservice} package to expose as a service." -msgstr "" - -#. type: deffn -#: doc/guix.texi:13036 -#, no-wrap -msgid "{Scheme Procedure} polkit-service @" -msgstr "{Procédure Scheme} polkit-service @" - -#. type: deffn -#: doc/guix.texi:13045 -msgid "[#:polkit @var{polkit}] Return a service that runs the @uref{http://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: deffn -#: doc/guix.texi:13047 -#, no-wrap -msgid "{Scheme Procedure} upower-service [#:upower @var{upower}] @" -msgstr "{Procédure Scheme} upower-service [#:upower @var{upower}] @" - -#. type: deffn -#: doc/guix.texi:13064 -msgid "[#:watts-up-pro? #f] @ [#:poll-batteries? #t] @ [#:ignore-lid? #f] @ [#:use-percentage-for-policy? #f] @ [#:percentage-low 10] @ [#:percentage-critical 3] @ [#:percentage-action 2] @ [#:time-low 1200] @ [#:time-critical 300] @ [#:time-action 120] @ [#:critical-power-action 'hybrid-sleep] Return a service that runs @uref{http://upower.freedesktop.org/, @command{upowerd}}, a system-wide monitor for power consumption and battery levels, with the given configuration settings. It implements the @code{org.freedesktop.UPower} D-Bus interface, and is notably used by GNOME." -msgstr "" - -#. type: deffn -#: doc/guix.texi:13066 -#, no-wrap -msgid "{Scheme Procedure} udisks-service [#:udisks @var{udisks}]" -msgstr "{Procédure Scheme} udisks-service [#:udisks @var{udisks}]" - -#. type: deffn -#: doc/guix.texi:13071 -msgid "Return a service for @uref{http://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:13073 -#, no-wrap -msgid "{Scheme Procedure} colord-service [#:colord @var{colord}]" -msgstr "{Procédure Scheme} colord-service [#:colord @var{colord}]" - -#. type: deffn -#: doc/guix.texi:13079 -msgid "Return a 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{http://www.freedesktop.org/software/colord/, the colord web site} for more information." -msgstr "" - -#. type: deffn -#: doc/guix.texi:13081 -#, no-wrap -msgid "{Scheme Procedure} geoclue-application name [#:allowed? #t] [#:system? #f] [#:users '()]" -msgstr "{Procédure Scheme} geoclue-application name [#:allowed? #t] [#:system? #f] [#:users '()]" - -#. type: deffn -#: doc/guix.texi:13090 -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: defvr -#: doc/guix.texi:13092 -#, no-wrap -msgid "{Scheme Variable} %standard-geoclue-applications" -msgstr "{Variable Scheme} %standard-geoclue-applications" - -#. type: defvr -#: doc/guix.texi:13099 -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:13101 -#, no-wrap -msgid "{Scheme Procedure} geoclue-service [#:colord @var{colord}] @" -msgstr "{Procédure Scheme} geoclue-service [#:colord @var{colord}] @" - -#. type: deffn -#: doc/guix.texi:13114 -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:13116 -#, no-wrap -msgid "{Scheme Procedure} bluetooth-service [#:bluez @var{bluez}] @" -msgstr "{Procédure Scheme} bluetooth-service [#:bluez @var{bluez}] @" - -#. type: deffn -#: doc/guix.texi:13123 -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:13125 -msgid "Users need to be in the @code{lp} group to access the D-Bus service." -msgstr "" - -#. type: cindex -#: doc/guix.texi:13130 -#, no-wrap -msgid "sound support" -msgstr "" - -#. type: cindex -#: doc/guix.texi:13131 -#, no-wrap -msgid "ALSA" -msgstr "" - -#. type: cindex -#: doc/guix.texi:13132 -#, no-wrap -msgid "PulseAudio, sound support" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:13139 -msgid "The @code{(gnu services sound)} module provides an @code{alsa-service-type} service to generate an ALSA @file{/etc/asound.conf} configuration file. This configuration file is what allows applications that produce sound using ALSA to be correctly handled." -msgstr "" - -#. type: deffn -#: doc/guix.texi:13140 -#, no-wrap -msgid "{Scheme Variable} alsa-service-type" -msgstr "{Variable Scheme} alsa-service-type" - -#. type: deffn -#: doc/guix.texi:13143 -msgid "This is the type for the @uref{https://alsa-project.org/, ALSA}, @command{alsa-configuration} record as in this example:" -msgstr "" - -#. type: example -#: doc/guix.texi:13146 -#, no-wrap -msgid "(service alsa-service-type)\n" -msgstr "" - -#. type: deffn -#: doc/guix.texi:13149 -msgid "See below for details about @code{alsa-configuration}." -msgstr "" - -#. type: deftp -#: doc/guix.texi:13151 -#, no-wrap -msgid "{Data Type} alsa-configuration" -msgstr "{Type de donnée} alsa-configuration" - -#. type: deftp -#: doc/guix.texi:13153 -msgid "Data type representing the configuration for @code{alsa-service}." -msgstr "" - -#. type: item -#: doc/guix.texi:13155 -#, no-wrap -msgid "@code{pulseaudio?} (default: @var{#t})" -msgstr "@code{pulseaudio?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:13158 -msgid "Whether ALSA applications should transparently be made to use the @uref{http://www.pulseaudio.org/, PulseAudio} sound server." -msgstr "" - -#. type: table -#: doc/guix.texi:13162 -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:13163 -#, no-wrap -msgid "@code{extra-options} (default: @var{\"\"})" -msgstr "@code{extra-options} (par défaut : @code{\"\"})" - -#. type: table -#: doc/guix.texi:13165 -msgid "String to append to the @file{asound.conf} file." -msgstr "" - -#. type: cindex -#: doc/guix.texi:13173 -#, no-wrap -msgid "SQL" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:13175 -msgid "The @code{(gnu services databases)} module provides the following services." -msgstr "" - -#. type: deffn -#: doc/guix.texi:13176 -#, no-wrap -msgid "{Scheme Procedure} postgresql-service [#:postgresql postgresql] @" -msgstr "{Procédure Scheme} postgresql-service [#:postgresql postgresql] @" - -#. type: deffn -#: doc/guix.texi:13181 -msgid "[#:config-file] [#:data-directory ``/var/lib/postgresql/data''] @ [#:port 5432] [#:locale ``en_US.utf8''] Return a service that runs @var{postgresql}, the PostgreSQL database server." -msgstr "" - -#. type: deffn -#: doc/guix.texi:13185 -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: deffn -#: doc/guix.texi:13187 -#, no-wrap -msgid "{Scheme Procedure} mysql-service [#:config (mysql-configuration)]" -msgstr "{Procédure Scheme} mysql-service [#:config (mysql-configuration)]" - -#. type: deffn -#: doc/guix.texi:13190 -msgid "Return a service that runs @command{mysqld}, the MySQL or MariaDB database server." -msgstr "" - -#. type: deffn -#: doc/guix.texi:13193 -msgid "The optional @var{config} argument specifies the configuration for @command{mysqld}, which should be a @code{} object." -msgstr "" - -#. type: deftp -#: doc/guix.texi:13195 -#, no-wrap -msgid "{Data Type} mysql-configuration" -msgstr "{Type de données} mysql-configuration" - -#. type: deftp -#: doc/guix.texi:13197 -msgid "Data type representing the configuration of @var{mysql-service}." -msgstr "" - -#. type: item -#: doc/guix.texi:13199 -#, no-wrap -msgid "@code{mysql} (default: @var{mariadb})" -msgstr "@code{mysql} (par défaut : @var{mariadb})" - -#. type: table -#: doc/guix.texi:13202 -msgid "Package object of the MySQL database server, can be either @var{mariadb} or @var{mysql}." -msgstr "" - -#. type: table -#: doc/guix.texi:13205 -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:13206 -#, no-wrap -msgid "@code{port} (default: @code{3306})" -msgstr "@code{port} (par défaut : @code{3306})" - -#. type: table -#: doc/guix.texi:13208 -msgid "TCP port on which the database server listens for incoming connections." -msgstr "" - -#. type: defvr -#: doc/guix.texi:13211 -#, no-wrap -msgid "{Scheme Variable} memcached-service-type" -msgstr "{Variable Scheme} memcached-service-type" - -#. type: defvr -#: doc/guix.texi:13215 -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: example -#: doc/guix.texi:13219 -#, no-wrap -msgid "(service memcached-service-type)\n" -msgstr "" - -#. type: deftp -#: doc/guix.texi:13221 -#, no-wrap -msgid "{Data Type} memcached-configuration" -msgstr "{Type de données} memcached-configuration" - -#. type: deftp -#: doc/guix.texi:13223 -msgid "Data type representing the configuration of memcached." -msgstr "" - -#. type: item -#: doc/guix.texi:13225 -#, no-wrap -msgid "@code{memcached} (default: @code{memcached})" -msgstr "@code{memcached} (par défaut : @code{memcached})" - -#. type: table -#: doc/guix.texi:13227 -msgid "The Memcached package to use." -msgstr "Le paquet Memcached à utiliser." - -#. type: item -#: doc/guix.texi:13228 -#, no-wrap -msgid "@code{interfaces} (default: @code{'(\"0.0.0.0\")})" -msgstr "@code{interfaces} (par défaut : @code{'(\"0.0.0.0\")})" - -#. type: table -#: doc/guix.texi:13230 -msgid "Network interfaces on which to listen." -msgstr "" - -#. type: item -#: doc/guix.texi:13231 -#, no-wrap -msgid "@code{tcp-port} (default: @code{11211})" -msgstr "@code{tcp-port} (par défaut : @code{11211})" - -#. type: table -#: doc/guix.texi:13233 -msgid "Port on which to accept connections on," -msgstr "" - -#. type: item -#: doc/guix.texi:13234 -#, no-wrap -msgid "@code{udp-port} (default: @code{11211})" -msgstr "@code{udp-port} (par défaut : @code{11211})" - -#. type: table -#: doc/guix.texi:13237 -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:13238 -#, no-wrap -msgid "@code{additional-options} (default: @code{'()})" -msgstr "@code{additional-options} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:13240 -msgid "Additional command line options to pass to @code{memcached}." -msgstr "" - -#. type: defvr -#: doc/guix.texi:13243 -#, no-wrap -msgid "{Scheme Variable} mongodb-service-type" -msgstr "{Variable Scheme} mongodb-service-type" - -#. type: defvr -#: doc/guix.texi:13246 -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: example -#: doc/guix.texi:13250 -#, no-wrap -msgid "(service mongodb-service-type)\n" -msgstr "" - -#. type: deftp -#: doc/guix.texi:13252 -#, no-wrap -msgid "{Data Type} mongodb-configuration" -msgstr "{Type de données} mongodb-configuration" - -#. type: deftp -#: doc/guix.texi:13254 -msgid "Data type representing the configuration of mongodb." -msgstr "" - -#. type: item -#: doc/guix.texi:13256 -#, no-wrap -msgid "@code{mongodb} (default: @code{mongodb})" -msgstr "@code{mongodb} (par défaut : @code{mongodb})" - -#. type: table -#: doc/guix.texi:13258 -msgid "The MongoDB package to use." -msgstr "Le paquet MongoDB à utiliser." - -#. type: item -#: doc/guix.texi:13259 -#, no-wrap -msgid "@code{config-file} (default: @code{%default-mongodb-configuration-file})" -msgstr "@code{config-file} (par défaut : @code{%default-mongodb-configuration-file})" - -#. type: table -#: doc/guix.texi:13261 -msgid "The configuration file for MongoDB." -msgstr "" - -#. type: item -#: doc/guix.texi:13262 -#, no-wrap -msgid "@code{data-directory} (default: @code{\"/var/lib/mongodb\"})" -msgstr "@code{data-directory} (par défaut : @code{\"/var/lib/mongodb\"})" - -#. type: table -#: doc/guix.texi:13266 -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:13269 -#, no-wrap -msgid "{Scheme Variable} redis-service-type" -msgstr "{Variable Scheme} redis-service-type" - -#. type: defvr -#: doc/guix.texi:13272 -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:13274 -#, no-wrap -msgid "{Data Type} redis-configuration" -msgstr "{Type de données} redis-configuration" - -#. type: deftp -#: doc/guix.texi:13276 -msgid "Data type representing the configuration of redis." -msgstr "" - -#. type: item -#: doc/guix.texi:13278 -#, no-wrap -msgid "@code{redis} (default: @code{redis})" -msgstr "@code{redis} (par défaut : @code{redis})" - -#. type: table -#: doc/guix.texi:13280 -msgid "The Redis package to use." -msgstr "Le paquet Redis à utiliser." - -#. type: item -#: doc/guix.texi:13281 -#, no-wrap -msgid "@code{bind} (default: @code{\"127.0.0.1\"})" -msgstr "@code{bind} (par défaut : @code{\"127.0.0.1\"})" - -#. type: table -#: doc/guix.texi:13283 -msgid "Network interface on which to listen." -msgstr "" - -#. type: item -#: doc/guix.texi:13284 -#, no-wrap -msgid "@code{port} (default: @code{6379})" -msgstr "@code{port} (par défaut : @code{6379})" - -#. type: table -#: doc/guix.texi:13287 -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:13288 -#, no-wrap -msgid "@code{working-directory} (default: @code{\"/var/lib/redis\"})" -msgstr "@code{working-directory} (par défaut : @code{\"/var/lib/redis\"})" - -#. type: table -#: doc/guix.texi:13290 -msgid "Directory in which to store the database and related files." -msgstr "" - -#. type: cindex -#: doc/guix.texi:13296 -#, no-wrap -msgid "mail" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:13297 doc/guix.texi:16457 -#, no-wrap -msgid "email" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:13302 -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:13303 -#, no-wrap -msgid "Dovecot Service" -msgstr "" - -#. type: deffn -#: doc/guix.texi:13305 -#, no-wrap -msgid "{Scheme Procedure} dovecot-service [#:config (dovecot-configuration)]" -msgstr "{Procédure Scheme} dovecot-service [#:config (dovecot-configuration)]" - -#. type: deffn -#: doc/guix.texi:13307 -msgid "Return a service that runs the Dovecot IMAP/POP3/LMTP mail server." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:13317 -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:13320 -msgid "For example, to specify that mail is located at @code{maildir~/.mail}, one would instantiate the Dovecot service like this:" -msgstr "" - -#. type: example -#: doc/guix.texi:13325 -#, no-wrap -msgid "" -"(dovecot-service #:config\n" -" (dovecot-configuration\n" -" (mail-location \"maildir:~/.mail\")))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:13333 -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:13343 -msgid "Available @code{dovecot-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13344 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} package dovecot" -msgstr "{paramètre de @code{dovecot-configuration}} package dovecot" - -#. type: deftypevr -#: doc/guix.texi:13346 doc/guix.texi:14633 -msgid "The dovecot package." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13348 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} comma-separated-string-list listen" -msgstr "{paramètre de @code{dovecot-configuration}} comma-separated-string-list listen" - -#. type: deftypevr -#: doc/guix.texi:13354 -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:13356 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} protocol-configuration-list protocols" -msgstr "{paramètre de @code{dovecot-configuration}} protocol-configuration-list protocols" - -#. type: deftypevr -#: doc/guix.texi:13359 -msgid "List of protocols we want to serve. Available protocols include @samp{imap}, @samp{pop3}, and @samp{lmtp}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13361 -msgid "Available @code{protocol-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13362 -#, no-wrap -msgid "{@code{protocol-configuration} parameter} string name" -msgstr "{paramètre de @code{protocol-configuration}} string name" - -#. type: deftypevr -#: doc/guix.texi:13364 -msgid "The name of the protocol." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13366 -#, no-wrap -msgid "{@code{protocol-configuration} parameter} string auth-socket-path" -msgstr "{paramètre de @code{protocol-configuration}} string auth-socket-path" - -#. type: deftypevr -#: doc/guix.texi:13370 -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:13372 -#, no-wrap -msgid "{@code{protocol-configuration} parameter} space-separated-string-list mail-plugins" -msgstr "{paramètre de @code{protocol-configuration}} space-separated-string-list mail-plugins" - -#. type: deftypevr -#: doc/guix.texi:13374 -msgid "Space separated list of plugins to load." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13376 -#, no-wrap -msgid "{@code{protocol-configuration} parameter} non-negative-integer mail-max-userip-connections" -msgstr "{paramètre de @code{protocol-configuration}} non-negative-integer mail-max-userip-connections" - -#. type: deftypevr -#: doc/guix.texi:13380 -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:13384 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} service-configuration-list services" -msgstr "{paramètre de @code{dovecot-configuration}} service-configuration-list services" - -#. type: deftypevr -#: doc/guix.texi:13388 -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:13390 -msgid "Available @code{service-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13391 -#, no-wrap -msgid "{@code{service-configuration} parameter} string kind" -msgstr "{paramètre de @code{service-configuration}} string kind" - -#. type: deftypevr -#: doc/guix.texi:13396 -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:13398 -#, no-wrap -msgid "{@code{service-configuration} parameter} listener-configuration-list listeners" -msgstr "{paramètre de @code{service-configuration}} listener-configuration-list listeners" - -#. type: deftypevr -#: doc/guix.texi:13403 -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:13405 -msgid "Available @code{unix-listener-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13406 -#, no-wrap -msgid "{@code{unix-listener-configuration} parameter} string path" -msgstr "{paramètre de @code{unix-listener-configuration}} string path" - -#. type: deftypevr -#: doc/guix.texi:13409 doc/guix.texi:13432 -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:13411 -#, no-wrap -msgid "{@code{unix-listener-configuration} parameter} string mode" -msgstr "{paramètre de @code{unix-listener-configuration}} string mode" - -#. type: deftypevr -#: doc/guix.texi:13414 doc/guix.texi:13437 -msgid "The access mode for the socket. Defaults to @samp{\"0600\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13416 -#, no-wrap -msgid "{@code{unix-listener-configuration} parameter} string user" -msgstr "{paramètre de @code{unix-listener-configuration}} string user" - -#. type: deftypevr -#: doc/guix.texi:13419 doc/guix.texi:13442 -msgid "The user to own the socket. Defaults to @samp{\"\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13421 -#, no-wrap -msgid "{@code{unix-listener-configuration} parameter} string group" -msgstr "{paramètre de @code{unix-listener-configuration}} string group" - -#. type: deftypevr -#: doc/guix.texi:13424 doc/guix.texi:13447 -msgid "The group to own the socket. Defaults to @samp{\"\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13428 -msgid "Available @code{fifo-listener-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13429 -#, no-wrap -msgid "{@code{fifo-listener-configuration} parameter} string path" -msgstr "{paramètre de @code{fifo-listener-configuration}} string path" - -#. type: deftypevr -#: doc/guix.texi:13434 -#, no-wrap -msgid "{@code{fifo-listener-configuration} parameter} string mode" -msgstr "{paramètre de @code{fifo-listener-configuration}} string mode" - -#. type: deftypevr -#: doc/guix.texi:13439 -#, no-wrap -msgid "{@code{fifo-listener-configuration} parameter} string user" -msgstr "{paramètre de @code{fifo-listener-configuration}} string user" - -#. type: deftypevr -#: doc/guix.texi:13444 -#, no-wrap -msgid "{@code{fifo-listener-configuration} parameter} string group" -msgstr "{paramètre de @code{fifo-listener-configuration}} string group" - -#. type: deftypevr -#: doc/guix.texi:13451 -msgid "Available @code{inet-listener-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13452 -#, no-wrap -msgid "{@code{inet-listener-configuration} parameter} string protocol" -msgstr "{paramètre de @code{inet-listener-configuration}} string protocol" - -#. type: deftypevr -#: doc/guix.texi:13454 -msgid "The protocol to listen for." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13456 -#, no-wrap -msgid "{@code{inet-listener-configuration} parameter} string address" -msgstr "{paramètre de @code{inet-listener-configuration}} string address" - -#. type: deftypevr -#: doc/guix.texi:13459 -msgid "The address on which to listen, or empty for all addresses. Defaults to @samp{\"\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13461 -#, no-wrap -msgid "{@code{inet-listener-configuration} parameter} non-negative-integer port" -msgstr "{paramètre de @code{inet-listener-configuration}} non-negative-integer port" - -#. type: deftypevr -#: doc/guix.texi:13463 -msgid "The port on which to listen." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13465 -#, no-wrap -msgid "{@code{inet-listener-configuration} parameter} boolean ssl?" -msgstr "{paramètre de @code{inet-listener-configuration}} boolean ssl?" - -#. type: deftypevr -#: doc/guix.texi:13469 -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:13473 -#, no-wrap -msgid "{@code{service-configuration} parameter} non-negative-integer service-count" -msgstr "{paramètre de @code{service-configuration}} non-negative-integer service-count" - -#. type: deftypevr -#: doc/guix.texi:13478 -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:13480 -#, no-wrap -msgid "{@code{service-configuration} parameter} non-negative-integer process-min-avail" -msgstr "{paramètre de @code{service-configuration}} non-negative-integer process-min-avail" - -#. type: deftypevr -#: doc/guix.texi:13483 -msgid "Number of processes to always keep waiting for more connections. Defaults to @samp{0}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13485 -#, no-wrap -msgid "{@code{service-configuration} parameter} non-negative-integer vsz-limit" -msgstr "{paramètre de @code{service-configuration}} non-negative-integer vsz-limit" - -#. type: deftypevr -#: doc/guix.texi:13489 -msgid "If you set @samp{service-count 0}, you probably need to grow this. Defaults to @samp{256000000}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13493 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} dict-configuration dict" -msgstr "{paramètre de @code{dovecot-configuration}} dict-configuration dict" - -#. type: deftypevr -#: doc/guix.texi:13496 -msgid "Dict configuration, as created by the @code{dict-configuration} constructor." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13498 -msgid "Available @code{dict-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13499 -#, no-wrap -msgid "{@code{dict-configuration} parameter} free-form-fields entries" -msgstr "{paramètre de @code{dict-configuration}} free-form-fields entries" - -#. type: deftypevr -#: doc/guix.texi:13502 -msgid "A list of key-value pairs that this dict should hold. Defaults to @samp{()}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13506 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} passdb-configuration-list passdbs" -msgstr "{paramètre de @code{dovecot-configuration}} passdb-configuration-list passdbs" - -#. type: deftypevr -#: doc/guix.texi:13509 -msgid "A list of passdb configurations, each one created by the @code{passdb-configuration} constructor." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13511 -msgid "Available @code{passdb-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13512 -#, no-wrap -msgid "{@code{passdb-configuration} parameter} string driver" -msgstr "{paramètre de @code{passdb-configuration}} string driver" - -#. type: deftypevr -#: doc/guix.texi:13517 -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:13519 -#, no-wrap -msgid "{@code{passdb-configuration} parameter} space-separated-string-list args" -msgstr "{paramètre de @code{passdb-configuration}} space-separated-string-list args" - -#. type: deftypevr -#: doc/guix.texi:13522 -msgid "Space separated list of arguments to the passdb driver. Defaults to @samp{\"\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13526 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} userdb-configuration-list userdbs" -msgstr "{paramètre de @code{dovecot-configuration}} userdb-configuration-list userdbs" - -#. type: deftypevr -#: doc/guix.texi:13529 -msgid "List of userdb configurations, each one created by the @code{userdb-configuration} constructor." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13531 -msgid "Available @code{userdb-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13532 -#, no-wrap -msgid "{@code{userdb-configuration} parameter} string driver" -msgstr "{paramètre de @code{userdb-configuration}} string driver" - -#. type: deftypevr -#: doc/guix.texi:13536 -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:13538 -#, no-wrap -msgid "{@code{userdb-configuration} parameter} space-separated-string-list args" -msgstr "{paramètre de @code{userdb-configuration}} space-separated-string-list args" - -#. type: deftypevr -#: doc/guix.texi:13541 -msgid "Space separated list of arguments to the userdb driver. Defaults to @samp{\"\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13543 -#, no-wrap -msgid "{@code{userdb-configuration} parameter} free-form-args override-fields" -msgstr "{paramètre de @code{userdb-configuration}} free-form-args override-fields" - -#. type: deftypevr -#: doc/guix.texi:13546 -msgid "Override fields from passwd. Defaults to @samp{()}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13550 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} plugin-configuration plugin-configuration" -msgstr "{paramètre de @code{dovecot-configuration}} plugin-configuration plugin-configuration" - -#. type: deftypevr -#: doc/guix.texi:13553 -msgid "Plug-in configuration, created by the @code{plugin-configuration} constructor." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13555 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} list-of-namespace-configuration namespaces" -msgstr "{paramètre de @code{dovecot-configuration}} list-of-namespace-configuration namespaces" - -#. type: deftypevr -#: doc/guix.texi:13558 -msgid "List of namespaces. Each item in the list is created by the @code{namespace-configuration} constructor." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13560 -msgid "Available @code{namespace-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13561 -#, no-wrap -msgid "{@code{namespace-configuration} parameter} string name" -msgstr "{paramètre de @code{namespace-configuration}} string name" - -#. type: deftypevr -#: doc/guix.texi:13563 -msgid "Name for this namespace." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13565 -#, no-wrap -msgid "{@code{namespace-configuration} parameter} string type" -msgstr "{paramètre de @code{namespace-configuration}} string type" - -#. type: deftypevr -#: doc/guix.texi:13568 -msgid "Namespace type: @samp{private}, @samp{shared} or @samp{public}. Defaults to @samp{\"private\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13570 -#, no-wrap -msgid "{@code{namespace-configuration} parameter} string separator" -msgstr "{paramètre de @code{namespace-configuration}} string separator" - -#. type: deftypevr -#: doc/guix.texi:13576 -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:13578 -#, no-wrap -msgid "{@code{namespace-configuration} parameter} string prefix" -msgstr "{paramètre de @code{namespace-configuration}} string prefix" - -#. type: deftypevr -#: doc/guix.texi:13582 -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:13584 -#, no-wrap -msgid "{@code{namespace-configuration} parameter} string location" -msgstr "{paramètre de @code{namespace-configuration}} string location" - -#. type: deftypevr -#: doc/guix.texi:13588 -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:13590 -#, no-wrap -msgid "{@code{namespace-configuration} parameter} boolean inbox?" -msgstr "{paramètre de @code{namespace-configuration}} boolean inbox?" - -#. type: deftypevr -#: doc/guix.texi:13594 -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:13596 -#, no-wrap -msgid "{@code{namespace-configuration} parameter} boolean hidden?" -msgstr "{paramètre de @code{namespace-configuration}} boolean hidden?" - -#. type: deftypevr -#: doc/guix.texi:13604 -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:13606 -#, no-wrap -msgid "{@code{namespace-configuration} parameter} boolean list?" -msgstr "{paramètre de @code{namespace-configuration}} boolean list?" - -#. type: deftypevr -#: doc/guix.texi:13612 -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:13614 -#, no-wrap -msgid "{@code{namespace-configuration} parameter} boolean subscriptions?" -msgstr "{paramètre de @code{namespace-configuration}} boolean subscriptions?" - -#. type: deftypevr -#: doc/guix.texi:13619 -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:13621 -#, no-wrap -msgid "{@code{namespace-configuration} parameter} mailbox-configuration-list mailboxes" -msgstr "{paramètre de @code{namespace-configuration}} mailbox-configuration-list mailboxes" - -#. type: deftypevr -#: doc/guix.texi:13624 -msgid "List of predefined mailboxes in this namespace. Defaults to @samp{()}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13626 -msgid "Available @code{mailbox-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13627 -#, no-wrap -msgid "{@code{mailbox-configuration} parameter} string name" -msgstr "{paramètre de @code{mailbox-configuration}} string name" - -#. type: deftypevr -#: doc/guix.texi:13629 -msgid "Name for this mailbox." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13631 -#, no-wrap -msgid "{@code{mailbox-configuration} parameter} string auto" -msgstr "{paramètre de @code{mailbox-configuration}} string auto" - -#. type: deftypevr -#: doc/guix.texi:13635 -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:13637 -#, no-wrap -msgid "{@code{mailbox-configuration} parameter} space-separated-string-list special-use" -msgstr "{paramètre de @code{mailbox-configuration}} space-separated-string-list special-use" - -#. type: deftypevr -#: doc/guix.texi:13642 -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:13648 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} file-name base-dir" -msgstr "{paramètre de @code{dovecot-configuration}} file-name base-dir" - -#. type: deftypevr -#: doc/guix.texi:13651 -msgid "Base directory where to store runtime data. Defaults to @samp{\"/var/run/dovecot/\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13653 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string login-greeting" -msgstr "{paramètre de @code{dovecot-configuration}} string login-greeting" - -#. type: deftypevr -#: doc/guix.texi:13656 -msgid "Greeting message for clients. Defaults to @samp{\"Dovecot ready.\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13658 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-trusted-networks" -msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list login-trusted-networks" - -#. type: deftypevr -#: doc/guix.texi:13665 -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:13667 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-access-sockets" -msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list login-access-sockets" - -#. type: deftypevr -#: doc/guix.texi:13670 -msgid "List of login access check sockets (e.g. tcpwrap). Defaults to @samp{()}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13672 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean verbose-proctitle?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean verbose-proctitle?" - -#. type: deftypevr -#: doc/guix.texi:13678 -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:13680 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean shutdown-clients?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean shutdown-clients?" - -#. type: deftypevr -#: doc/guix.texi:13686 -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:13688 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer doveadm-worker-count" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer doveadm-worker-count" - -#. type: deftypevr -#: doc/guix.texi:13692 -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:13694 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string doveadm-socket-path" -msgstr "{paramètre de @code{dovecot-configuration}} string doveadm-socket-path" - -#. type: deftypevr -#: doc/guix.texi:13697 -msgid "UNIX socket or host:port used for connecting to doveadm server. Defaults to @samp{\"doveadm-server\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13699 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} space-separated-string-list import-environment" -msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list import-environment" - -#. type: deftypevr -#: doc/guix.texi:13703 -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:13705 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean disable-plaintext-auth?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean disable-plaintext-auth?" - -#. type: deftypevr -#: doc/guix.texi:13712 -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:13714 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-cache-size" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer auth-cache-size" - -#. type: deftypevr -#: doc/guix.texi:13719 -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:13721 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string auth-cache-ttl" -msgstr "{paramètre de @code{dovecot-configuration}} string auth-cache-ttl" - -#. type: deftypevr -#: doc/guix.texi:13729 -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:13731 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string auth-cache-negative-ttl" -msgstr "{paramètre de @code{dovecot-configuration}} string auth-cache-negative-ttl" - -#. type: deftypevr -#: doc/guix.texi:13735 -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:13737 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-realms" -msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list auth-realms" - -#. type: deftypevr -#: doc/guix.texi:13743 -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:13745 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string auth-default-realm" -msgstr "{paramètre de @code{dovecot-configuration}} string auth-default-realm" - -#. type: deftypevr -#: doc/guix.texi:13750 -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:13752 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string auth-username-chars" -msgstr "{paramètre de @code{dovecot-configuration}} string auth-username-chars" - -#. type: deftypevr -#: doc/guix.texi:13759 -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:13761 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string auth-username-translation" -msgstr "{paramètre de @code{dovecot-configuration}} string auth-username-translation" - -#. type: deftypevr -#: doc/guix.texi:13767 -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:13769 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string auth-username-format" -msgstr "{paramètre de @code{dovecot-configuration}} string auth-username-format" - -#. type: deftypevr -#: doc/guix.texi:13776 -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:13778 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string auth-master-user-separator" -msgstr "{paramètre de @code{dovecot-configuration}} string auth-master-user-separator" - -#. type: deftypevr -#: doc/guix.texi:13786 -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:13788 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string auth-anonymous-username" -msgstr "{paramètre de @code{dovecot-configuration}} string auth-anonymous-username" - -#. type: deftypevr -#: doc/guix.texi:13792 -msgid "Username to use for users logging in with ANONYMOUS SASL mechanism. Defaults to @samp{\"anonymous\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13794 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-worker-max-count" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer auth-worker-max-count" - -#. type: deftypevr -#: doc/guix.texi:13799 -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:13801 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string auth-gssapi-hostname" -msgstr "{paramètre de @code{dovecot-configuration}} string auth-gssapi-hostname" - -#. type: deftypevr -#: doc/guix.texi:13806 -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:13808 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string auth-krb5-keytab" -msgstr "{paramètre de @code{dovecot-configuration}} string auth-krb5-keytab" - -#. type: deftypevr -#: doc/guix.texi:13814 -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:13816 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean auth-use-winbind?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean auth-use-winbind?" - -#. type: deftypevr -#: doc/guix.texi:13821 -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:13823 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} file-name auth-winbind-helper-path" -msgstr "{paramètre de @code{dovecot-configuration}} file-name auth-winbind-helper-path" - -#. type: deftypevr -#: doc/guix.texi:13826 -msgid "Path for Samba's @samp{ntlm-auth} helper binary. Defaults to @samp{\"/usr/bin/ntlm_auth\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13828 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string auth-failure-delay" -msgstr "{paramètre de @code{dovecot-configuration}} string auth-failure-delay" - -#. type: deftypevr -#: doc/guix.texi:13831 -msgid "Time to delay before replying to failed authentications. Defaults to @samp{\"2 secs\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13833 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-require-client-cert?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean auth-ssl-require-client-cert?" - -#. type: deftypevr -#: doc/guix.texi:13837 -msgid "Require a valid SSL client certificate or the authentication fails. Defaults to @samp{#f}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13839 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-username-from-cert?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean auth-ssl-username-from-cert?" - -#. type: deftypevr -#: doc/guix.texi:13844 -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:13846 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-mechanisms" -msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list auth-mechanisms" - -#. type: deftypevr -#: doc/guix.texi:13852 -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:13854 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-servers" -msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list director-servers" - -#. type: deftypevr -#: doc/guix.texi:13859 -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:13861 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-mail-servers" -msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list director-mail-servers" - -#. type: deftypevr -#: doc/guix.texi:13865 -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:13867 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string director-user-expire" -msgstr "{paramètre de @code{dovecot-configuration}} string director-user-expire" - -#. type: deftypevr -#: doc/guix.texi:13871 -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:13873 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string director-username-hash" -msgstr "{paramètre de @code{dovecot-configuration}} string director-username-hash" - -#. type: deftypevr -#: doc/guix.texi:13878 -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:13880 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string log-path" -msgstr "{paramètre de @code{dovecot-configuration}} string log-path" - -#. type: deftypevr -#: doc/guix.texi:13884 -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:13886 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string info-log-path" -msgstr "{paramètre de @code{dovecot-configuration}} string info-log-path" - -#. type: deftypevr -#: doc/guix.texi:13890 -msgid "Log file to use for informational messages. Defaults to @samp{log-path}. Defaults to @samp{\"\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13892 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string debug-log-path" -msgstr "{paramètre de @code{dovecot-configuration}} string debug-log-path" - -#. type: deftypevr -#: doc/guix.texi:13896 -msgid "Log file to use for debug messages. Defaults to @samp{info-log-path}. Defaults to @samp{\"\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13898 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string syslog-facility" -msgstr "{paramètre de @code{dovecot-configuration}} string syslog-facility" - -#. type: deftypevr -#: doc/guix.texi:13903 -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:13905 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean auth-verbose?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean auth-verbose?" - -#. type: deftypevr -#: doc/guix.texi:13909 -msgid "Log unsuccessful authentication attempts and the reasons why they failed. Defaults to @samp{#f}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13911 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean auth-verbose-passwords?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean auth-verbose-passwords?" - -#. type: deftypevr -#: doc/guix.texi:13918 -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{#f}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13920 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean auth-debug?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean auth-debug?" - -#. type: deftypevr -#: doc/guix.texi:13924 -msgid "Even more verbose logging for debugging purposes. Shows for example SQL queries. Defaults to @samp{#f}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13926 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean auth-debug-passwords?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean auth-debug-passwords?" - -#. type: deftypevr -#: doc/guix.texi:13931 -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:13933 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean mail-debug?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean mail-debug?" - -#. type: deftypevr -#: doc/guix.texi:13937 -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:13939 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean verbose-ssl?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean verbose-ssl?" - -#. type: deftypevr -#: doc/guix.texi:13942 -msgid "Show protocol level SSL errors. Defaults to @samp{#f}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13944 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string log-timestamp" -msgstr "{paramètre de @code{dovecot-configuration}} string log-timestamp" - -#. type: deftypevr -#: doc/guix.texi:13948 -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:13950 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-log-format-elements" -msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list login-log-format-elements" - -#. type: deftypevr -#: doc/guix.texi:13954 -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:13956 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string login-log-format" -msgstr "{paramètre de @code{dovecot-configuration}} string login-log-format" - -#. type: deftypevr -#: doc/guix.texi:13960 -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:13962 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mail-log-prefix" -msgstr "{paramètre de @code{dovecot-configuration}} string mail-log-prefix" - -#. type: deftypevr -#: doc/guix.texi:13966 -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:13968 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string deliver-log-format" -msgstr "{paramètre de @code{dovecot-configuration}} string deliver-log-format" - -#. type: deftypevr -#: doc/guix.texi:13970 -msgid "Format to use for logging mail deliveries. You can use variables:" -msgstr "" - -#. type: item -#: doc/guix.texi:13971 -#, no-wrap -msgid "%$" -msgstr "" - -#. type: table -#: doc/guix.texi:13973 -msgid "Delivery status message (e.g. @samp{saved to INBOX})" -msgstr "" - -#. type: item -#: doc/guix.texi:13973 -#, no-wrap -msgid "%m" -msgstr "" - -#. type: table -#: doc/guix.texi:13975 -msgid "Message-ID" -msgstr "" - -#. type: item -#: doc/guix.texi:13975 doc/guix.texi:14507 -#, no-wrap -msgid "%s" -msgstr "" - -#. type: table -#: doc/guix.texi:13977 -msgid "Subject" -msgstr "" - -#. type: item -#: doc/guix.texi:13977 -#, no-wrap -msgid "%f" -msgstr "" - -#. type: table -#: doc/guix.texi:13979 -msgid "From address" -msgstr "" - -#. type: table -#: doc/guix.texi:13981 -msgid "Physical size" -msgstr "" - -#. type: item -#: doc/guix.texi:13981 -#, no-wrap -msgid "%w" -msgstr "" - -#. type: table -#: doc/guix.texi:13983 -msgid "Virtual size." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:13985 -msgid "Defaults to @samp{\"msgid=%m: %$\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:13987 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mail-location" -msgstr "{paramètre de @code{dovecot-configuration}} string mail-location" - -#. type: deftypevr -#: doc/guix.texi:13992 -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:13998 -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:14000 -msgid "There are a few special variables you can use, eg.:" -msgstr "" - -#. type: table -#: doc/guix.texi:14004 -msgid "username" -msgstr "" - -#. type: item -#: doc/guix.texi:14004 doc/guix.texi:14503 -#, no-wrap -msgid "%n" -msgstr "" - -#. type: table -#: doc/guix.texi:14006 -msgid "user part in user@@domain, same as %u if there's no domain" -msgstr "" - -#. type: item -#: doc/guix.texi:14006 -#, no-wrap -msgid "%d" -msgstr "" - -#. type: table -#: doc/guix.texi:14008 -msgid "domain part in user@@domain, empty if there's no domain" -msgstr "" - -#. type: item -#: doc/guix.texi:14008 -#, no-wrap -msgid "%h" -msgstr "" - -#. type: table -#: doc/guix.texi:14010 -msgid "home director" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14013 -msgid "See doc/wiki/Variables.txt for full list. Some examples:" -msgstr "" - -#. type: item -#: doc/guix.texi:14014 -#, no-wrap -msgid "maildir:~/Maildir" -msgstr "" - -#. type: item -#: doc/guix.texi:14015 -#, no-wrap -msgid "mbox:~/mail:INBOX=/var/mail/%u" -msgstr "" - -#. type: item -#: doc/guix.texi:14016 -#, no-wrap -msgid "mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14021 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mail-uid" -msgstr "{paramètre de @code{dovecot-configuration}} string mail-uid" - -#. type: deftypevr -#: doc/guix.texi:14026 -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:14028 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mail-gid" -msgstr "{paramètre de @code{dovecot-configuration}} string mail-gid" - -#. type: deftypevr -#: doc/guix.texi:14033 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mail-privileged-group" -msgstr "{paramètre de @code{dovecot-configuration}} string mail-privileged-group" - -#. type: deftypevr -#: doc/guix.texi:14039 -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:14041 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mail-access-groups" -msgstr "{paramètre de @code{dovecot-configuration}} string mail-access-groups" - -#. type: deftypevr -#: doc/guix.texi:14049 -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:14051 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean mail-full-filesystem-access?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean mail-full-filesystem-access?" - -#. type: deftypevr -#: doc/guix.texi:14057 -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:14059 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean mmap-disable?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean mmap-disable?" - -#. type: deftypevr -#: doc/guix.texi:14063 -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:14065 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean dotlock-use-excl?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean dotlock-use-excl?" - -#. type: deftypevr -#: doc/guix.texi:14070 -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:14072 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mail-fsync" -msgstr "{paramètre de @code{dovecot-configuration}} string mail-fsync" - -#. type: deftypevr -#: doc/guix.texi:14074 -msgid "When to use fsync() or fdatasync() calls:" -msgstr "" - -#. type: item -#: doc/guix.texi:14075 -#, no-wrap -msgid "optimized" -msgstr "" - -#. type: table -#: doc/guix.texi:14077 -msgid "Whenever necessary to avoid losing important data" -msgstr "" - -#. type: table -#: doc/guix.texi:14079 -msgid "Useful with e.g. NFS when write()s are delayed" -msgstr "" - -#. type: table -#: doc/guix.texi:14081 -msgid "Never use it (best performance, but crashes can lose data)." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14083 -msgid "Defaults to @samp{\"optimized\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:14085 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-storage?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean mail-nfs-storage?" - -#. type: deftypevr -#: doc/guix.texi:14090 -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:14092 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-index?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean mail-nfs-index?" - -#. type: deftypevr -#: doc/guix.texi:14096 -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:14098 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string lock-method" -msgstr "{paramètre de @code{dovecot-configuration}} string lock-method" - -#. type: deftypevr -#: doc/guix.texi:14104 -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:14106 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} file-name mail-temp-dir" -msgstr "{paramètre de @code{dovecot-configuration}} file-name mail-temp-dir" - -#. type: deftypevr -#: doc/guix.texi:14110 -msgid "Directory in which LDA/LMTP temporarily stores incoming mails >128 kB. Defaults to @samp{\"/tmp\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14112 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-uid" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer first-valid-uid" - -#. type: deftypevr -#: doc/guix.texi:14118 -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:14120 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-uid" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer last-valid-uid" - -#. type: deftypevr -#: doc/guix.texi:14125 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-gid" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer first-valid-gid" - -#. type: deftypevr -#: doc/guix.texi:14130 -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:14132 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-gid" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer last-valid-gid" - -#. type: deftypevr -#: doc/guix.texi:14137 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-max-keyword-length" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer mail-max-keyword-length" - -#. type: deftypevr -#: doc/guix.texi:14141 -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:14143 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} colon-separated-file-name-list valid-chroot-dirs" -msgstr "{paramètre de @code{dovecot-configuration}} colon-separated-file-name-list valid-chroot-dirs" - -#. type: deftypevr -#: doc/guix.texi:14153 -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:14155 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mail-chroot" -msgstr "{paramètre de @code{dovecot-configuration}} string mail-chroot" - -#. type: deftypevr -#: doc/guix.texi:14164 -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:14166 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} file-name auth-socket-path" -msgstr "{paramètre de @code{dovecot-configuration}} file-name auth-socket-path" - -#. type: deftypevr -#: doc/guix.texi:14170 -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:14172 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} file-name mail-plugin-dir" -msgstr "{paramètre de @code{dovecot-configuration}} file-name mail-plugin-dir" - -#. type: deftypevr -#: doc/guix.texi:14175 -msgid "Directory where to look up mail plugins. Defaults to @samp{\"/usr/lib/dovecot\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14177 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mail-plugins" -msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list mail-plugins" - -#. type: deftypevr -#: doc/guix.texi:14181 -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:14183 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-cache-min-mail-count" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer mail-cache-min-mail-count" - -#. type: deftypevr -#: doc/guix.texi:14188 -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:14190 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mailbox-idle-check-interval" -msgstr "{paramètre de @code{dovecot-configuration}} string mailbox-idle-check-interval" - -#. type: deftypevr -#: doc/guix.texi:14197 -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:14199 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean mail-save-crlf?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean mail-save-crlf?" - -#. type: deftypevr -#: doc/guix.texi:14206 -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:14208 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean maildir-stat-dirs?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean maildir-stat-dirs?" - -#. type: deftypevr -#: doc/guix.texi:14216 -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:14218 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean maildir-copy-with-hardlinks?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean maildir-copy-with-hardlinks?" - -#. type: deftypevr -#: doc/guix.texi:14223 -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:14225 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean maildir-very-dirty-syncs?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean maildir-very-dirty-syncs?" - -#. type: deftypevr -#: doc/guix.texi:14230 -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:14232 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-read-locks" -msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list mbox-read-locks" - -#. type: deftypevr -#: doc/guix.texi:14235 -msgid "Which locking methods to use for locking mbox. There are four available:" -msgstr "" - -#. type: item -#: doc/guix.texi:14237 -#, no-wrap -msgid "dotlock" -msgstr "" - -#. type: table -#: doc/guix.texi:14241 -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:14241 -#, no-wrap -msgid "dotlock-try" -msgstr "" - -#. type: table -#: doc/guix.texi:14244 -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:14244 -#, no-wrap -msgid "fcntl" -msgstr "" - -#. type: table -#: doc/guix.texi:14246 -msgid "Use this if possible. Works with NFS too if lockd is used." -msgstr "" - -#. type: item -#: doc/guix.texi:14246 -#, no-wrap -msgid "flock" -msgstr "" - -#. type: table -#: doc/guix.texi:14248 doc/guix.texi:14250 -msgid "May not exist in all systems. Doesn't work with NFS." -msgstr "" - -#. type: item -#: doc/guix.texi:14248 -#, no-wrap -msgid "lockf" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14256 -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:14258 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-write-locks" -msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list mbox-write-locks" - -#. type: deftypevr -#: doc/guix.texi:14262 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mbox-lock-timeout" -msgstr "{paramètre de @code{dovecot-configuration}} string mbox-lock-timeout" - -#. type: deftypevr -#: doc/guix.texi:14265 -msgid "Maximum time to wait for lock (all of them) before aborting. Defaults to @samp{\"5 mins\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14267 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mbox-dotlock-change-timeout" -msgstr "{paramètre de @code{dovecot-configuration}} string mbox-dotlock-change-timeout" - -#. type: deftypevr -#: doc/guix.texi:14271 -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:14273 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean mbox-dirty-syncs?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean mbox-dirty-syncs?" - -#. type: deftypevr -#: doc/guix.texi:14284 -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:14286 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean mbox-very-dirty-syncs?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean mbox-very-dirty-syncs?" - -#. type: deftypevr -#: doc/guix.texi:14291 -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:14293 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean mbox-lazy-writes?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean mbox-lazy-writes?" - -#. type: deftypevr -#: doc/guix.texi:14299 -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:14301 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer mbox-min-index-size" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer mbox-min-index-size" - -#. type: deftypevr -#: doc/guix.texi:14306 -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:14308 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer mdbox-rotate-size" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer mdbox-rotate-size" - -#. type: deftypevr -#: doc/guix.texi:14311 -msgid "Maximum dbox file size until it's rotated. Defaults to @samp{10000000}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14313 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mdbox-rotate-interval" -msgstr "{paramètre de @code{dovecot-configuration}} string mdbox-rotate-interval" - -#. type: deftypevr -#: doc/guix.texi:14318 -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:14320 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean mdbox-preallocate-space?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean mdbox-preallocate-space?" - -#. type: deftypevr -#: doc/guix.texi:14325 -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:14327 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mail-attachment-dir" -msgstr "{paramètre de @code{dovecot-configuration}} string mail-attachment-dir" - -#. type: deftypevr -#: doc/guix.texi:14331 -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:14333 -msgid "WARNING: This feature hasn't been tested much yet. Use at your own risk." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14336 -msgid "Directory root where to store mail attachments. Disabled, if empty. Defaults to @samp{\"\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14338 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-attachment-min-size" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer mail-attachment-min-size" - -#. type: deftypevr -#: doc/guix.texi:14343 -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:14345 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mail-attachment-fs" -msgstr "{paramètre de @code{dovecot-configuration}} string mail-attachment-fs" - -#. type: deftypevr -#: doc/guix.texi:14347 -msgid "File system backend to use for saving attachments:" -msgstr "" - -#. type: item -#: doc/guix.texi:14348 -#, no-wrap -msgid "posix" -msgstr "" - -#. type: table -#: doc/guix.texi:14350 -msgid "No SiS done by Dovecot (but this might help FS's own deduplication)" -msgstr "" - -#. type: item -#: doc/guix.texi:14350 -#, no-wrap -msgid "sis posix" -msgstr "" - -#. type: table -#: doc/guix.texi:14352 -msgid "SiS with immediate byte-by-byte comparison during saving" -msgstr "" - -#. type: item -#: doc/guix.texi:14352 -#, no-wrap -msgid "sis-queue posix" -msgstr "" - -#. type: table -#: doc/guix.texi:14354 -msgid "SiS with delayed comparison and deduplication." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14356 -msgid "Defaults to @samp{\"sis posix\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:14358 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string mail-attachment-hash" -msgstr "{paramètre de @code{dovecot-configuration}} string mail-attachment-hash" - -#. type: deftypevr -#: doc/guix.texi:14364 -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:14366 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-process-limit" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer default-process-limit" - -#. type: deftypevr -#: doc/guix.texi:14371 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-client-limit" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer default-client-limit" - -#. type: deftypevr -#: doc/guix.texi:14374 doc/guix.texi:18402 -msgid "Defaults to @samp{1000}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:14376 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-vsz-limit" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer default-vsz-limit" - -#. type: deftypevr -#: doc/guix.texi:14381 -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:14383 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string default-login-user" -msgstr "{paramètre de @code{dovecot-configuration}} string default-login-user" - -#. type: deftypevr -#: doc/guix.texi:14388 -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:14390 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string default-internal-user" -msgstr "{paramètre de @code{dovecot-configuration}} string default-internal-user" - -#. type: deftypevr -#: doc/guix.texi:14395 -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:14397 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string ssl?" -msgstr "{paramètre de @code{dovecot-configuration}} string ssl?" - -#. type: deftypevr -#: doc/guix.texi:14400 -msgid "SSL/TLS support: yes, no, required. . Defaults to @samp{\"required\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14402 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string ssl-cert" -msgstr "{paramètre de @code{dovecot-configuration}} string ssl-cert" - -#. type: deftypevr -#: doc/guix.texi:14405 -msgid "PEM encoded X.509 SSL/TLS certificate (public key). Defaults to @samp{\" was automatically rejected:%n%r\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:14515 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string recipient-delimiter" -msgstr "{paramètre de @code{dovecot-configuration}} string recipient-delimiter" - -#. type: deftypevr -#: doc/guix.texi:14519 -msgid "Delimiter character between local-part and detail in email address. Defaults to @samp{\"+\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14521 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string lda-original-recipient-header" -msgstr "{paramètre de @code{dovecot-configuration}} string lda-original-recipient-header" - -#. type: deftypevr -#: doc/guix.texi:14527 -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:14529 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autocreate?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean lda-mailbox-autocreate?" - -#. type: deftypevr -#: doc/guix.texi:14533 -msgid "Should saving a mail to a nonexistent mailbox automatically create it?. Defaults to @samp{#f}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14535 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autosubscribe?" -msgstr "{paramètre de @code{dovecot-configuration}} boolean lda-mailbox-autosubscribe?" - -#. type: deftypevr -#: doc/guix.texi:14539 -msgid "Should automatically created mailboxes be also automatically subscribed?. Defaults to @samp{#f}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14541 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} non-negative-integer imap-max-line-length" -msgstr "{paramètre de @code{dovecot-configuration}} non-negative-integer imap-max-line-length" - -#. type: deftypevr -#: doc/guix.texi:14547 -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:14549 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string imap-logout-format" -msgstr "{paramètre de @code{dovecot-configuration}} string imap-logout-format" - -#. type: deftypevr -#: doc/guix.texi:14551 -msgid "IMAP logout format string:" -msgstr "" - -#. type: item -#: doc/guix.texi:14552 -#, no-wrap -msgid "%i" -msgstr "" - -#. type: table -#: doc/guix.texi:14554 -msgid "total number of bytes read from client" -msgstr "" - -#. type: item -#: doc/guix.texi:14554 -#, no-wrap -msgid "%o" -msgstr "" - -#. type: table -#: doc/guix.texi:14556 -msgid "total number of bytes sent to client." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14559 -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:14561 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string imap-capability" -msgstr "{paramètre de @code{dovecot-configuration}} string imap-capability" - -#. type: deftypevr -#: doc/guix.texi:14565 -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:14567 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string imap-idle-notify-interval" -msgstr "{paramètre de @code{dovecot-configuration}} string imap-idle-notify-interval" - -#. type: deftypevr -#: doc/guix.texi:14571 -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:14573 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string imap-id-send" -msgstr "{paramètre de @code{dovecot-configuration}} string imap-id-send" - -#. type: deftypevr -#: doc/guix.texi:14579 -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:14581 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} string imap-id-log" -msgstr "{paramètre de @code{dovecot-configuration}} string imap-id-log" - -#. type: deftypevr -#: doc/guix.texi:14584 -msgid "ID fields sent by client to log. * means everything. Defaults to @samp{\"\"}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:14586 -#, no-wrap -msgid "{@code{dovecot-configuration} parameter} space-separated-string-list imap-client-workarounds" -msgstr "{paramètre de @code{dovecot-configuration}} space-separated-string-list imap-client-workarounds" - -#. type: deftypevr -#: doc/guix.texi:14588 -msgid "Workarounds for various client bugs:" -msgstr "" - -#. type: item -#: doc/guix.texi:14590 -#, no-wrap -msgid "delay-newmail" -msgstr "" - -#. type: table -#: doc/guix.texi:14597 -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:15382 -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:15383 -#, no-wrap -msgid "@code{public-registration} (default: @code{#f})" -msgstr "@code{public-registration} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:15385 -msgid "Must be a @code{} record or @code{#f}." -msgstr "" - -#. type: table -#: doc/guix.texi:15390 -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:15392 -msgid "It might take a few hours until it shows up in the public list." -msgstr "" - -#. type: item -#: doc/guix.texi:15393 doc/guix.texi:15964 -#, no-wrap -msgid "@code{file} (default: @code{#f})" -msgstr "@code{file} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:15395 -msgid "Optional alternative override for this configuration." -msgstr "" - -#. type: deftp -#: doc/guix.texi:15398 -#, no-wrap -msgid "{Data Type} murmur-public-registration-configuration" -msgstr "{Type de données} murmur-public-registration-configuration" - -#. type: deftp -#: doc/guix.texi:15400 -msgid "Configuration for public registration of a murmur service." -msgstr "" - -#. type: table -#: doc/guix.texi:15404 -msgid "This is a display name for your server. Not to be confused with the hostname." -msgstr "" - -#. type: itemx -#: doc/guix.texi:15405 doc/guix.texi:20414 -#, no-wrap -msgid "password" -msgstr "" - -#. type: table -#: doc/guix.texi:15408 -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:15409 -#, no-wrap -msgid "url" -msgstr "" - -#. type: table -#: doc/guix.texi:15412 -msgid "This should be a @code{http://} or @code{https://} link to your web site." -msgstr "" - -#. type: item -#: doc/guix.texi:15413 -#, no-wrap -msgid "@code{hostname} (default: @code{#f})" -msgstr "@code{hostname} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:15416 -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:15424 -#, no-wrap -msgid "Tailon Service" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:15428 -msgid "@uref{https://tailon.readthedocs.io/, Tailon} is a web application for viewing and searching log files." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:15431 -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: example -#: doc/guix.texi:15434 -#, no-wrap -msgid "(service tailon-service-type)\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:15438 -msgid "The following example customises more of the Tailon configuration, adding @command{sed} to the list of allowed commands." -msgstr "" - -#. type: example -#: doc/guix.texi:15445 -#, no-wrap -msgid "" -"(service tailon-service-type\n" -" (tailon-configuration\n" -" (config-file\n" -" (tailon-configuration-file\n" -" (allowed-commands '(\"tail\" \"grep\" \"awk\" \"sed\"))))))\n" -msgstr "" - -#. type: deftp -#: doc/guix.texi:15448 -#, no-wrap -msgid "{Data Type} tailon-configuration" -msgstr "{Type de données} tailon-configuration" - -#. type: deftp -#: doc/guix.texi:15451 -msgid "Data type representing the configuration of Tailon. This type has the following parameters:" -msgstr "" - -#. type: item -#: doc/guix.texi:15453 -#, no-wrap -msgid "@code{config-file} (default: @code{(tailon-configuration-file)})" -msgstr "@code{config-file} (par défaut : @code{(tailon-configuration-file)})" - -#. type: table -#: doc/guix.texi:15457 -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:15460 -msgid "For example, to instead use a local file, the @code{local-file} function can be used:" -msgstr "" - -#. type: example -#: doc/guix.texi:15465 -#, no-wrap -msgid "" -"(service tailon-service-type\n" -" (tailon-configuration\n" -" (config-file (local-file \"./my-tailon.conf\"))))\n" -msgstr "" - -#. type: item -#: doc/guix.texi:15467 -#, no-wrap -msgid "@code{package} (default: @code{tailon})" -msgstr "@code{package} (par défaut : @code{tailon})" - -#. type: table -#: doc/guix.texi:15469 -msgid "The tailon package to use." -msgstr "Le paquet tailon à utiliser." - -#. type: deftp -#: doc/guix.texi:15473 -#, no-wrap -msgid "{Data Type} tailon-configuration-file" -msgstr "{Type de données} tailon-configuration-file" - -#. type: deftp -#: doc/guix.texi:15476 -msgid "Data type representing the configuration options for Tailon. This type has the following parameters:" -msgstr "" - -#. type: item -#: doc/guix.texi:15478 -#, no-wrap -msgid "@code{files} (default: @code{(list \"/var/log\")})" -msgstr "@code{files} (par défaut : @code{(list \"/var/log\")})" - -#. type: table -#: doc/guix.texi:15483 -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:15484 -#, no-wrap -msgid "@code{bind} (default: @code{\"localhost:8080\"})" -msgstr "@code{bind} (par défaut : @code{\"localhost:8080\"})" - -#. type: table -#: doc/guix.texi:15486 -msgid "Address and port to which Tailon should bind on." -msgstr "" - -#. type: item -#: doc/guix.texi:15487 -#, no-wrap -msgid "@code{relative-root} (default: @code{#f})" -msgstr "@code{relative-root} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:15489 -msgid "URL path to use for Tailon, set to @code{#f} to not use a path." -msgstr "" - -#. type: item -#: doc/guix.texi:15490 -#, no-wrap -msgid "@code{allow-transfers?} (default: @code{#t})" -msgstr "@code{allow-transfers?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:15492 -msgid "Allow downloading the log files in the web interface." -msgstr "" - -#. type: item -#: doc/guix.texi:15493 -#, no-wrap -msgid "@code{follow-names?} (default: @code{#t})" -msgstr "@code{follow-names?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:15495 -msgid "Allow tailing of not-yet existent files." -msgstr "" - -#. type: item -#: doc/guix.texi:15496 -#, no-wrap -msgid "@code{tail-lines} (default: @code{200})" -msgstr "@code{tail-lines} (par défaut : @code{200})" - -#. type: table -#: doc/guix.texi:15498 -msgid "Number of lines to read initially from each file." -msgstr "" - -#. type: item -#: doc/guix.texi:15499 -#, no-wrap -msgid "@code{allowed-commands} (default: @code{(list \"tail\" \"grep\" \"awk\")})" -msgstr "@code{allowed-commands} (par défaut : @code{(list \"tail\" \"grep\" \"awk\")})" - -#. type: table -#: doc/guix.texi:15501 -msgid "Commands to allow running. By default, @code{sed} is disabled." -msgstr "" - -#. type: item -#: doc/guix.texi:15502 -#, no-wrap -msgid "@code{debug?} (default: @code{#f})" -msgstr "@code{debug?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:15504 -msgid "Set @code{debug?} to @code{#t} to show debug messages." -msgstr "" - -#. type: item -#: doc/guix.texi:15505 -#, no-wrap -msgid "@code{wrap-lines} (default: @code{#t})" -msgstr "@code{wrap-lines} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:15509 -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:15510 -#, no-wrap -msgid "@code{http-auth} (default: @code{#f})" -msgstr "@code{http-auth} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:15514 -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:15515 -#, no-wrap -msgid "@code{users} (default: @code{#f})" -msgstr "@code{users} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:15520 -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: example -#: doc/guix.texi:15526 -#, no-wrap -msgid "" -"(tailon-configuration-file\n" -" (http-auth \"basic\")\n" -" (users '((\"user1\" . \"password1\")\n" -" (\"user2\" . \"password2\"))))\n" -msgstr "" - -#. type: subsubheading -#: doc/guix.texi:15532 -#, no-wrap -msgid "Darkstat Service" -msgstr "" - -#. type: cindex -#: doc/guix.texi:15533 -#, no-wrap -msgid "darkstat" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:15536 -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:15537 -#, no-wrap -msgid "{Scheme Variable} darkstat-service-type" -msgstr "{Variable Scheme} darkstat-service-type" - -#. type: defvar -#: doc/guix.texi:15542 -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: example -#: doc/guix.texi:15547 -#, no-wrap -msgid "" -"(service darkstat-service-type\n" -" (darkstat-configuration\n" -" (interface \"eno1\")))\n" -msgstr "" - -#. type: deftp -#: doc/guix.texi:15550 -#, no-wrap -msgid "{Data Type} darkstat-configuration" -msgstr "{Type de données} darkstat-configuration" - -#. type: deftp -#: doc/guix.texi:15552 -msgid "Data type representing the configuration of @command{darkstat}." -msgstr "" - -#. type: item -#: doc/guix.texi:15554 -#, no-wrap -msgid "@code{package} (default: @code{darkstat})" -msgstr "@code{package} (par défaut : @code{darkstat})" - -#. type: table -#: doc/guix.texi:15556 -msgid "The darkstat package to use." -msgstr "Le paquet darkstat à utiliser." - -#. type: code{#1} -#: doc/guix.texi:15557 -#, no-wrap -msgid "interface" -msgstr "" - -#. type: table -#: doc/guix.texi:15559 -msgid "Capture traffic on the specified network interface." -msgstr "" - -#. type: item -#: doc/guix.texi:15560 -#, no-wrap -msgid "@code{port} (default: @code{\"667\"})" -msgstr "@code{port} (par défaut : @code{\"667\"})" - -#. type: table -#: doc/guix.texi:15562 -msgid "Bind the web interface to the specified port." -msgstr "" - -#. type: item -#: doc/guix.texi:15563 -#, no-wrap -msgid "@code{bind-address} (default: @code{\"127.0.0.1\"})" -msgstr "@code{bind-address} (par défaut : @code{\"127.0.0.1\"})" - -#. type: table -#: doc/guix.texi:15565 -msgid "Bind the web interface to the specified address." -msgstr "" - -#. type: item -#: doc/guix.texi:15566 -#, no-wrap -msgid "@code{base} (default: @code{\"/\"})" -msgstr "@code{base} (par défaut : @code{\"/\"})" - -#. type: table -#: doc/guix.texi:15569 -msgid "Specify the path of the base URL. This can be useful if @command{darkstat} is accessed via a reverse proxy." -msgstr "" - -#. type: cindex -#: doc/guix.texi:15576 -#, no-wrap -msgid "Kerberos" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:15580 -msgid "The @code{(gnu services kerberos)} module provides services relating to the authentication protocol @dfn{Kerberos}." -msgstr "" - -#. type: subsubheading -#: doc/guix.texi:15581 -#, no-wrap -msgid "Krb5 Service" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:15588 -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:15592 -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:15593 -#, no-wrap -msgid "{Scheme Variable} krb5-service-type" -msgstr "{Variable Scheme} krb5-service-type" - -#. type: defvr -#: doc/guix.texi:15595 -msgid "A service type for Kerberos 5 clients." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:15599 -msgid "Here is an example of its use:" -msgstr "" - -#. type: lisp -#: doc/guix.texi:15613 -#, no-wrap -msgid "" -"(service krb5-service-type\n" -" (krb5-configuration\n" -" (default-realm \"EXAMPLE.COM\")\n" -" (allow-weak-crypto? #t)\n" -" (realms (list\n" -" (krb5-realm\n" -" (name \"EXAMPLE.COM\")\n" -" (admin-server \"groucho.example.com\")\n" -" (kdc \"karl.example.com\"))\n" -" (krb5-realm\n" -" (name \"ARGRX.EDU\")\n" -" (admin-server \"kerb-admin.argrx.edu\")\n" -" (kdc \"keys.argrx.edu\"))))))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:15617 -msgid "This example provides a Kerberos@tie{}5 client configuration which:" -msgstr "" - -#. type: item -#: doc/guix.texi:15618 -#, no-wrap -msgid "Recognizes two realms, @i{viz:} ``EXAMPLE.COM'' and ``ARGRX.EDU'', both" -msgstr "" - -#. type: itemize -#: doc/guix.texi:15620 -msgid "of which have distinct administration servers and key distribution centers;" -msgstr "" - -#. type: item -#: doc/guix.texi:15620 -#, no-wrap -msgid "Will default to the realm ``EXAMPLE.COM'' if the realm is not explicitly" -msgstr "" - -#. type: itemize -#: doc/guix.texi:15622 -msgid "specified by clients;" -msgstr "" - -#. type: item -#: doc/guix.texi:15622 -#, no-wrap -msgid "Accepts services which only support encryption types known to be weak." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:15630 -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{http://web.mit.edu/kerberos/krb5-devel/doc/admin/conf_files/krb5_conf.html,,krb5.conf} documentation." -msgstr "" - -#. type: deftp -#: doc/guix.texi:15632 -#, no-wrap -msgid "{Data Type} krb5-realm" -msgstr "{Type de données} krb5-realm" - -#. type: cindex -#: doc/guix.texi:15633 -#, no-wrap -msgid "realm, kerberos" -msgstr "" - -#. type: table -#: doc/guix.texi:15639 -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:15640 -#, no-wrap -msgid "admin-server" -msgstr "" - -#. type: table -#: doc/guix.texi:15643 -msgid "This field is a string identifying the host where the administration server is running." -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:15644 -#, no-wrap -msgid "kdc" -msgstr "" - -#. type: table -#: doc/guix.texi:15647 -msgid "This field is a string identifying the key distribution center for the realm." -msgstr "" - -#. type: deftp -#: doc/guix.texi:15650 -#, no-wrap -msgid "{Data Type} krb5-configuration" -msgstr "{Type de données} krb5-configuration" - -#. type: item -#: doc/guix.texi:15653 -#, no-wrap -msgid "@code{allow-weak-crypto?} (default: @code{#f})" -msgstr "@code{allow-weak-crypto?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:15656 -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:15657 -#, no-wrap -msgid "@code{default-realm} (default: @code{#f})" -msgstr "@code{default-realm} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:15664 -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:15665 -#, no-wrap -msgid "realms" -msgstr "" - -#. type: table -#: doc/guix.texi:15670 -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:15674 -#, no-wrap -msgid "PAM krb5 Service" -msgstr "" - -#. type: cindex -#: doc/guix.texi:15675 -#, no-wrap -msgid "pam-krb5" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:15681 -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:15682 -#, no-wrap -msgid "{Scheme Variable} pam-krb5-service-type" -msgstr "{Variable Scheme} pam-krb5-service-type" - -#. type: defvr -#: doc/guix.texi:15684 -msgid "A service type for the Kerberos 5 PAM module." -msgstr "" - -#. type: deftp -#: doc/guix.texi:15686 -#, no-wrap -msgid "{Data Type} pam-krb5-configuration" -msgstr "{Type de données} pam-krb5-configuration" - -#. type: deftp -#: doc/guix.texi:15689 -msgid "Data type representing the configuration of the Kerberos 5 PAM module This type has the following parameters:" -msgstr "" - -#. type: item -#: doc/guix.texi:15690 -#, no-wrap -msgid "@code{pam-krb5} (default: @code{pam-krb5})" -msgstr "@code{pam-krb5} (par défaut : @code{pam-krb5})" - -#. type: table -#: doc/guix.texi:15692 -msgid "The pam-krb5 package to use." -msgstr "Le paquet pam-krb5 à utiliser." - -#. type: item -#: doc/guix.texi:15693 -#, no-wrap -msgid "@code{minimum-uid} (default: @code{1000})" -msgstr "@code{minimum-uid} (par défaut : @code{1000})" - -#. type: table -#: doc/guix.texi:15696 -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:15703 -#, no-wrap -msgid "web" -msgstr "" - -#. type: cindex -#: doc/guix.texi:15704 -#, no-wrap -msgid "www" -msgstr "" - -#. type: cindex -#: doc/guix.texi:15705 -#, no-wrap -msgid "HTTP" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:15708 -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:15709 -#, no-wrap -msgid "Apache HTTP Server" -msgstr "" - -#. type: deffn -#: doc/guix.texi:15711 -#, no-wrap -msgid "{Scheme Variable} httpd-service-type" -msgstr "{Variable Scheme} httpd-service-type" - -#. type: deffn -#: doc/guix.texi:15715 -msgid "Service type for the @uref{https://httpd.apache.org/,Apache HTTP} server (@dfn{httpd}). The value for this service type is a @code{https-configuration} record." -msgstr "" - -#. type: deffn -#: doc/guix.texi:15717 doc/guix.texi:15868 -msgid "A simple example configuration is given below." -msgstr "" - -#. type: example -#: doc/guix.texi:15725 -#, no-wrap -msgid "" -"(service httpd-service-type\n" -" (httpd-configuration\n" -" (config\n" -" (httpd-config-file\n" -" (server-name \"www.example.com\")\n" -" (document-root \"/srv/http/www.example.com\")))))\n" -msgstr "" - -#. type: deffn -#: doc/guix.texi:15729 -msgid "Other services can also extend the @code{httpd-service-type} to add to the configuration." -msgstr "" - -#. type: example -#: doc/guix.texi:15738 doc/guix.texi:15848 -#, no-wrap -msgid "" -"(simple-service 'my-extra-server httpd-service-type\n" -" (list\n" -" (httpd-virtualhost\n" -" \"*:80\"\n" -" (list (string-append\n" -" \"ServerName \"www.example.com\n" -" DocumentRoot \\\"/srv/http/www.example.com\\\"\")))))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:15744 -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:15745 -#, no-wrap -msgid "{Data Type} httpd-configuration" -msgstr "{Type de données} httpd-configuration" - -#. type: deffn -#: doc/guix.texi:15747 -msgid "This data type represents the configuration for the httpd service." -msgstr "" - -#. type: item -#: doc/guix.texi:15749 -#, no-wrap -msgid "@code{package} (default: @code{httpd})" -msgstr "@code{package} (par défaut : @code{httpd})" - -#. type: table -#: doc/guix.texi:15751 -msgid "The httpd package to use." -msgstr "Le paquet httpd à utiliser." - -#. type: item -#: doc/guix.texi:15752 doc/guix.texi:15811 -#, no-wrap -msgid "@code{pid-file} (default: @code{\"/var/run/httpd\"})" -msgstr "@code{pid-file} (par défaut : @code{\"/var/run/httpd\"})" - -#. type: table -#: doc/guix.texi:15754 -msgid "The pid file used by the shepherd-service." -msgstr "" - -#. type: item -#: doc/guix.texi:15755 -#, no-wrap -msgid "@code{config} (default: @code{(httpd-config-file)})" -msgstr "@code{config} (par défaut : @code{(httpd-config-file)})" - -#. type: table -#: doc/guix.texi:15760 -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:15764 -#, no-wrap -msgid "{Data Type} httpd-module" -msgstr "{Type de données} httpd-module" - -#. type: deffn -#: doc/guix.texi:15766 -msgid "This data type represents a module for the httpd service." -msgstr "" - -#. type: table -#: doc/guix.texi:15770 -msgid "The name of the module." -msgstr "" - -#. type: table -#: doc/guix.texi:15776 -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: deffn -#: doc/guix.texi:15780 -#, no-wrap -msgid "{Data Type} httpd-config-file" -msgstr "{Type de données} httpd-config-file" - -#. type: deffn -#: doc/guix.texi:15782 -msgid "This data type represents a configuration file for the httpd service." -msgstr "" - -#. type: item -#: doc/guix.texi:15784 -#, no-wrap -msgid "@code{modules} (default: @code{%default-httpd-modules})" -msgstr "@code{modules} (par défaut : @code{%default-httpd-modules})" - -#. type: table -#: doc/guix.texi:15787 -msgid "The modules to load. Additional modules can be added here, or loaded by additional configuration." -msgstr "" - -#. type: item -#: doc/guix.texi:15788 -#, no-wrap -msgid "@code{server-root} (default: @code{httpd})" -msgstr "@code{server-root} (par défaut : @code{httpd})" - -#. type: table -#: doc/guix.texi:15792 -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:15793 -#, no-wrap -msgid "@code{server-name} (default: @code{#f})" -msgstr "@code{server-name} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:15797 -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:15801 -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}." -msgstr "" - -#. type: item -#: doc/guix.texi:15802 -#, no-wrap -msgid "@code{document-root} (default: @code{\"/srv/http\"})" -msgstr "@code{document-root} (par défaut : @code{\"/srv/http\"})" - -#. type: table -#: doc/guix.texi:15804 -msgid "The @code{DocumentRoot} from which files will be served." -msgstr "" - -#. type: item -#: doc/guix.texi:15805 -#, no-wrap -msgid "@code{listen} (default: @code{'(\"80\")})" -msgstr "@code{listen} (par défaut : @code{'(\"80\")})" - -#. type: table -#: doc/guix.texi:15810 -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:15815 -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:15816 -#, no-wrap -msgid "@code{error-log} (default: @code{\"/var/log/httpd/error_log\"})" -msgstr "@code{error-log} (par défaut : @code{\"/var/log/httpd/error_log\"})" - -#. type: table -#: doc/guix.texi:15818 -msgid "The @code{ErrorLog} to which the server will log errors." -msgstr "" - -#. type: item -#: doc/guix.texi:15819 -#, no-wrap -msgid "@code{user} (default: @code{\"httpd\"})" -msgstr "@code{user} (par défaut : @code{\"httpd\"})" - -#. type: table -#: doc/guix.texi:15821 -msgid "The @code{User} which the server will answer requests as." -msgstr "" - -#. type: item -#: doc/guix.texi:15822 -#, no-wrap -msgid "@code{group} (default: @code{\"httpd\"})" -msgstr "@code{group} (par défaut : @code{\"httpd\"})" - -#. type: table -#: doc/guix.texi:15824 -msgid "The @code{Group} which the server will answer requests as." -msgstr "" - -#. type: item -#: doc/guix.texi:15825 -#, no-wrap -msgid "@code{extra-config} (default: @code{(list \"TypesConfig etc/httpd/mime.types\")})" -msgstr "@code{extra-config} (par défaut : @code{(list \"TypesConfig etc/httpd/mime.types\")})" - -#. type: table -#: doc/guix.texi:15828 -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:15831 -msgid "Any values which the service is extended with will be appended to this list." -msgstr "" - -#. type: deffn -#: doc/guix.texi:15835 -#, no-wrap -msgid "{Data Type} httpd-virtualhost" -msgstr "{Type de données} httpd-virtualhost" - -#. type: deffn -#: doc/guix.texi:15837 -msgid "This data type represents a virtualhost configuration block for the httpd service." -msgstr "" - -#. type: deffn -#: doc/guix.texi:15839 -msgid "These should be added to the extra-config for the httpd-service." -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:15851 -#, no-wrap -msgid "addresses-and-ports" -msgstr "addresses-and-ports" - -#. type: table -#: doc/guix.texi:15853 -msgid "The addresses and ports for the @code{VirtualHost} directive." -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:15854 -#, no-wrap -msgid "contents" -msgstr "contents" - -#. type: table -#: doc/guix.texi:15857 -msgid "The contents of the @code{VirtualHost} directive, this should be a list of strings and G-expressions." -msgstr "" - -#. type: subsubheading -#: doc/guix.texi:15861 -#, no-wrap -msgid "NGINX" -msgstr "NGINX" - -#. type: deffn -#: doc/guix.texi:15863 -#, no-wrap -msgid "{Scheme Variable} nginx-service-type" -msgstr "{Variable Scheme} nginx-service-type" - -#. type: deffn -#: doc/guix.texi:15866 -msgid "Service type for the @uref{https://nginx.org/,NGinx} web server. The value for this service type is a @code{} record." -msgstr "" - -#. type: example -#: doc/guix.texi:15876 doc/guix.texi:15930 -#, no-wrap -msgid "" -"(service nginx-service-type\n" -" (nginx-configuration\n" -" (server-blocks\n" -" (list (nginx-server-configuration\n" -" (server-name '(\"www.example.com\"))\n" -" (root \"/srv/http/www.example.com\"))))))\n" -msgstr "" - -#. type: deffn -#: doc/guix.texi:15881 -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: example -#: doc/guix.texi:15887 -#, no-wrap -msgid "" -"(simple-service 'my-extra-server nginx-service-type\n" -" (list (nginx-server-configuration\n" -" (root \"/srv/http/extra-website\")\n" -" (try-files (list \"$uri\" \"$uri/index.html\")))))\n" -msgstr "" -"(simple-service 'my-extra-server nginx-service-type\n" -" (list (nginx-server-configuration\n" -" (root \"/srv/http/extra-website\")\n" -" (try-files (list \"$uri\" \"$uri/index.html\")))))\n" - -#. type: Plain text -#: doc/guix.texi:15898 -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:15899 -#, no-wrap -msgid "{Data Type} nginx-configuration" -msgstr "{Type de données} nginx-configuration" - -#. type: deffn -#: doc/guix.texi:15903 -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:15905 -#, no-wrap -msgid "@code{nginx} (default: @code{nginx})" -msgstr "@code{nginx} (par défaut : @code{nginx})" - -#. type: table -#: doc/guix.texi:15907 -msgid "The nginx package to use." -msgstr "Le paquet nginx à utiliser." - -#. type: item -#: doc/guix.texi:15908 -#, no-wrap -msgid "@code{log-directory} (default: @code{\"/var/log/nginx\"})" -msgstr "@code{log-directory} (par défaut : @code{\"/var/log/nginx\"})" - -#. type: table -#: doc/guix.texi:15910 -msgid "The directory to which NGinx will write log files." -msgstr "" - -#. type: item -#: doc/guix.texi:15911 -#, no-wrap -msgid "@code{run-directory} (default: @code{\"/var/run/nginx\"})" -msgstr "@code{run-directory} (par défaut : @code{\"/var/run/nginx\"})" - -#. type: table -#: doc/guix.texi:15914 -msgid "The directory in which NGinx will create a pid file, and write temporary files." -msgstr "" - -#. type: item -#: doc/guix.texi:15915 -#, no-wrap -msgid "@code{server-blocks} (default: @code{'()})" -msgstr "@code{server-blocks} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:15919 -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:15923 -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:15932 -#, no-wrap -msgid "@code{upstream-blocks} (default: @code{'()})" -msgstr "@code{upstream-blocks} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:15936 -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:15943 -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: example -#: doc/guix.texi:15962 -#, no-wrap -msgid "" -"(service\n" -" nginx-service-type\n" -" (nginx-configuration\n" -" (server-blocks\n" -" (list (nginx-server-configuration\n" -" (server-name '(\"www.example.com\"))\n" -" (root \"/srv/http/www.example.com\")\n" -" (locations\n" -" (list\n" -" (nginx-location-configuration\n" -" (uri \"/path1\")\n" -" (body '(\"proxy_pass http://server-proxy;\"))))))))\n" -" (upstream-blocks\n" -" (list (nginx-upstream-configuration\n" -" (name \"server-proxy\")\n" -" (servers (list \"server1.example.com\"\n" -" \"server2.example.com\")))))))\n" -msgstr "" -"(service\n" -" nginx-service-type\n" -" (nginx-configuration\n" -" (server-blocks\n" -" (list (nginx-server-configuration\n" -" (server-name '(\"www.example.com\"))\n" -" (root \"/srv/http/www.example.com\")\n" -" (locations\n" -" (list\n" -" (nginx-location-configuration\n" -" (uri \"/path1\")\n" -" (body '(\"proxy_pass http://server-proxy;\"))))))))\n" -" (upstream-blocks\n" -" (list (nginx-upstream-configuration\n" -" (name \"server-proxy\")\n" -" (servers (list \"server1.example.com\"\n" -" \"server2.example.com\")))))))\n" - -#. type: table -#: doc/guix.texi:15970 -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:15974 -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:15975 -#, no-wrap -msgid "@code{server-names-hash-bucket-size} (default: @code{#f})" -msgstr "@code{server-names-hash-bucket-size} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:15978 -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:15979 -#, no-wrap -msgid "@code{server-names-hash-bucket-max-size} (default: @code{#f})" -msgstr "@code{server-names-hash-bucket-max-size} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:15981 -msgid "Maximum bucket size for the server names hash tables." -msgstr "" - -#. type: item -#: doc/guix.texi:15982 -#, no-wrap -msgid "@code{extra-content} (default: @code{\"\"})" -msgstr "@code{extra-content} (par défaut : @code{\"\"})" - -#. type: table -#: doc/guix.texi:15985 -msgid "Extra content for the @code{http} block. Should be string or a string valued G-expression." -msgstr "" - -#. type: deftp -#: doc/guix.texi:15989 -#, no-wrap -msgid "{Data Type} nginx-server-configuration" -msgstr "{Type de données} nginx-server-configuration" - -#. type: deftp -#: doc/guix.texi:15992 -msgid "Data type representing the configuration of an nginx server block. This type has the following parameters:" -msgstr "" - -#. type: item -#: doc/guix.texi:15994 -#, no-wrap -msgid "@code{listen} (default: @code{'(\"80\" \"443 ssl\")})" -msgstr "@code{listen} (par défaut : @code{'(\"80\" \"443 ssl\")})" - -#. type: table -#: doc/guix.texi:15999 -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: example -#: doc/guix.texi:16002 -#, no-wrap -msgid "'(\"127.0.0.1:8000\" \"127.0.0.1\" \"8000\" \"*:8000\" \"localhost:8000\")\n" -msgstr "'(\"127.0.0.1:8000\" \"127.0.0.1\" \"8000\" \"*:8000\" \"localhost:8000\")\n" - -#. type: item -#: doc/guix.texi:16004 -#, no-wrap -msgid "@code{server-name} (default: @code{(list 'default)})" -msgstr "@code{server-name} (par défaut : @code{(list 'default)})" - -#. type: table -#: doc/guix.texi:16007 -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:16008 -#, no-wrap -msgid "@code{root} (default: @code{\"/srv/http\"})" -msgstr "@code{root} (par défaut : @code{\"/srv/http\"})" - -#. type: table -#: doc/guix.texi:16010 -msgid "Root of the website nginx will serve." -msgstr "" - -#. type: item -#: doc/guix.texi:16011 -#, no-wrap -msgid "@code{locations} (default: @code{'()})" -msgstr "@code{locations} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16015 -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:16016 -#, no-wrap -msgid "@code{index} (default: @code{(list \"index.html\")})" -msgstr "@code{index} (par défaut : @code{(list \"index.html\")})" - -#. type: table -#: doc/guix.texi:16019 -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:16020 -#, no-wrap -msgid "@code{try-files} (default: @code{'()})" -msgstr "@code{try-files} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16023 -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:16024 -#, no-wrap -msgid "@code{ssl-certificate} (default: @code{#f})" -msgstr "@code{ssl-certificate} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16027 -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:16028 -#, no-wrap -msgid "@code{ssl-certificate-key} (default: @code{#f})" -msgstr "@code{ssl-certificate-key} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16031 -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:16032 -#, no-wrap -msgid "@code{server-tokens?} (default: @code{#f})" -msgstr "@code{server-tokens?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16034 -msgid "Whether the server should add its configuration to response." -msgstr "" - -#. type: item -#: doc/guix.texi:16035 -#, no-wrap -msgid "@code{raw-content} (default: @code{'()})" -msgstr "@code{raw-content} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16037 -msgid "A list of raw lines added to the server block." -msgstr "" - -#. type: deftp -#: doc/guix.texi:16041 -#, no-wrap -msgid "{Data Type} nginx-upstream-configuration" -msgstr "{Type de données} nginx-upstream-configuration" - -#. type: deftp -#: doc/guix.texi:16044 -msgid "Data type representing the configuration of an nginx @code{upstream} block. This type has the following parameters:" -msgstr "" - -#. type: table -#: doc/guix.texi:16048 -msgid "Name for this group of servers." -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:16049 -#, no-wrap -msgid "servers" -msgstr "" - -#. type: table -#: doc/guix.texi:16056 -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:16060 -#, no-wrap -msgid "{Data Type} nginx-location-configuration" -msgstr "{Type de données} nginx-location-configuration" - -#. type: deftp -#: doc/guix.texi:16063 -msgid "Data type representing the configuration of an nginx @code{location} block. This type has the following parameters:" -msgstr "" - -#. type: table -#: doc/guix.texi:16067 -msgid "URI which this location block matches." -msgstr "" - -#. type: anchor{#1} -#: doc/guix.texi:16069 -msgid "nginx-location-configuration body" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:16069 doc/guix.texi:16090 -#, no-wrap -msgid "body" -msgstr "" - -#. type: table -#: doc/guix.texi:16076 -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:16080 -#, no-wrap -msgid "{Data Type} nginx-named-location-configuration" -msgstr "{Type de données} nginx-named-location-configuration" - -#. type: deftp -#: doc/guix.texi:16085 -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:16089 -msgid "Name to identify this location block." -msgstr "" - -#. type: table -#: doc/guix.texi:16095 -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: cindex -#: doc/guix.texi:16099 -#, no-wrap -msgid "fastcgi" -msgstr "" - -#. type: cindex -#: doc/guix.texi:16100 -#, no-wrap -msgid "fcgiwrap" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:16107 -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:16114 -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:16115 -#, no-wrap -msgid "{Scheme Variable} fcgiwrap-service-type" -msgstr "{Variable Scheme} fcgiwrap-service-type" - -#. type: defvr -#: doc/guix.texi:16117 -msgid "A service type for the @code{fcgiwrap} FastCGI proxy." -msgstr "" - -#. type: deftp -#: doc/guix.texi:16119 -#, no-wrap -msgid "{Data Type} fcgiwrap-configuration" -msgstr "{Type de données} fcgiwrap-configuration" - -#. type: deftp -#: doc/guix.texi:16122 -msgid "Data type representing the configuration of the @code{fcgiwrap} serice. This type has the following parameters:" -msgstr "" - -#. type: item -#: doc/guix.texi:16123 -#, no-wrap -msgid "@code{package} (default: @code{fcgiwrap})" -msgstr "@code{package} (par défaut : @code{fcgiwrap})" - -#. type: table -#: doc/guix.texi:16125 -msgid "The fcgiwrap package to use." -msgstr "Le paquet fcgiwrap à utiliser." - -#. type: item -#: doc/guix.texi:16126 -#, no-wrap -msgid "@code{socket} (default: @code{tcp:127.0.0.1:9000})" -msgstr "@code{socket} (par défaut : @code{tcp:127.0.0.1:9000})" - -#. type: table -#: doc/guix.texi:16132 -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:16133 -#, no-wrap -msgid "@code{user} (default: @code{fcgiwrap})" -msgstr "@code{user} (par défaut : @code{fcgiwrap})" - -#. type: itemx -#: doc/guix.texi:16134 -#, no-wrap -msgid "@code{group} (default: @code{fcgiwrap})" -msgstr "@code{group} (par défaut : @code{fcgiwrap})" - -#. type: table -#: doc/guix.texi:16139 -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:16146 -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:16149 -#, no-wrap -msgid "php-fpm" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:16152 -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:16154 -msgid "These features include:" -msgstr "" - -#. type: item -#: doc/guix.texi:16155 -#, no-wrap -msgid "Adaptive process spawning" -msgstr "" - -#. type: item -#: doc/guix.texi:16156 -#, no-wrap -msgid "Basic statistics (similar to Apache's mod_status)" -msgstr "" - -#. type: item -#: doc/guix.texi:16157 -#, no-wrap -msgid "Advanced process management with graceful stop/start" -msgstr "" - -#. type: item -#: doc/guix.texi:16158 -#, no-wrap -msgid "Ability to start workers with different uid/gid/chroot/environment" -msgstr "" - -#. type: itemize -#: doc/guix.texi:16160 -msgid "and different php.ini (replaces safe_mode)" -msgstr "" - -#. type: item -#: doc/guix.texi:16160 -#, no-wrap -msgid "Stdout & stderr logging" -msgstr "" - -#. type: item -#: doc/guix.texi:16161 -#, no-wrap -msgid "Emergency restart in case of accidental opcode cache destruction" -msgstr "" - -#. type: item -#: doc/guix.texi:16162 -#, no-wrap -msgid "Accelerated upload support" -msgstr "" - -#. type: item -#: doc/guix.texi:16163 -#, no-wrap -msgid "Support for a \"slowlog\"" -msgstr "" - -#. type: item -#: doc/guix.texi:16164 -#, no-wrap -msgid "Enhancements to FastCGI, such as fastcgi_finish_request() -" -msgstr "" - -#. type: itemize -#: doc/guix.texi:16167 -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:16169 -msgid "... and much more." -msgstr "" - -#. type: defvr -#: doc/guix.texi:16170 -#, no-wrap -msgid "{Scheme Variable} php-fpm-service-type" -msgstr "{Variable Scheme} php-fpm-service-type" - -#. type: defvr -#: doc/guix.texi:16172 -msgid "A Service type for @code{php-fpm}." -msgstr "" - -#. type: deftp -#: doc/guix.texi:16174 -#, no-wrap -msgid "{Data Type} php-fpm-configuration" -msgstr "{Type de données} php-fpm-configuration" - -#. type: deftp -#: doc/guix.texi:16176 -msgid "Data Type for php-fpm service configuration." -msgstr "" - -#. type: item -#: doc/guix.texi:16177 -#, no-wrap -msgid "@code{php} (default: @code{php})" -msgstr "@code{php} (par défaut : @code{php})" - -#. type: table -#: doc/guix.texi:16179 -msgid "The php package to use." -msgstr "Le paquet php à utiliser." - -#. type: item -#: doc/guix.texi:16179 -#, no-wrap -msgid "@code{socket} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.sock\")})" -msgstr "@code{socket} (par défaut : @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.sock\")})" - -#. type: table -#: doc/guix.texi:16181 -msgid "The address on which to accept FastCGI requests. Valid syntaxes are:" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:16182 -#, no-wrap -msgid "\"ip.add.re.ss:port\"" -msgstr "" - -#. type: table -#: doc/guix.texi:16184 -msgid "Listen on a TCP socket to a specific address on a specific port." -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:16184 -#, no-wrap -msgid "\"port\"" -msgstr "" - -#. type: table -#: doc/guix.texi:16186 -msgid "Listen on a TCP socket to all addresses on a specific port." -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:16186 -#, no-wrap -msgid "\"/path/to/unix/socket\"" -msgstr "" - -#. type: table -#: doc/guix.texi:16188 -msgid "Listen on a unix socket." -msgstr "" - -#. type: item -#: doc/guix.texi:16190 -#, no-wrap -msgid "@code{user} (default: @code{php-fpm})" -msgstr "@code{user} (par défaut : @code{php-fpm})" - -#. type: table -#: doc/guix.texi:16192 -msgid "User who will own the php worker processes." -msgstr "" - -#. type: item -#: doc/guix.texi:16192 -#, no-wrap -msgid "@code{group} (default: @code{php-fpm})" -msgstr "@code{group} (par défaut : @code{php-fpm})" - -#. type: table -#: doc/guix.texi:16194 -msgid "Group of the worker processes." -msgstr "" - -#. type: item -#: doc/guix.texi:16194 -#, no-wrap -msgid "@code{socket-user} (default: @code{php-fpm})" -msgstr "@code{socket-user} (par défaut : @code{php-fpm})" - -#. type: table -#: doc/guix.texi:16196 -msgid "User who can speak to the php-fpm socket." -msgstr "" - -#. type: item -#: doc/guix.texi:16196 -#, no-wrap -msgid "@code{socket-group} (default: @code{php-fpm})" -msgstr "@code{socket-group} (par défaut : @code{php-fpm})" - -#. type: table -#: doc/guix.texi:16198 -msgid "Group that can speak to the php-fpm socket." -msgstr "" - -#. type: item -#: doc/guix.texi:16198 -#, no-wrap -msgid "@code{pid-file} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.pid\")})" -msgstr "@code{pid-file} (par défaut : @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.pid\")})" - -#. type: table -#: doc/guix.texi:16201 -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:16201 -#, no-wrap -msgid "@code{log-file} (default: @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.log\")})" -msgstr "@code{log-file} (par défaut : @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.log\")})" - -#. type: table -#: doc/guix.texi:16203 -msgid "Log for the php-fpm master process." -msgstr "" - -#. type: item -#: doc/guix.texi:16203 -#, no-wrap -msgid "@code{process-manager} (default: @code{(php-fpm-dynamic-process-manager-configuration)})" -msgstr "@code{process-manager} (par défaut : @code{(php-fpm-dynamic-process-manager-configuration)})" - -#. type: table -#: doc/guix.texi:16206 -msgid "Detailed settings for the php-fpm process manager. Must be either:" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:16207 -#, no-wrap -msgid "" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:16208 -#, no-wrap -msgid "" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:16209 -#, no-wrap -msgid "" -msgstr "" - -#. type: item -#: doc/guix.texi:16211 -#, no-wrap -msgid "@code{display-errors} (default @code{#f})" -msgstr "" - -#. type: table -#: doc/guix.texi:16216 -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:16216 -#, 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:16219 -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:16219 -#, no-wrap -msgid "@code{file} (default @code{#f})" -msgstr "" - -#. type: table -#: doc/guix.texi:16222 -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:16225 -#, no-wrap -msgid "{Data type} php-fpm-dynamic-process-manager-configuration" -msgstr "" - -#. type: deftp -#: doc/guix.texi:16229 -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:16230 doc/guix.texi:16246 doc/guix.texi:16256 -#, no-wrap -msgid "@code{max-children} (default: @code{5})" -msgstr "@code{max-children} (par défaut : @code{5})" - -#. type: table -#: doc/guix.texi:16232 doc/guix.texi:16248 doc/guix.texi:16258 -msgid "Maximum of worker processes." -msgstr "" - -#. type: item -#: doc/guix.texi:16232 -#, no-wrap -msgid "@code{start-servers} (default: @code{2})" -msgstr "@code{start-servers} (par défaut : @code{2})" - -#. type: table -#: doc/guix.texi:16234 -msgid "How many worker processes should be started on start-up." -msgstr "" - -#. type: item -#: doc/guix.texi:16234 -#, no-wrap -msgid "@code{min-spare-servers} (default: @code{1})" -msgstr "@code{min-spare-servers} (par défaut : @code{1})" - -#. type: table -#: doc/guix.texi:16236 -msgid "How many spare worker processes should be kept around at minimum." -msgstr "" - -#. type: item -#: doc/guix.texi:16236 -#, no-wrap -msgid "@code{max-spare-servers} (default: @code{3})" -msgstr "@code{max-spare-servers} (par défaut : @code{3})" - -#. type: table -#: doc/guix.texi:16238 -msgid "How many spare worker processes should be kept around at maximum." -msgstr "" - -#. type: deftp -#: doc/guix.texi:16241 -#, no-wrap -msgid "{Data type} php-fpm-static-process-manager-configuration" -msgstr "" - -#. type: deftp -#: doc/guix.texi:16245 -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:16251 -#, no-wrap -msgid "{Data type} php-fpm-on-demand-process-manager-configuration" -msgstr "" - -#. type: deftp -#: doc/guix.texi:16255 -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:16258 -#, no-wrap -msgid "@code{process-idle-timeout} (default: @code{10})" -msgstr "@code{process-idle-timeout} (par défaut : @code{10})" - -#. type: table -#: doc/guix.texi:16260 -msgid "The time in seconds after which a process with no requests is killed." -msgstr "" - -#. type: deffn -#: doc/guix.texi:16264 -#, no-wrap -msgid "{Scheme Procedure} nginx-php-fpm-location @" -msgstr "{Procédure Scheme} nginx-php-fpm-location @" - -#. type: deffn -#: doc/guix.texi:16270 -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:16273 -msgid "A simple services setup for nginx with php can look like this:" -msgstr "" - -#. type: example -#: doc/guix.texi:16286 -#, no-wrap -msgid "" -"(services (cons* (dhcp-client-service)\n" -" (service php-fpm-service-type)\n" -" (service nginx-service-type\n" -" (nginx-server-configuration\n" -" (server-name '(\"example.com\"))\n" -" (root \"/srv/http/\")\n" -" (locations\n" -" (list (nginx-php-location)))\n" -" (https-port #f)\n" -" (ssl-certificate #f)\n" -" (ssl-certificate-key #f)))\n" -" %base-services))\n" -msgstr "" - -#. type: cindex -#: doc/guix.texi:16288 -#, no-wrap -msgid "cat-avatar-generator" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:16292 -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:16293 -#, no-wrap -msgid "{Scheme Procedure} cat-avatar-generator-serice @" -msgstr "{Procédure Scheme} cat-avatar-generator-serice @" - -#. type: deffn -#: doc/guix.texi:16301 -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:16304 -msgid "A simple setup for cat-avatar-generator can look like this:" -msgstr "" - -#. type: example -#: doc/guix.texi:16311 -#, no-wrap -msgid "" -"(services (cons* (cat-avatar-generator-service\n" -" #:configuration\n" -" (nginx-server-configuration\n" -" (server-name '(\"example.com\"))))\n" -" ...\n" -" %base-services))\n" -msgstr "" - -#. type: subsubheading -#: doc/guix.texi:16313 -#, no-wrap -msgid "Hpcguix-web" -msgstr "" - -#. type: cindex -#: doc/guix.texi:16315 -#, no-wrap -msgid "hpcguix-web" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:16320 -msgid "The @uref{hpcguix-web, https://github.com/UMCUGenetics/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:16321 -#, no-wrap -msgid "{Scheme Variable} hpcguix-web-service-type" -msgstr "{Variable Scheme} hpcguix-web-service-type" - -#. type: defvr -#: doc/guix.texi:16323 -msgid "The service type for @code{hpcguix-web}." -msgstr "" - -#. type: deftp -#: doc/guix.texi:16325 -#, no-wrap -msgid "{Data Type} hpcguix-web-configuration" -msgstr "{Type de donnée} hpcguix-web-configuration" - -#. type: deftp -#: doc/guix.texi:16327 -msgid "Data type for the hpcguix-web service configuration." -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:16329 -#, no-wrap -msgid "specs" -msgstr "" - -#. type: table -#: doc/guix.texi:16332 -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:16334 -#, no-wrap -msgid "@code{title-prefix} (default: @code{\"hpcguix | \"})" -msgstr "@code{title-prefix} (par défaut : @code{\"hpcguix | \"})" - -#. type: table -#: doc/guix.texi:16336 -msgid "The page title prefix." -msgstr "Le préfixe du titre des pages." - -#. type: item -#: doc/guix.texi:16337 -#, no-wrap -msgid "@code{guix-command} (default: @code{\"guix\"})" -msgstr "@code{guix-command} (par défaut : @code{\"guix\"})" - -#. type: table -#: doc/guix.texi:16339 -msgid "The @command{guix} command." -msgstr "La commande @command{guix}" - -#. type: item -#: doc/guix.texi:16340 -#, no-wrap -msgid "@code{package-filter-proc} (default: @code{(const #t)})" -msgstr "@code{package-filter-proc} (par défaut : @code{(const #t)})" - -#. type: table -#: doc/guix.texi:16342 -msgid "A procedure specifying how to filter packages that are displayed." -msgstr "Une procédure qui spécifie comment filtrer les paquets qui seront affichés." - -#. type: item -#: doc/guix.texi:16343 -#, no-wrap -msgid "@code{package-page-extension-proc} (default: @code{(const '())})" -msgstr "@code{package-page-extension-procinputs} (par défaut : @code{(const '())})" - -#. type: table -#: doc/guix.texi:16345 -msgid "Extension package for @code{hpcguix-web}." -msgstr "" - -#. type: item -#: doc/guix.texi:16346 -#, no-wrap -msgid "@code{menu} (default: @code{'()})" -msgstr "@code{menu} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16348 -msgid "Additional entry in page @code{menu}." -msgstr "" - -#. type: table -#: doc/guix.texi:16353 -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:16354 -#, no-wrap -msgid "@code{package} (default: @code{hpcguix-web})" -msgstr "@code{packages} (par défaut : @code{hpcguix-web})" - -#. type: table -#: doc/guix.texi:16356 -msgid "The hpcguix-web package to use." -msgstr "Le paquet hpcguix-web à utiliser." - -#. type: Plain text -#: doc/guix.texi:16360 -msgid "A typical hpcguix-web service declaration looks like this:" -msgstr "" - -#. type: example -#: doc/guix.texi:16369 -#, no-wrap -msgid "" -"(service hpcguix-web-service-type\n" -" (hpcguix-web-configuration\n" -" (specs\n" -" #~(define site-config\n" -" (hpcweb-configuration\n" -" (title-prefix \"Guix-HPC - \")\n" -" (menu '((\"/about\" \"ABOUT\"))))))))\n" -msgstr "" - -#. type: cindex -#: doc/guix.texi:16374 -#, no-wrap -msgid "Web" -msgstr "" - -#. type: cindex -#: doc/guix.texi:16375 -#, no-wrap -msgid "HTTP, HTTPS" -msgstr "" - -#. type: cindex -#: doc/guix.texi:16376 -#, no-wrap -msgid "Let's Encrypt" -msgstr "" - -#. type: cindex -#: doc/guix.texi:16377 -#, no-wrap -msgid "TLS certificates" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:16384 -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:16396 -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:16403 -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:16409 -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:16413 -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:16414 -#, no-wrap -msgid "{Scheme Variable} certbot-service-type" -msgstr "{Variable Scheme} certbot-service-type" - -#. type: defvr -#: doc/guix.texi:16417 -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: example -#: doc/guix.texi:16424 -#, no-wrap -msgid "" -"(define %nginx-deploy-hook\n" -" (program-file\n" -" \"nginx-deploy-hook\"\n" -" #~(let ((pid (call-with-input-file \"/var/run/nginx/pid\" read)))\n" -" (kill pid SIGHUP))))\n" -"\n" -msgstr "" - -#. type: example -#: doc/guix.texi:16435 -#, no-wrap -msgid "" -"(service certbot-service-type\n" -" (certbot-configuration\n" -" (email \"foo@@example.net\")\n" -" (certificates\n" -" (list\n" -" (certificate-configuration\n" -" (domains '(\"example.net\" \"www.example.net\"))\n" -" (deploy-hook %nginx-deploy-hook))\n" -" (certificate-configuration\n" -" (domains '(\"bar.example.net\")))))))\n" -msgstr "" - -#. type: defvr -#: doc/guix.texi:16438 -msgid "See below for details about @code{certbot-configuration}." -msgstr "" - -#. type: deftp -#: doc/guix.texi:16440 -#, no-wrap -msgid "{Data Type} certbot-configuration" -msgstr "{Type de données} certbot-configuration" - -#. type: deftp -#: doc/guix.texi:16443 -msgid "Data type representing the configuration of the @code{certbot} service. This type has the following parameters:" -msgstr "" - -#. type: item -#: doc/guix.texi:16445 -#, no-wrap -msgid "@code{package} (default: @code{certbot})" -msgstr "@code{package} (par défaut : @code{certbot})" - -#. type: table -#: doc/guix.texi:16447 -msgid "The certbot package to use." -msgstr "Le paquet certbot à utiliser." - -#. type: item -#: doc/guix.texi:16448 -#, no-wrap -msgid "@code{webroot} (default: @code{/var/www})" -msgstr "@code{webroot} (par défaut : @code{/var/www})" - -#. type: table -#: doc/guix.texi:16451 -msgid "The directory from which to serve the Let's Encrypt challenge/response files." -msgstr "" - -#. type: item -#: doc/guix.texi:16452 -#, no-wrap -msgid "@code{certificates} (default: @code{()})" -msgstr "@code{certificates} (par défaut : @code{()})" - -#. type: table -#: doc/guix.texi:16456 -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:16460 -msgid "Mandatory email used for registration, recovery contact, and important account notifications." -msgstr "" - -#. type: item -#: doc/guix.texi:16461 -#, no-wrap -msgid "@code{rsa-key-size} (default: @code{2048})" -msgstr "@code{rsa-key-size} (par défaut : @code{2048})" - -#. type: table -#: doc/guix.texi:16463 -msgid "Size of the RSA key." -msgstr "" - -#. type: item -#: doc/guix.texi:16464 -#, no-wrap -msgid "@code{default-location} (default: @i{see below})" -msgstr "" - -#. type: table -#: doc/guix.texi:16473 -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:16477 -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:16481 -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:16483 -msgid "Pass @code{#f} to not issue a default location." -msgstr "" - -#. type: deftp -#: doc/guix.texi:16486 -#, no-wrap -msgid "{Data Type} certificate-configuration" -msgstr "{Type de données} certificate-configuration" - -#. type: deftp -#: doc/guix.texi:16489 -msgid "Data type representing the configuration of a certificate. This type has the following parameters:" -msgstr "" - -#. type: item -#: doc/guix.texi:16491 -#, no-wrap -msgid "@code{name} (default: @i{see below})" -msgstr "" - -#. type: table -#: doc/guix.texi:16495 -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:16497 -msgid "Its default is the first provided domain." -msgstr "" - -#. type: item -#: doc/guix.texi:16498 -#, no-wrap -msgid "@code{domains} (default: @code{()})" -msgstr "@code{domains} (par défaut : @code{()})" - -#. type: table -#: doc/guix.texi:16501 -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:16502 -#, no-wrap -msgid "@code{deploy-hook} (default: @code{#f})" -msgstr "@code{deploy-hook} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16510 -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:16517 -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:16519 -#, no-wrap -msgid "DNS (domain name system)" -msgstr "" - -#. type: cindex -#: doc/guix.texi:16520 -#, no-wrap -msgid "domain name system (DNS)" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:16528 -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:16529 -#, no-wrap -msgid "Knot Service" -msgstr "Service Knot" - -#. type: Plain text -#: doc/guix.texi:16533 -msgid "An example configuration of an authoritative server for two zones, one master and one slave, is:" -msgstr "" - -#. type: lisp -#: doc/guix.texi:16540 -#, no-wrap -msgid "" -"(define-zone-entries example.org.zone\n" -";; Name TTL Class Type Data\n" -" (\"@@\" \"\" \"IN\" \"A\" \"127.0.0.1\")\n" -" (\"@@\" \"\" \"IN\" \"NS\" \"ns\")\n" -" (\"ns\" \"\" \"IN\" \"A\" \"127.0.0.1\"))\n" -"\n" -msgstr "" - -#. type: lisp -#: doc/guix.texi:16547 -#, no-wrap -msgid "" -"(define master-zone\n" -" (knot-zone-configuration\n" -" (domain \"example.org\")\n" -" (zone (zone-file\n" -" (origin \"example.org\")\n" -" (entries example.org.zone)))))\n" -"\n" -msgstr "" - -#. type: lisp -#: doc/guix.texi:16553 -#, no-wrap -msgid "" -"(define slave-zone\n" -" (knot-zone-configuration\n" -" (domain \"plop.org\")\n" -" (dnssec-policy \"default\")\n" -" (master (list \"plop-master\"))))\n" -"\n" -msgstr "" - -#. type: lisp -#: doc/guix.texi:16558 -#, no-wrap -msgid "" -"(define plop-master\n" -" (knot-remote-configuration\n" -" (id \"plop-master\")\n" -" (address (list \"208.76.58.171\"))))\n" -"\n" -msgstr "" - -#. type: lisp -#: doc/guix.texi:16567 -#, no-wrap -msgid "" -"(operating-system\n" -" ;; ...\n" -" (services (cons* (service knot-service-type\n" -" (knot-configuration\n" -" (remotes (list plop-master))\n" -" (zones (list master-zone slave-zone))))\n" -" ;; ...\n" -" %base-services)))\n" -msgstr "" - -#. type: deffn -#: doc/guix.texi:16569 -#, no-wrap -msgid "{Scheme Variable} knot-service-type" -msgstr "{Variable Scheme} knot-service-type" - -#. type: deffn -#: doc/guix.texi:16571 -msgid "This is the type for the Knot DNS server." -msgstr "" - -#. type: deffn -#: doc/guix.texi:16579 -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:16581 -msgid "The following data types are used to configure the Knot DNS server:" -msgstr "" - -#. type: deftp -#: doc/guix.texi:16583 -#, no-wrap -msgid "{Data Type} knot-key-configuration" -msgstr "{Type de données} knot-key-configuration" - -#. type: deftp -#: doc/guix.texi:16586 -msgid "Data type representing a key. This type has the following parameters:" -msgstr "" - -#. type: item -#: doc/guix.texi:16588 doc/guix.texi:16608 doc/guix.texi:16723 -#: doc/guix.texi:16749 doc/guix.texi:16784 -#, no-wrap -msgid "@code{id} (default: @code{\"\"})" -msgstr "@code{id} (par défaut : @code{\"\"})" - -#. type: table -#: doc/guix.texi:16591 -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:16592 -#, no-wrap -msgid "@code{algorithm} (default: @code{#f})" -msgstr "@code{algorithm} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16596 -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:16597 -#, no-wrap -msgid "@code{secret} (default: @code{\"\"})" -msgstr "@code{secret} (par défaut : @code{\"\"})" - -#. type: table -#: doc/guix.texi:16599 -msgid "The secret key itself." -msgstr "" - -#. type: deftp -#: doc/guix.texi:16603 -#, no-wrap -msgid "{Data Type} knot-acl-configuration" -msgstr "{Type de données} knot-acl-configuration" - -#. type: deftp -#: doc/guix.texi:16606 -msgid "Data type representing an Access Control List (ACL) configuration. This type has the following parameters:" -msgstr "" - -#. type: table -#: doc/guix.texi:16611 -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:16612 doc/guix.texi:16727 -#, no-wrap -msgid "@code{address} (default: @code{'()})" -msgstr "@code{address} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16616 -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:16617 -#, no-wrap -msgid "@code{key} (default: @code{'()})" -msgstr "@code{key} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16621 -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:16622 -#, no-wrap -msgid "@code{action} (default: @code{'()})" -msgstr "@code{action} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16626 -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:16627 -#, no-wrap -msgid "@code{deny?} (default: @code{#f})" -msgstr "@code{deny?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16630 -msgid "When true, the ACL defines restrictions. Listed actions are forbidden. When false, listed actions are allowed." -msgstr "" - -#. type: deftp -#: doc/guix.texi:16634 -#, no-wrap -msgid "{Data Type} zone-entry" -msgstr "{Type de données} zone-entry" - -#. type: deftp -#: doc/guix.texi:16637 -msgid "Data type represnting a record entry in a zone file. This type has the following parameters:" -msgstr "" - -#. type: item -#: doc/guix.texi:16639 -#, no-wrap -msgid "@code{name} (default: @code{\"@@\"})" -msgstr "@code{name} (par défaut : @code{\"@@\"})" - -#. type: table -#: doc/guix.texi:16645 -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:16646 -#, no-wrap -msgid "@code{ttl} (default: @code{\"\"})" -msgstr "@code{ttl} (par défaut : @code{\"\"})" - -#. type: table -#: doc/guix.texi:16648 -msgid "The Time-To-Live (TTL) of this record. If not set, the default TTL is used." -msgstr "" - -#. type: item -#: doc/guix.texi:16649 -#, no-wrap -msgid "@code{class} (default: @code{\"IN\"})" -msgstr "@code{class} (par défaut : @code{\"IN\"})" - -#. type: table -#: doc/guix.texi:16652 -msgid "The class of the record. Knot currently supports only @code{\"IN\"} and partially @code{\"CH\"}." -msgstr "" - -#. type: item -#: doc/guix.texi:16653 -#, no-wrap -msgid "@code{type} (default: @code{\"A\"})" -msgstr "@code{type} (par défaut : @code{\"A\"})" - -#. type: table -#: doc/guix.texi:16657 -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:16658 -#, no-wrap -msgid "@code{data} (default: @code{\"\"})" -msgstr "@code{data} (par défaut : @code{\"\"})" - -#. type: table -#: doc/guix.texi:16662 -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:16666 -#, no-wrap -msgid "{Data Type} zone-file" -msgstr "{Type de données} zone-file" - -#. type: deftp -#: doc/guix.texi:16669 -msgid "Data type representing the content of a zone file. This type has the following parameters:" -msgstr "" - -#. type: table -#: doc/guix.texi:16678 -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:16679 -#, no-wrap -msgid "@code{origin} (default: @code{\"\"})" -msgstr "@code{origin} (par défaut : @code{\"\"})" - -#. type: table -#: doc/guix.texi:16681 -msgid "The name of your zone. This parameter cannot be empty." -msgstr "" - -#. type: item -#: doc/guix.texi:16682 -#, no-wrap -msgid "@code{ns} (default: @code{\"ns\"})" -msgstr "@code{ns} (par défaut : @code{\"ns\"})" - -#. type: table -#: doc/guix.texi:16687 -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:16688 -#, no-wrap -msgid "@code{mail} (default: @code{\"hostmaster\"})" -msgstr "@code{mail} (par défaut : @code{\"hostmaster\"})" - -#. type: table -#: doc/guix.texi:16691 -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:16692 -#, no-wrap -msgid "@code{serial} (default: @code{1})" -msgstr "@code{serial} (par défaut : @code{1})" - -#. type: table -#: doc/guix.texi:16696 -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:16697 -#, no-wrap -msgid "@code{refresh} (default: @code{(* 2 24 3600)})" -msgstr "@code{refresh} (par défaut : @code{(* 2 24 3600)})" - -#. type: table -#: doc/guix.texi:16701 -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:16702 -#, no-wrap -msgid "@code{retry} (default: @code{(* 15 60)})" -msgstr "@code{retry} (par défaut : @code{(* 15 60)})" - -#. type: table -#: doc/guix.texi:16705 -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:16706 -#, no-wrap -msgid "@code{expiry} (default: @code{(* 14 24 3600)})" -msgstr "@code{expiry} (par défaut : @code{(* 14 24 3600)})" - -#. type: table -#: doc/guix.texi:16710 -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:16711 -#, no-wrap -msgid "@code{nx} (default: @code{3600})" -msgstr "@code{nx} (par défaut : @code{3600})" - -#. type: table -#: doc/guix.texi:16714 -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:16718 -#, no-wrap -msgid "{Data Type} knot-remote-configuration" -msgstr "{Type de données} knot-remote-configuration" - -#. type: deftp -#: doc/guix.texi:16721 -msgid "Data type representing a remote configuration. This type has the following parameters:" -msgstr "" - -#. type: table -#: doc/guix.texi:16726 -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:16731 -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:16732 -#, no-wrap -msgid "@code{via} (default: @code{'()})" -msgstr "@code{via} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16736 -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:16737 -#, no-wrap -msgid "@code{key} (default: @code{#f})" -msgstr "@code{key} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16740 -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:16744 -#, no-wrap -msgid "{Data Type} knot-keystore-configuration" -msgstr "{Type de données} knot-keystore-configuration" - -#. type: deftp -#: doc/guix.texi:16747 -msgid "Data type representing a keystore to hold dnssec keys. This type has the following parameters:" -msgstr "" - -#. type: table -#: doc/guix.texi:16751 -msgid "The id of the keystore. It must not be empty." -msgstr "" - -#. type: item -#: doc/guix.texi:16752 -#, no-wrap -msgid "@code{backend} (default: @code{'pem})" -msgstr "@code{backend} (par défaut : @code{'pem})" - -#. type: table -#: doc/guix.texi:16754 -msgid "The backend to store the keys in. Can be @code{'pem} or @code{'pkcs11}." -msgstr "" - -#. type: item -#: doc/guix.texi:16755 -#, no-wrap -msgid "@code{config} (default: @code{\"/var/lib/knot/keys/keys\"})" -msgstr "@code{config} (par défaut : @code{\"/var/lib/knot/keys/keys\"})" - -#. type: table -#: doc/guix.texi:16759 -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." -msgstr "" - -#. type: deftp -#: doc/guix.texi:16763 -#, no-wrap -msgid "{Data Type} knot-policy-configuration" -msgstr "{Type de données} knot-policy-configuration" - -#. type: deftp -#: doc/guix.texi:16767 -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:16774 -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:16780 -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:16782 -msgid "This type has the following parameters:" -msgstr "" - -#. type: table -#: doc/guix.texi:16786 -msgid "The id of the policy. It must not be empty." -msgstr "" - -#. type: item -#: doc/guix.texi:16787 -#, no-wrap -msgid "@code{keystore} (default: @code{\"default\"})" -msgstr "@code{keystore} (par défaut : @code{\"default\"})" - -#. type: table -#: doc/guix.texi:16792 -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:16793 -#, no-wrap -msgid "@code{manual?} (default: @code{#f})" -msgstr "@code{manual?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16795 -msgid "Whether the key management is manual or automatic." -msgstr "" - -#. type: item -#: doc/guix.texi:16796 -#, no-wrap -msgid "@code{single-type-signing?} (default: @code{#f})" -msgstr "@code{single-type-signing?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16798 -msgid "When @code{#t}, use the Single-Type Signing Scheme." -msgstr "" - -#. type: item -#: doc/guix.texi:16799 -#, no-wrap -msgid "@code{algorithm} (default: @code{\"ecdsap256sha256\"})" -msgstr "@code{algorithm} (par défaut : @code{\"ecdsap256sha256\"})" - -#. type: table -#: doc/guix.texi:16801 -msgid "An algorithm of signing keys and issued signatures." -msgstr "" - -#. type: item -#: doc/guix.texi:16802 -#, no-wrap -msgid "@code{ksk-size} (default: @code{256})" -msgstr "@code{ksk-size} (par défaut : @code{256})" - -#. type: table -#: doc/guix.texi:16805 -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:16806 -#, no-wrap -msgid "@code{zsk-size} (default: @code{256})" -msgstr "@code{zsk-size} (par défaut : @code{256})" - -#. type: table -#: doc/guix.texi:16809 -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:16810 -#, no-wrap -msgid "@code{dnskey-ttl} (default: @code{'default})" -msgstr "@code{dnskey-ttl} (par défaut : @code{'default})" - -#. type: table -#: doc/guix.texi:16813 -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:16814 -#, no-wrap -msgid "@code{zsk-lifetime} (default: @code{(* 30 24 3600)})" -msgstr "@code{zsk-lifetime} (par défaut : @code{(* 30 24 3600)})" - -#. type: table -#: doc/guix.texi:16816 -msgid "The period between ZSK publication and the next rollover initiation." -msgstr "" - -#. type: item -#: doc/guix.texi:16817 -#, no-wrap -msgid "@code{propagation-delay} (default: @code{(* 24 3600)})" -msgstr "@code{propagation-delay} (par défaut : @code{(* 24 3600)})" - -#. type: table -#: doc/guix.texi:16820 -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:16821 -#, no-wrap -msgid "@code{rrsig-lifetime} (default: @code{(* 14 24 3600)})" -msgstr "@code{rrsig-lifetime} (par défaut : @code{(* 14 24 3600)})" - -#. type: table -#: doc/guix.texi:16823 -msgid "A validity period of newly issued signatures." -msgstr "" - -#. type: item -#: doc/guix.texi:16824 -#, no-wrap -msgid "@code{rrsig-refresh} (default: @code{(* 7 24 3600)})" -msgstr "@code{rrsig-refresh} (par défaut : @code{(* 7 24 3600)})" - -#. type: table -#: doc/guix.texi:16826 -msgid "A period how long before a signature expiration the signature will be refreshed." -msgstr "" - -#. type: item -#: doc/guix.texi:16827 -#, no-wrap -msgid "@code{nsec3?} (default: @code{#f})" -msgstr "@code{nsec3?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16829 -msgid "When @code{#t}, NSEC3 will be used instead of NSEC." -msgstr "" - -#. type: item -#: doc/guix.texi:16830 -#, no-wrap -msgid "@code{nsec3-iterations} (default: @code{5})" -msgstr "@code{nsec3-iterations} (par défaut : @code{5})" - -#. type: table -#: doc/guix.texi:16832 -msgid "The number of additional times the hashing is performed." -msgstr "" - -#. type: item -#: doc/guix.texi:16833 -#, no-wrap -msgid "@code{nsec3-salt-length} (default: @code{8})" -msgstr "@code{nsec3-salt-length} (par défaut : @code{8})" - -#. type: table -#: doc/guix.texi:16836 -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:16837 -#, no-wrap -msgid "@code{nsec3-salt-lifetime} (default: @code{(* 30 24 3600)})" -msgstr "@code{nsec3-salt-lifetime} (par défaut : @code{(* 30 24 3600)})" - -#. type: table -#: doc/guix.texi:16839 -msgid "The validity period of newly issued salt field." -msgstr "" - -#. type: deftp -#: doc/guix.texi:16843 -#, no-wrap -msgid "{Data Type} knot-zone-configuration" -msgstr "{Type de données} knot-zone-configuration" - -#. type: deftp -#: doc/guix.texi:16846 -msgid "Data type representing a zone served by Knot. This type has the following parameters:" -msgstr "" - -#. type: item -#: doc/guix.texi:16848 -#, no-wrap -msgid "@code{domain} (default: @code{\"\"})" -msgstr "@code{domain} (par défaut : @code{\"\"})" - -#. type: table -#: doc/guix.texi:16850 -msgid "The domain served by this configuration. It must not be empty." -msgstr "" - -#. type: item -#: doc/guix.texi:16851 -#, no-wrap -msgid "@code{file} (default: @code{\"\"})" -msgstr "@code{file} (par défaut : @code{\"\"})" - -#. type: table -#: doc/guix.texi:16854 -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:16855 -#, no-wrap -msgid "@code{zone} (default: @code{(zone-file)})" -msgstr "@code{zone} (par défaut : @code{(zone-file)})" - -#. type: table -#: doc/guix.texi:16858 -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:16859 -#, no-wrap -msgid "@code{master} (default: @code{'()})" -msgstr "@code{master} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16862 -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:16863 -#, no-wrap -msgid "@code{ddns-master} (default: @code{#f})" -msgstr "@code{ddns-master} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16866 -msgid "The main master. When empty, it defaults to the first master in the list of masters." -msgstr "" - -#. type: item -#: doc/guix.texi:16867 -#, no-wrap -msgid "@code{notify} (default: @code{'()})" -msgstr "@code{notify} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16869 -msgid "A list of slave remote identifiers." -msgstr "" - -#. type: item -#: doc/guix.texi:16870 -#, no-wrap -msgid "@code{acl} (default: @code{'()})" -msgstr "@code{acl} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16872 -msgid "A list of acl identifiers." -msgstr "" - -#. type: item -#: doc/guix.texi:16873 -#, no-wrap -msgid "@code{semantic-checks?} (default: @code{#f})" -msgstr "@code{semantic-checks?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16875 -msgid "When set, this adds more semantic checks to the zone." -msgstr "" - -#. type: item -#: doc/guix.texi:16876 -#, no-wrap -msgid "@code{disable-any?} (default: @code{#f})" -msgstr "@code{disable-any?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16878 -msgid "When set, this forbids queries of the ANY type." -msgstr "" - -#. type: item -#: doc/guix.texi:16879 -#, no-wrap -msgid "@code{zonefile-sync} (default: @code{0})" -msgstr "@code{zonefile-sync} (par défaut : @code{0})" - -#. type: table -#: doc/guix.texi:16882 -msgid "The delay between a modification in memory and on disk. 0 means immediate synchronization." -msgstr "" - -#. type: item -#: doc/guix.texi:16883 -#, no-wrap -msgid "@code{serial-policy} (default: @code{'increment})" -msgstr "@code{serial-policy} (par défaut : @code{'increment})" - -#. type: table -#: doc/guix.texi:16885 -msgid "A policy between @code{'increment} and @code{'unixtime}." -msgstr "" - -#. type: deftp -#: doc/guix.texi:16889 -#, no-wrap -msgid "{Data Type} knot-configuration" -msgstr "{Type de données} knot-configuration" - -#. type: deftp -#: doc/guix.texi:16892 -msgid "Data type representing the Knot configuration. This type has the following parameters:" -msgstr "" - -#. type: item -#: doc/guix.texi:16894 -#, no-wrap -msgid "@code{knot} (default: @code{knot})" -msgstr "@code{knot} (par défaut : @code{knot})" - -#. type: table -#: doc/guix.texi:16896 -msgid "The Knot package." -msgstr "" - -#. type: item -#: doc/guix.texi:16897 -#, no-wrap -msgid "@code{run-directory} (default: @code{\"/var/run/knot\"})" -msgstr "@code{run-directory} (par défaut : @code{\"/var/run/knot\"})" - -#. type: table -#: doc/guix.texi:16899 -msgid "The run directory. This directory will be used for pid file and sockets." -msgstr "" - -#. type: item -#: doc/guix.texi:16900 -#, no-wrap -msgid "@code{listen-v4} (default: @code{\"0.0.0.0\"})" -msgstr "@code{listen-v4} (par défaut : @code{\"0.0.0.0\"})" - -#. type: table -#: doc/guix.texi:16902 doc/guix.texi:16905 -msgid "An ip address on which to listen." -msgstr "" - -#. type: item -#: doc/guix.texi:16903 -#, no-wrap -msgid "@code{listen-v6} (default: @code{\"::\"})" -msgstr "@code{listen-v6} (par défaut : @code{\"::\"})" - -#. type: item -#: doc/guix.texi:16906 -#, no-wrap -msgid "@code{listen-port} (default: @code{53})" -msgstr "@code{listen-port} (par défaut : @code{53})" - -#. type: table -#: doc/guix.texi:16908 -msgid "A port on which to listen." -msgstr "" - -#. type: item -#: doc/guix.texi:16909 -#, no-wrap -msgid "@code{keys} (default: @code{'()})" -msgstr "@code{keys} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16911 -msgid "The list of knot-key-configuration used by this configuration." -msgstr "" - -#. type: item -#: doc/guix.texi:16912 -#, no-wrap -msgid "@code{acls} (default: @code{'()})" -msgstr "@code{acls} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16914 -msgid "The list of knot-acl-configuration used by this configuration." -msgstr "" - -#. type: item -#: doc/guix.texi:16915 -#, no-wrap -msgid "@code{remotes} (default: @code{'()})" -msgstr "@code{remotes} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16917 -msgid "The list of knot-remote-configuration used by this configuration." -msgstr "" - -#. type: item -#: doc/guix.texi:16918 -#, no-wrap -msgid "@code{zones} (default: @code{'()})" -msgstr "@code{zones} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16920 -msgid "The list of knot-zone-configuration used by this configuration." -msgstr "" - -#. type: subsubheading -#: doc/guix.texi:16924 -#, no-wrap -msgid "Dnsmasq Service" -msgstr "Services Dnsmasq" - -#. type: deffn -#: doc/guix.texi:16926 -#, no-wrap -msgid "{Scheme Variable} dnsmasq-service-type" -msgstr "{Variable Scheme} dnsmasq-service-type" - -#. type: deffn -#: doc/guix.texi:16929 -msgid "This is the type of the dnsmasq service, whose value should be an @code{dnsmasq-configuration} object as in this example:" -msgstr "" - -#. type: example -#: doc/guix.texi:16935 -#, no-wrap -msgid "" -"(service dnsmasq-service-type\n" -" (dnsmasq-configuration\n" -" (no-resolv? #t)\n" -" (servers '(\"192.168.1.1\"))))\n" -msgstr "" - -#. type: deftp -#: doc/guix.texi:16938 -#, no-wrap -msgid "{Data Type} dnsmasq-configuration" -msgstr "{Type de donnée} dnsmasq-configuration" - -#. type: deftp -#: doc/guix.texi:16940 -msgid "Data type representing the configuration of dnsmasq." -msgstr "Type de données qui représente la configuration de dnsmasq." - -#. type: item -#: doc/guix.texi:16942 -#, no-wrap -msgid "@code{package} (default: @var{dnsmasq})" -msgstr "@code{package} (par défaut : @code{dnsmasq})" - -#. type: table -#: doc/guix.texi:16944 -msgid "Package object of the dnsmasq server." -msgstr "" - -#. type: item -#: doc/guix.texi:16945 -#, no-wrap -msgid "@code{no-hosts?} (default: @code{#f})" -msgstr "@code{no-hosts?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16947 -msgid "When true, don't read the hostnames in /etc/hosts." -msgstr "" - -#. type: item -#: doc/guix.texi:16948 -#, no-wrap -msgid "@code{port} (default: @code{53})" -msgstr "@code{port} (par défaut : @code{53})" - -#. type: table -#: doc/guix.texi:16951 -msgid "The port to listen on. Setting this to zero completely disables DNS funtion, leaving only DHCP and/or TFTP." -msgstr "" - -#. type: item -#: doc/guix.texi:16952 -#, no-wrap -msgid "@code{local-service?} (default: @code{#t})" -msgstr "@code{local-service?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:16955 -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:16956 -#, no-wrap -msgid "@code{listen-addresses} (default: @code{'()})" -msgstr "@code{listen-addresses} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:16958 -msgid "Listen on the given IP addresses." -msgstr "" - -#. type: item -#: doc/guix.texi:16959 -#, no-wrap -msgid "@code{resolv-file} (default: @code{\"/etc/resolv.conf\"})" -msgstr "@code{resolv-file} (par défaut : @code{\"/etc/resolv.conf\"})" - -#. type: table -#: doc/guix.texi:16961 -msgid "The file to read the IP address of the upstream nameservers from." -msgstr "" - -#. type: item -#: doc/guix.texi:16962 -#, no-wrap -msgid "@code{no-resolv?} (default: @code{#f})" -msgstr "@code{no-resolv?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:16964 -msgid "When true, don't read @var{resolv-file}." -msgstr "" - -#. type: table -#: doc/guix.texi:16967 -msgid "Specify IP address of upstream servers directly." -msgstr "" - -#. type: item -#: doc/guix.texi:16968 -#, no-wrap -msgid "@code{cache-size} (default: @code{150})" -msgstr "@code{cache-size} (par défaut : @code{150})" - -#. type: table -#: doc/guix.texi:16971 -msgid "Set the size of dnsmasq's cache. Setting the cache size to zero disables caching." -msgstr "" - -#. type: item -#: doc/guix.texi:16972 -#, no-wrap -msgid "@code{negative-cache?} (default: @code{#t})" -msgstr "@code{negative-cache?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:16974 -msgid "When false, disable negative caching." -msgstr "" - -#. type: cindex -#: doc/guix.texi:16980 -#, no-wrap -msgid "VPN (virtual private network)" -msgstr "" - -#. type: cindex -#: doc/guix.texi:16981 -#, no-wrap -msgid "virtual private network (VPN)" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:16987 -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{servire} service for your machine to host a VPN. Both services use @uref{https://openvpn.net/, OpenVPN}." -msgstr "" - -#. type: deffn -#: doc/guix.texi:16988 -#, no-wrap -msgid "{Scheme Procedure} openvpn-client-service @" -msgstr "{Procédure Scheme} openvpn-client-service @" - -#. type: deffn -#: doc/guix.texi:16990 -msgid "[#:config (openvpn-client-configuration)]" -msgstr "" - -#. type: deffn -#: doc/guix.texi:16992 -msgid "Return a service that runs @command{openvpn}, a VPN daemon, as a client." -msgstr "" - -#. type: deffn -#: doc/guix.texi:16994 -#, no-wrap -msgid "{Scheme Procedure} openvpn-server-service @" -msgstr "{Procédure Scheme} openvpn-server-service @" - -#. type: deffn -#: doc/guix.texi:16996 -msgid "[#:config (openvpn-server-configuration)]" -msgstr "" - -#. type: deffn -#: doc/guix.texi:16998 -msgid "Return a service that runs @command{openvpn}, a VPN daemon, as a server." -msgstr "" - -#. type: deffn -#: doc/guix.texi:17000 -msgid "Both can be run simultaneously." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:17005 -msgid "Available @code{openvpn-client-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17006 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} package openvpn" -msgstr "{paramètre de @code{openvpn-client-configuration}} package openvpn" - -#. type: deftypevr -#: doc/guix.texi:17008 doc/guix.texi:17144 -msgid "The OpenVPN package." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17011 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} string pid-file" -msgstr "{paramètre de @code{openvpn-client-configuration}} string pid-file" - -#. type: deftypevr -#: doc/guix.texi:17013 doc/guix.texi:17149 -msgid "The OpenVPN pid file." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17015 doc/guix.texi:17151 -msgid "Defaults to @samp{\"/var/run/openvpn/openvpn.pid\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17018 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} proto proto" -msgstr "{paramètre de @code{openvpn-client-configuration}} proto proto" - -#. type: deftypevr -#: doc/guix.texi:17021 doc/guix.texi:17157 -msgid "The protocol (UDP or TCP) used to open a channel between clients and servers." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17023 doc/guix.texi:17159 -msgid "Defaults to @samp{udp}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17026 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} dev dev" -msgstr "{paramètre de @code{openvpn-client-configuration}} dev dev" - -#. type: deftypevr -#: doc/guix.texi:17028 doc/guix.texi:17164 -msgid "The device type used to represent the VPN connection." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17030 doc/guix.texi:17166 -msgid "Defaults to @samp{tun}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17033 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} string ca" -msgstr "{paramètre de @code{openvpn-client-configuration}} string ca" - -#. type: deftypevr -#: doc/guix.texi:17035 doc/guix.texi:17171 -msgid "The certificate authority to check connections against." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17037 doc/guix.texi:17173 -msgid "Defaults to @samp{\"/etc/openvpn/ca.crt\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17040 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} string cert" -msgstr "{paramètre de @code{openvpn-client-configuration}} string cert" - -#. type: deftypevr -#: doc/guix.texi:17043 doc/guix.texi:17179 -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:17045 doc/guix.texi:17181 -msgid "Defaults to @samp{\"/etc/openvpn/client.crt\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17048 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} string key" -msgstr "{paramètre de @code{openvpn-client-configuration}} string key" - -#. type: deftypevr -#: doc/guix.texi:17051 doc/guix.texi:17187 -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:17053 doc/guix.texi:17189 -msgid "Defaults to @samp{\"/etc/openvpn/client.key\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17056 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} boolean comp-lzo?" -msgstr "{paramètre de @code{openvpn-client-configuration}} boolean comp-lzo?" - -#. type: deftypevr -#: doc/guix.texi:17058 doc/guix.texi:17194 -msgid "Whether to use the lzo compression algorithm." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17063 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} boolean persist-key?" -msgstr "{paramètre de @code{openvpn-client-configuration}} boolean persist-key?" - -#. type: deftypevr -#: doc/guix.texi:17065 doc/guix.texi:17201 -msgid "Don't re-read key files across SIGUSR1 or --ping-restart." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17070 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} boolean persist-tun?" -msgstr "{paramètre de @code{openvpn-client-configuration}} boolean persist-tun?" - -#. type: deftypevr -#: doc/guix.texi:17073 doc/guix.texi:17209 -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:17078 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} number verbosity" -msgstr "{paramètre de @code{openvpn-client-configuration}} number verbosity" - -#. type: deftypevr -#: doc/guix.texi:17080 doc/guix.texi:17216 -msgid "Verbosity level." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17082 doc/guix.texi:17218 doc/guix.texi:18495 -#: doc/guix.texi:18718 -msgid "Defaults to @samp{3}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17085 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} tls-auth-client tls-auth" -msgstr "{paramètre de @code{openvpn-client-configuration}} tls-auth-client tls-auth" - -#. type: deftypevr -#: doc/guix.texi:17088 doc/guix.texi:17224 -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:17093 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} key-usage verify-key-usage?" -msgstr "{paramètre de @code{openvpn-client-configuration}} key-usage verify-key-usage?" - -#. type: deftypevr -#: doc/guix.texi:17095 -msgid "Whether to check the server certificate has server usage extension." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17100 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} bind bind?" -msgstr "{paramètre de @code{openvpn-client-configuration}} bind bind?" - -#. type: deftypevr -#: doc/guix.texi:17102 -msgid "Bind to a specific local port number." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17107 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} resolv-retry resolv-retry?" -msgstr "{paramètre de @code{openvpn-client-configuration}} resolv-retry resolv-retry?" - -#. type: deftypevr -#: doc/guix.texi:17109 -msgid "Retry resolving server address." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17114 -#, no-wrap -msgid "{@code{openvpn-client-configuration} parameter} openvpn-remote-list remote" -msgstr "{paramètre de @code{openvpn-client-configuration}} openvpn-remote-list remote" - -#. type: deftypevr -#: doc/guix.texi:17116 -msgid "A list of remote servers to connect to." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17120 -msgid "Available @code{openvpn-remote-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17121 -#, no-wrap -msgid "{@code{openvpn-remote-configuration} parameter} string name" -msgstr "{paramètre de @code{openvpn-remote-configuration}} string name" - -#. type: deftypevr -#: doc/guix.texi:17123 -msgid "Server name." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17125 -msgid "Defaults to @samp{\"my-server\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17128 -#, no-wrap -msgid "{@code{openvpn-remote-configuration} parameter} number port" -msgstr "{paramètre de @code{openvpn-remote-configuration}} number port" - -#. type: deftypevr -#: doc/guix.texi:17130 -msgid "Port number the server listens to." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17132 doc/guix.texi:17233 -msgid "Defaults to @samp{1194}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: Plain text -#: doc/guix.texi:17141 -msgid "Available @code{openvpn-server-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17142 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} package openvpn" -msgstr "{paramètre de @code{openvpn-server-configuration}} package openvpn" - -#. type: deftypevr -#: doc/guix.texi:17147 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} string pid-file" -msgstr "{paramètre de @code{openvpn-server-configuration}} string pid-file" - -#. type: deftypevr -#: doc/guix.texi:17154 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} proto proto" -msgstr "{paramètre de @code{openvpn-server-configuration}} proto proto" - -#. type: deftypevr -#: doc/guix.texi:17162 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} dev dev" -msgstr "{paramètre de @code{openvpn-server-configuration}} dev dev" - -#. type: deftypevr -#: doc/guix.texi:17169 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} string ca" -msgstr "{paramètre de @code{openvpn-server-configuration}} string ca" - -#. type: deftypevr -#: doc/guix.texi:17176 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} string cert" -msgstr "{paramètre de @code{openvpn-server-configuration}} string cert" - -#. type: deftypevr -#: doc/guix.texi:17184 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} string key" -msgstr "{paramètre de @code{openvpn-server-configuration}} string key" - -#. type: deftypevr -#: doc/guix.texi:17192 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} boolean comp-lzo?" -msgstr "{paramètre de @code{openvpn-server-configuration}} boolean comp-lzo?" - -#. type: deftypevr -#: doc/guix.texi:17199 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} boolean persist-key?" -msgstr "{paramètre de @code{openvpn-server-configuration}} boolean persist-key?" - -#. type: deftypevr -#: doc/guix.texi:17206 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} boolean persist-tun?" -msgstr "{paramètre de @code{openvpn-server-configuration}} boolean persist-tun?" - -#. type: deftypevr -#: doc/guix.texi:17214 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} number verbosity" -msgstr "{paramètre de @code{openvpn-server-configuration}} number verbosity" - -#. type: deftypevr -#: doc/guix.texi:17221 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} tls-auth-server tls-auth" -msgstr "{paramètre de @code{openvpn-server-configuration}} tls-auth-server tls-auth" - -#. type: deftypevr -#: doc/guix.texi:17229 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} number port" -msgstr "{paramètre de @code{openvpn-server-configuration}} number port" - -#. type: deftypevr -#: doc/guix.texi:17231 -msgid "Specifies the port number on which the server listens." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17236 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} ip-mask server" -msgstr "{paramètre de @code{openvpn-server-configuration}} ip-mask server" - -#. type: deftypevr -#: doc/guix.texi:17238 -msgid "An ip and mask specifying the subnet inside the virtual network." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17240 -msgid "Defaults to @samp{\"10.8.0.0 255.255.255.0\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17243 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} cidr6 server-ipv6" -msgstr "{paramètre de @code{openvpn-server-configuration}} cidr6 server-ipv6" - -#. type: deftypevr -#: doc/guix.texi:17245 -msgid "A CIDR notation specifying the IPv6 subnet inside the virtual network." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17250 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} string dh" -msgstr "{paramètre de @code{openvpn-server-configuration}} string dh" - -#. type: deftypevr -#: doc/guix.texi:17252 -msgid "The Diffie-Hellman parameters file." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17254 -msgid "Defaults to @samp{\"/etc/openvpn/dh2048.pem\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17257 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} string ifconfig-pool-persist" -msgstr "{paramètre de @code{openvpn-server-configuration}} string ifconfig-pool-persist" - -#. type: deftypevr -#: doc/guix.texi:17259 -msgid "The file that records client IPs." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17261 -msgid "Defaults to @samp{\"/etc/openvpn/ipp.txt\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17264 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} gateway redirect-gateway?" -msgstr "{paramètre de @code{openvpn-server-configuration}} gateway redirect-gateway?" - -#. type: deftypevr -#: doc/guix.texi:17266 -msgid "When true, the server will act as a gateway for its clients." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17271 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} boolean client-to-client?" -msgstr "{paramètre de @code{openvpn-server-configuration}} boolean client-to-client?" - -#. type: deftypevr -#: doc/guix.texi:17273 -msgid "When true, clients are allowed to talk to each other inside the VPN." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17278 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} keepalive keepalive" -msgstr "{paramètre de @code{openvpn-server-configuration}} keepalive keepalive" - -#. type: deftypevr -#: doc/guix.texi:17284 -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:17287 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} number max-clients" -msgstr "{paramètre de @code{openvpn-server-configuration}} number max-clients" - -#. type: deftypevr -#: doc/guix.texi:17289 -msgid "The maximum number of clients." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17294 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} string status" -msgstr "{paramètre de @code{openvpn-server-configuration}} string status" - -#. type: deftypevr -#: doc/guix.texi:17297 -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:17299 -msgid "Defaults to @samp{\"/var/run/openvpn/status\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17302 -#, no-wrap -msgid "{@code{openvpn-server-configuration} parameter} openvpn-ccd-list client-config-dir" -msgstr "{paramètre de @code{openvpn-server-configuration}} openvpn-ccd-list client-config-dir" - -#. type: deftypevr -#: doc/guix.texi:17304 -msgid "The list of configuration for some clients." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17308 -msgid "Available @code{openvpn-ccd-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17309 -#, no-wrap -msgid "{@code{openvpn-ccd-configuration} parameter} string name" -msgstr "{paramètre de @code{openvpn-ccd-configuration}} string name" - -#. type: deftypevr -#: doc/guix.texi:17311 -msgid "Client name." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17313 -msgid "Defaults to @samp{\"client\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17316 -#, no-wrap -msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask iroute" -msgstr "{paramètre de @code{openvpn-ccd-configuration}} ip-mask iroute" - -#. type: deftypevr -#: doc/guix.texi:17318 -msgid "Client own network" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17323 -#, no-wrap -msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask ifconfig-push" -msgstr "{paramètre de @code{openvpn-ccd-configuration}} ip-mask ifconfig-push" - -#. type: deftypevr -#: doc/guix.texi:17325 -msgid "Client VPN IP." -msgstr "" - -#. type: cindex -#: doc/guix.texi:17338 -#, no-wrap -msgid "NFS" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:17343 -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: subsubheading -#: doc/guix.texi:17344 -#, no-wrap -msgid "RPC Bind Service" -msgstr "" - -#. type: cindex -#: doc/guix.texi:17345 -#, no-wrap -msgid "rpcbind" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:17351 -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:17352 -#, no-wrap -msgid "{Scheme Variable} rpcbind-service-type" -msgstr "{Variable Scheme} rpcbind-service-type" - -#. type: defvr -#: doc/guix.texi:17354 -msgid "A service type for the RPC portmapper daemon." -msgstr "" - -#. type: deftp -#: doc/guix.texi:17357 -#, no-wrap -msgid "{Data Type} rpcbind-configuration" -msgstr "{Type de données} rpcbind-configuration" - -#. type: deftp -#: doc/guix.texi:17360 -msgid "Data type representing the configuration of the RPC Bind Service. This type has the following parameters:" -msgstr "" - -#. type: item -#: doc/guix.texi:17361 -#, no-wrap -msgid "@code{rpcbind} (default: @code{rpcbind})" -msgstr "@code{rpcbind} (par défaut : @code{rpcbind})" - -#. type: table -#: doc/guix.texi:17363 -msgid "The rpcbind package to use." -msgstr "Le paquet rpcbind à utiliser." - -#. type: item -#: doc/guix.texi:17364 -#, no-wrap -msgid "@code{warm-start?} (default: @code{#t})" -msgstr "@code{warm-start?} (par défaut : @code{#t})" - -#. type: table -#: doc/guix.texi:17368 -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:17372 -#, no-wrap -msgid "Pipefs Pseudo File System" -msgstr "" - -#. type: cindex -#: doc/guix.texi:17373 -#, no-wrap -msgid "pipefs" -msgstr "" - -#. type: cindex -#: doc/guix.texi:17374 -#, no-wrap -msgid "rpc_pipefs" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:17378 -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:17379 -#, no-wrap -msgid "{Scheme Variable} pipefs-service-type" -msgstr "{Variable Scheme} pipefs-service-type" - -#. type: defvr -#: doc/guix.texi:17381 -msgid "A service type for the pipefs pseudo file system." -msgstr "" - -#. type: deftp -#: doc/guix.texi:17383 -#, no-wrap -msgid "{Data Type} pipefs-configuration" -msgstr "{Type de données} pipefs-configuration" - -#. type: deftp -#: doc/guix.texi:17386 -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:17387 -#, no-wrap -msgid "@code{mount-point} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})" -msgstr "@code{mount-point} (par défaut : @code{\"/var/lib/nfs/rpc_pipefs\"})" - -#. type: table -#: doc/guix.texi:17389 -msgid "The directory to which the file system is to be attached." -msgstr "" - -#. type: subsubheading -#: doc/guix.texi:17393 -#, no-wrap -msgid "GSS Daemon Service" -msgstr "" - -#. type: cindex -#: doc/guix.texi:17394 -#, no-wrap -msgid "GSSD" -msgstr "" - -#. type: cindex -#: doc/guix.texi:17395 -#, no-wrap -msgid "GSS" -msgstr "" - -#. type: cindex -#: doc/guix.texi:17396 -#, no-wrap -msgid "global security system" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:17403 -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:17404 -#, no-wrap -msgid "{Scheme Variable} gss-service-type" -msgstr "{Variable Scheme} gss-service-type" - -#. type: defvr -#: doc/guix.texi:17406 -msgid "A service type for the Global Security System (GSS) daemon." -msgstr "" - -#. type: deftp -#: doc/guix.texi:17408 -#, no-wrap -msgid "{Data Type} gss-configuration" -msgstr "{Type de données} gss-configuration" - -#. type: deftp -#: doc/guix.texi:17411 -msgid "Data type representing the configuration of the GSS daemon service. This type has the following parameters:" -msgstr "" - -#. type: item -#: doc/guix.texi:17412 doc/guix.texi:17437 -#, no-wrap -msgid "@code{nfs-utils} (default: @code{nfs-utils})" -msgstr "@code{nfs-utils} (par défaut : @code{nfs-utils})" - -#. type: table -#: doc/guix.texi:17414 -msgid "The package in which the @command{rpc.gssd} command is to be found." -msgstr "" - -#. type: item -#: doc/guix.texi:17415 doc/guix.texi:17440 -#, no-wrap -msgid "@code{pipefs-directory} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})" -msgstr "@code{pipefs-directory} (par défaut : @code{\"/var/lib/nfs/rpc_pipefs\"})" - -#. type: table -#: doc/guix.texi:17417 doc/guix.texi:17442 -msgid "The directory where the pipefs file system is mounted." -msgstr "" - -#. type: subsubheading -#: doc/guix.texi:17422 -#, no-wrap -msgid "IDMAP Daemon Service" -msgstr "" - -#. type: cindex -#: doc/guix.texi:17423 -#, no-wrap -msgid "idmapd" -msgstr "" - -#. type: cindex -#: doc/guix.texi:17424 -#, no-wrap -msgid "name mapper" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:17428 -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:17429 -#, no-wrap -msgid "{Scheme Variable} idmap-service-type" -msgstr "{Variable Scheme} idmap-service-type" - -#. type: defvr -#: doc/guix.texi:17431 -msgid "A service type for the Identity Mapper (IDMAP) daemon." -msgstr "" - -#. type: deftp -#: doc/guix.texi:17433 -#, no-wrap -msgid "{Data Type} idmap-configuration" -msgstr "{Type de données} idmap-configuration" - -#. type: deftp -#: doc/guix.texi:17436 -msgid "Data type representing the configuration of the IDMAP daemon service. This type has the following parameters:" -msgstr "" - -#. type: table -#: doc/guix.texi:17439 -msgid "The package in which the @command{rpc.idmapd} command is to be found." -msgstr "" - -#. type: item -#: doc/guix.texi:17443 -#, no-wrap -msgid "@code{domain} (default: @code{#f})" -msgstr "@code{domain} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:17447 -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: cindex -#: doc/guix.texi:17454 -#, no-wrap -msgid "continuous integration" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:17458 -msgid "@uref{https://notabug.org/mthl/cuirass, Cuirass} is a continuous integration tool for Guix. It can be used both for development and for providing substitutes to others (@pxref{Substitutes})." -msgstr "@uref{https://notabug.org/mthl/cuirass, Cuirass} est un outil d'intégration continue pour Guix. On peut l'utiliser aussi bien pour le développement que pour fournir des substituts à d'autres (@pxref{Substituts})." - -#. type: Plain text -#: doc/guix.texi:17460 -msgid "The @code{(gnu services cuirass)} module provides the following service." -msgstr "" - -#. type: defvr -#: doc/guix.texi:17461 -#, no-wrap -msgid "{Scheme Procedure} cuirass-service-type" -msgstr "{Procédure Scheme} cuirass-service-type" - -#. type: defvr -#: doc/guix.texi:17464 -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:17471 -msgid "To add build jobs, you have to set the @code{specifications} field of the configuration. Here is an example of a service defining a build job based on a specification that can be found in Cuirass source tree. This service polls the Guix repository and builds a subset of the Guix packages, as prescribed in the @file{gnu-system.scm} example spec:" -msgstr "" - -#. type: example -#: doc/guix.texi:17483 -#, no-wrap -msgid "" -"(let ((spec #~((#:name . \"guix\")\n" -" (#:url . \"git://git.savannah.gnu.org/guix.git\")\n" -" (#:load-path . \".\")\n" -" (#:file . \"build-aux/cuirass/gnu-system.scm\")\n" -" (#:proc . cuirass-jobs)\n" -" (#:arguments (subset . \"hello\"))\n" -" (#:branch . \"master\"))))\n" -" (service cuirass-service-type\n" -" (cuirass-configuration\n" -" (specifications #~(list '#$spec)))))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:17488 -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:17489 -#, no-wrap -msgid "{Data Type} cuirass-configuration" -msgstr "{Type de données} cuirass-configuration" - -#. type: deftp -#: doc/guix.texi:17491 -msgid "Data type representing the configuration of Cuirass." -msgstr "" - -#. type: item -#: doc/guix.texi:17493 -#, no-wrap -msgid "@code{log-file} (default: @code{\"/var/log/cuirass.log\"})" -msgstr "@code{log-file} (par défaut : @code{\"/var/log/cuirass.log\"})" - -#. type: table -#: doc/guix.texi:17495 -msgid "Location of the log file." -msgstr "" - -#. type: item -#: doc/guix.texi:17496 -#, no-wrap -msgid "@code{cache-directory} (default: @code{\"/var/cache/cuirass\"})" -msgstr "@code{cache-directory} (par défaut : @code{\"/var/cache/cuirass\"})" - -#. type: table -#: doc/guix.texi:17498 -msgid "Location of the repository cache." -msgstr "" - -#. type: item -#: doc/guix.texi:17499 -#, no-wrap -msgid "@code{user} (default: @code{\"cuirass\"})" -msgstr "@code{user} (par défaut : @code{\"cuirass\"})" - -#. type: table -#: doc/guix.texi:17501 -msgid "Owner of the @code{cuirass} process." -msgstr "" - -#. type: item -#: doc/guix.texi:17502 -#, no-wrap -msgid "@code{group} (default: @code{\"cuirass\"})" -msgstr "@code{group} (par défaut : @code{\"cuirass\"})" - -#. type: table -#: doc/guix.texi:17504 -msgid "Owner's group of the @code{cuirass} process." -msgstr "" - -#. type: item -#: doc/guix.texi:17505 -#, no-wrap -msgid "@code{interval} (default: @code{60})" -msgstr "@code{interval} (par défaut : @code{60})" - -#. type: table -#: doc/guix.texi:17508 -msgid "Number of seconds between the poll of the repositories followed by the Cuirass jobs." -msgstr "" - -#. type: item -#: doc/guix.texi:17509 -#, no-wrap -msgid "@code{database} (default: @code{\"/var/run/cuirass/cuirass.db\"})" -msgstr "@code{database} (par défaut : @code{\"/var/run/cuirass/cuirass.db\"})" - -#. type: table -#: doc/guix.texi:17512 -msgid "Location of sqlite database which contains the build results and previously added specifications." -msgstr "" - -#. type: item -#: doc/guix.texi:17513 -#, no-wrap -msgid "@code{port} (default: @code{8081})" -msgstr "@code{port} (par défaut : @code{8081})" - -#. type: table -#: doc/guix.texi:17515 -msgid "Port number used by the HTTP server." -msgstr "" - -#. type: table -#: doc/guix.texi:17519 -msgid "Listen on the network interface for @var{host}. The default is to accept connections from localhost." -msgstr "" - -#. type: item -#: doc/guix.texi:17520 -#, no-wrap -msgid "@code{specifications} (default: @code{#~'()})" -msgstr "@code{specifications} (par défaut : @code{#~'()})" - -#. type: table -#: doc/guix.texi:17526 -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:17527 -#, no-wrap -msgid "@code{use-substitutes?} (default: @code{#f})" -msgstr "@code{use-substitutes?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:17530 -msgid "This allows using substitutes to avoid building every dependencies of a job from source." -msgstr "" - -#. type: item -#: doc/guix.texi:17531 -#, no-wrap -msgid "@code{one-shot?} (default: @code{#f})" -msgstr "@code{one-shot?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:17533 -msgid "Only evaluate specifications and build derivations once." -msgstr "" - -#. type: item -#: doc/guix.texi:17534 -#, no-wrap -msgid "@code{fallback?} (default: @code{#f})" -msgstr "@code{fallback?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:17537 -msgid "When substituting a pre-built binary fails, fall back to building packages locally." -msgstr "" - -#. type: item -#: doc/guix.texi:17538 -#, no-wrap -msgid "@code{load-path} (default: @code{'()})" -msgstr "@code{load-path} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:17541 -msgid "This allows users to define their own packages and make them visible to cuirass as in @command{guix build} command." -msgstr "" - -#. type: item -#: doc/guix.texi:17542 -#, no-wrap -msgid "@code{cuirass} (default: @code{cuirass})" -msgstr "@code{cuirass} (par défaut : @code{cuirass})" - -#. type: table -#: doc/guix.texi:17544 -msgid "The Cuirass package to use." -msgstr "Le paquet Cuirass à utiliser." - -#. type: cindex -#: doc/guix.texi:17550 -#, no-wrap -msgid "power management with TLP" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:17553 -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:17559 -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{http://linrunner.de/en/tlp/tlp.html, TLP home page}." -msgstr "" - -#. type: deffn -#: doc/guix.texi:17560 -#, no-wrap -msgid "{Scheme Variable} tlp-service-type" -msgstr "{Variable Scheme} tlp-service-type" - -#. type: deffn -#: doc/guix.texi:17564 -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: example -#: doc/guix.texi:17566 -#, no-wrap -msgid "(service tlp-service-type)\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:17571 -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:17577 -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:17587 -msgid "Available @code{tlp-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17588 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} package tlp" -msgstr "{paramètre de @code{tlp-configuration}} package tlp" - -#. type: deftypevr -#: doc/guix.texi:17590 -msgid "The TLP package." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17593 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} boolean tlp-enable?" -msgstr "{paramètre de @code{tlp-configuration}} boolean tlp-enable?" - -#. type: deftypevr -#: doc/guix.texi:17595 -msgid "Set to true if you wish to enable TLP." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17600 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string tlp-default-mode" -msgstr "{paramètre de @code{tlp-configuration}} string tlp-default-mode" - -#. type: deftypevr -#: doc/guix.texi:17603 -msgid "Default mode when no power supply can be detected. Alternatives are AC and BAT." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17605 -msgid "Defaults to @samp{\"AC\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17608 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} non-negative-integer disk-idle-secs-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17611 -msgid "Number of seconds Linux kernel has to wait after the disk goes idle, before syncing on AC." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17616 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} non-negative-integer disk-idle-secs-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17618 -msgid "Same as @code{disk-idle-ac} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17620 -msgid "Defaults to @samp{2}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17623 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} non-negative-integer max-lost-work-secs-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17625 -msgid "Dirty pages flushing periodicity, expressed in seconds." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17627 doc/guix.texi:17850 doc/guix.texi:19167 -#: doc/guix.texi:19175 -msgid "Defaults to @samp{15}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17630 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} non-negative-integer max-lost-work-secs-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17632 -msgid "Same as @code{max-lost-work-secs-on-ac} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17634 -msgid "Defaults to @samp{60}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17637 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} maybe-space-separated-string-list cpu-scaling-governor-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17641 -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:17643 doc/guix.texi:17650 doc/guix.texi:17657 -#: doc/guix.texi:17664 doc/guix.texi:17671 doc/guix.texi:17678 -#: doc/guix.texi:17686 doc/guix.texi:17694 doc/guix.texi:17701 -#: doc/guix.texi:17708 doc/guix.texi:17715 doc/guix.texi:17722 -#: doc/guix.texi:17752 doc/guix.texi:17790 doc/guix.texi:17797 -#: doc/guix.texi:17806 doc/guix.texi:17828 doc/guix.texi:17836 -#: doc/guix.texi:17843 doc/guix.texi:17998 doc/guix.texi:18018 -#: doc/guix.texi:18033 doc/guix.texi:18040 -msgid "Defaults to @samp{disabled}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17646 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} maybe-space-separated-string-list cpu-scaling-governor-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17648 -msgid "Same as @code{cpu-scaling-governor-on-ac} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17653 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-scaling-min-freq-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17655 -msgid "Set the min available frequency for the scaling governor on AC." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17660 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-scaling-max-freq-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17662 -msgid "Set the max available frequency for the scaling governor on AC." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17667 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-scaling-min-freq-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17669 -msgid "Set the min available frequency for the scaling governor on BAT." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17674 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-scaling-max-freq-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17676 -msgid "Set the max available frequency for the scaling governor on BAT." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17681 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-min-perf-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17684 -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:17689 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-max-perf-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17692 -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:17697 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-min-perf-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17699 -msgid "Same as @code{cpu-min-perf-on-ac} on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17704 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} maybe-non-negative-integer cpu-max-perf-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17706 -msgid "Same as @code{cpu-max-perf-on-ac} on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17711 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-ac?" -msgstr "{paramètre de @code{tlp-configuration}} maybe-boolean cpu-boost-on-ac?" - -#. type: deftypevr -#: doc/guix.texi:17713 -msgid "Enable CPU turbo boost feature on AC mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17718 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-bat?" -msgstr "{paramètre de @code{tlp-configuration}} maybe-boolean cpu-boost-on-bat?" - -#. type: deftypevr -#: doc/guix.texi:17720 -msgid "Same as @code{cpu-boost-on-ac?} on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17725 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-ac?" -msgstr "{paramètre de @code{tlp-configuration}} boolean sched-powersave-on-ac?" - -#. type: deftypevr -#: doc/guix.texi:17728 -msgid "Allow Linux kernel to minimize the number of CPU cores/hyper-threads used under light load conditions." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17733 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-bat?" -msgstr "{paramètre de @code{tlp-configuration}} boolean sched-powersave-on-bat?" - -#. type: deftypevr -#: doc/guix.texi:17735 -msgid "Same as @code{sched-powersave-on-ac?} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17740 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} boolean nmi-watchdog?" -msgstr "{paramètre de @code{tlp-configuration}} boolean nmi-watchdog?" - -#. type: deftypevr -#: doc/guix.texi:17742 -msgid "Enable Linux kernel NMI watchdog." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17747 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-string phc-controls" -msgstr "{paramètre de @code{tlp-configuration}} maybe-string phc-controls" - -#. type: deftypevr -#: doc/guix.texi:17750 -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:17755 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} string energy-perf-policy-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17758 -msgid "Set CPU performance versus energy saving policy on AC. Alternatives are performance, normal, powersave." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17760 doc/guix.texi:17858 doc/guix.texi:17888 -msgid "Defaults to @samp{\"performance\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17763 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} string energy-perf-policy-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17765 -msgid "Same as @code{energy-perf-policy-ac} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17767 doc/guix.texi:17865 -msgid "Defaults to @samp{\"powersave\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17770 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} space-separated-string-list disks-devices" -msgstr "{paramètre de @code{tlp-configuration}} space-separated-string-list disks-devices" - -#. type: deftypevr -#: doc/guix.texi:17772 -msgid "Hard disk devices." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17775 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} space-separated-string-list disk-apm-level-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17777 -msgid "Hard disk advanced power management level." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17780 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} space-separated-string-list disk-apm-level-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17782 -msgid "Same as @code{disk-apm-bat} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17785 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} maybe-space-separated-string-list disk-spindown-timeout-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17788 -msgid "Hard disk spin down timeout. One value has to be specified for each declared hard disk." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17793 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} maybe-space-separated-string-list disk-spindown-timeout-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17795 -msgid "Same as @code{disk-spindown-timeout-on-ac} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17800 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-iosched" -msgstr "{paramètre de @code{tlp-configuration}} maybe-space-separated-string-list disk-iosched" - -#. type: deftypevr -#: doc/guix.texi:17804 -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:17809 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} string sata-linkpwr-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17812 -msgid "SATA aggressive link power management (ALPM) level. Alternatives are min_power, medium_power, max_performance." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17814 -msgid "Defaults to @samp{\"max_performance\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17817 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} string sata-linkpwr-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17819 -msgid "Same as @code{sata-linkpwr-ac} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17821 -msgid "Defaults to @samp{\"min_power\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17824 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-string sata-linkpwr-blacklist" -msgstr "{paramètre de @code{tlp-configuration}} maybe-string sata-linkpwr-blacklist" - -#. type: deftypevr -#: doc/guix.texi:17826 -msgid "Exclude specified SATA host devices for link power management." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17831 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-ac?" -msgstr "{paramètre de @code{tlp-configuration}} maybe-on-off-boolean ahci-runtime-pm-on-ac?" - -#. type: deftypevr -#: doc/guix.texi:17834 -msgid "Enable Runtime Power Management for AHCI controller and disks on AC mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17839 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-bat?" -msgstr "{paramètre de @code{tlp-configuration}} maybe-on-off-boolean ahci-runtime-pm-on-bat?" - -#. type: deftypevr -#: doc/guix.texi:17841 -msgid "Same as @code{ahci-runtime-pm-on-ac} on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17846 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} non-negative-integer ahci-runtime-pm-timeout" -msgstr "{paramètre de @code{tlp-configuration}} non-negative-integer ahci-runtime-pm-timeout" - -#. type: deftypevr -#: doc/guix.texi:17848 -msgid "Seconds of inactivity before disk is suspended." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17853 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} string pcie-aspm-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17856 -msgid "PCI Express Active State Power Management level. Alternatives are default, performance, powersave." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17861 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} string pcie-aspm-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17863 -msgid "Same as @code{pcie-aspm-ac} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17868 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} string radeon-power-profile-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17871 -msgid "Radeon graphics clock speed level. Alternatives are low, mid, high, auto, default." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17873 -msgid "Defaults to @samp{\"high\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17876 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} string radeon-power-profile-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17878 -msgid "Same as @code{radeon-power-ac} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17880 -msgid "Defaults to @samp{\"low\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17883 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} string radeon-dpm-state-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17886 -msgid "Radeon dynamic power management method (DPM). Alternatives are battery, performance." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17891 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} string radeon-dpm-state-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17893 -msgid "Same as @code{radeon-dpm-state-ac} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17895 -msgid "Defaults to @samp{\"battery\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17898 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} string radeon-dpm-perf-level-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17900 -msgid "Radeon DPM performance level. Alternatives are auto, low, high." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17902 doc/guix.texi:17909 doc/guix.texi:17983 -msgid "Defaults to @samp{\"auto\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17905 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} string radeon-dpm-perf-level-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17907 -msgid "Same as @code{radeon-dpm-perf-ac} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17912 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-ac?" -msgstr "{paramètre de @code{tlp-configuration}} on-off-boolean wifi-pwr-on-ac?" - -#. type: deftypevr -#: doc/guix.texi:17914 -msgid "Wifi power saving mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17919 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-bat?" -msgstr "{paramètre de @code{tlp-configuration}} on-off-boolean wifi-pwr-on-bat?" - -#. type: deftypevr -#: doc/guix.texi:17921 -msgid "Same as @code{wifi-power-ac?} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17926 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} y-n-boolean wol-disable?" -msgstr "{paramètre de @code{tlp-configuration}} y-n-boolean wol-disable?" - -#. type: deftypevr -#: doc/guix.texi:17928 -msgid "Disable wake on LAN." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17933 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} non-negative-integer sound-power-save-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17936 -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:17941 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} non-negative-integer sound-power-save-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17943 -msgid "Same as @code{sound-powersave-ac} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17945 doc/guix.texi:18460 doc/guix.texi:18604 -msgid "Defaults to @samp{1}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17948 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} y-n-boolean sound-power-save-controller?" -msgstr "{paramètre de @code{tlp-configuration}} y-n-boolean sound-power-save-controller?" - -#. type: deftypevr -#: doc/guix.texi:17950 -msgid "Disable controller in powersaving mode on Intel HDA devices." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17955 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} boolean bay-poweroff-on-bat?" -msgstr "{paramètre de @code{tlp-configuration}} boolean bay-poweroff-on-bat?" - -#. type: deftypevr -#: doc/guix.texi:17959 -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:17964 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string bay-device" -msgstr "{paramètre de @code{tlp-configuration}} string bay-device" - -#. type: deftypevr -#: doc/guix.texi:17966 -msgid "Name of the optical drive device to power off." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17968 -msgid "Defaults to @samp{\"sr0\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17971 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-ac" -msgstr "{paramètre de @code{tlp-configuration}} string runtime-pm-on-ac" - -#. type: deftypevr -#: doc/guix.texi:17974 -msgid "Runtime Power Management for PCI(e) bus devices. Alternatives are on and auto." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17976 -msgid "Defaults to @samp{\"on\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:17979 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-bat" -msgstr "{paramètre de @code{tlp-configuration}} string runtime-pm-on-bat" - -#. type: deftypevr -#: doc/guix.texi:17981 -msgid "Same as @code{runtime-pm-ac} but on BAT mode." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17986 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} boolean runtime-pm-all?" -msgstr "{paramètre de @code{tlp-configuration}} boolean runtime-pm-all?" - -#. type: deftypevr -#: doc/guix.texi:17989 -msgid "Runtime Power Management for all PCI(e) bus devices, except blacklisted ones." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:17994 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list runtime-pm-blacklist" -msgstr "{paramètre de @code{tlp-configuration}} maybe-space-separated-string-list runtime-pm-blacklist" - -#. type: deftypevr -#: doc/guix.texi:17996 -msgid "Exclude specified PCI(e) device addresses from Runtime Power Management." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18001 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} space-separated-string-list runtime-pm-driver-blacklist" -msgstr "{paramètre de @code{tlp-configuration}} space-separated-string-list runtime-pm-driver-blacklist" - -#. type: deftypevr -#: doc/guix.texi:18004 -msgid "Exclude PCI(e) devices assigned to the specified drivers from Runtime Power Management." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18007 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} boolean usb-autosuspend?" -msgstr "{paramètre de @code{tlp-configuration}} boolean usb-autosuspend?" - -#. type: deftypevr -#: doc/guix.texi:18009 -msgid "Enable USB autosuspend feature." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18014 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-string usb-blacklist" -msgstr "{paramètre de @code{tlp-configuration}} maybe-string usb-blacklist" - -#. type: deftypevr -#: doc/guix.texi:18016 -msgid "Exclude specified devices from USB autosuspend." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18021 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} boolean usb-blacklist-wwan?" -msgstr "{paramètre de @code{tlp-configuration}} boolean usb-blacklist-wwan?" - -#. type: deftypevr -#: doc/guix.texi:18023 -msgid "Exclude WWAN devices from USB autosuspend." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18028 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-string usb-whitelist" -msgstr "{paramètre de @code{tlp-configuration}} maybe-string usb-whitelist" - -#. type: deftypevr -#: doc/guix.texi:18031 -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:18036 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} maybe-boolean usb-autosuspend-disable-on-shutdown?" -msgstr "{paramètre de @code{tlp-configuration}} maybe-boolean usb-autosuspend-disable-on-shutdown?" - -#. type: deftypevr -#: doc/guix.texi:18038 -msgid "Enable USB autosuspend before shutdown." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18043 -#, no-wrap -msgid "{@code{tlp-configuration} parameter} boolean restore-device-state-on-startup?" -msgstr "{paramètre de @code{tlp-configuration}} boolean restore-device-state-on-startup?" - -#. type: deftypevr -#: doc/guix.texi:18046 -msgid "Restore radio device state (bluetooth, wifi, wwan) from previous shutdown on system startup." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:18054 -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:18055 -#, no-wrap -msgid "{Scheme Variable} thermald-service-type" -msgstr "{Variable Scheme} thermald-service-type" - -#. type: defvr -#: doc/guix.texi:18060 -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:18062 -#, no-wrap -msgid "{Data Type} thermald-configuration" -msgstr "{Type de données} thermald-configuration" - -#. type: deftp -#: doc/guix.texi:18064 -msgid "Data type representing the configuration of @code{thermald-service-type}." -msgstr "" - -#. type: item -#: doc/guix.texi:18066 -#, no-wrap -msgid "@code{ignore-cpuid-check?} (default: @code{#f})" -msgstr "@code{ignore-cpuid-check?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:18068 -msgid "Ignore cpuid check for supported CPU models." -msgstr "" - -#. type: item -#: doc/guix.texi:18069 -#, no-wrap -msgid "@code{thermald} (default: @var{thermald})" -msgstr "@code{thermald} (par défaut : @var{thermald})" - -#. type: table -#: doc/guix.texi:18071 -msgid "Package object of thermald." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:18080 -msgid "The @code{(gnu services audio)} module provides a service to start MPD (the Music Player Daemon)." -msgstr "" - -#. type: cindex -#: doc/guix.texi:18081 -#, no-wrap -msgid "mpd" -msgstr "" - -#. type: subsubheading -#: doc/guix.texi:18082 -#, no-wrap -msgid "Music Player Daemon" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:18087 -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:18090 -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: example -#: doc/guix.texi:18096 -#, no-wrap -msgid "" -"(service mpd-service-type\n" -" (mpd-configuration\n" -" (user \"bob\")\n" -" (port \"6666\")))\n" -msgstr "" - -#. type: defvr -#: doc/guix.texi:18098 -#, no-wrap -msgid "{Scheme Variable} mpd-service-type" -msgstr "{Variable Scheme} mpd-service-type" - -#. type: defvr -#: doc/guix.texi:18100 -msgid "The service type for @command{mpd}" -msgstr "" - -#. type: deftp -#: doc/guix.texi:18102 -#, no-wrap -msgid "{Data Type} mpd-configuration" -msgstr "{Type de données} mpd-configuration" - -#. type: deftp -#: doc/guix.texi:18104 -msgid "Data type representing the configuration of @command{mpd}." -msgstr "" - -#. type: item -#: doc/guix.texi:18106 -#, no-wrap -msgid "@code{user} (default: @code{\"mpd\"})" -msgstr "@code{user} (par défaut : @code{\"mpd\"})" - -#. type: table -#: doc/guix.texi:18108 -msgid "The user to run mpd as." -msgstr "" - -#. type: item -#: doc/guix.texi:18109 -#, no-wrap -msgid "@code{music-dir} (default: @code{\"~/Music\"})" -msgstr "@code{music-dir} (par défaut : @code{\"~/Music\"})" - -#. type: table -#: doc/guix.texi:18111 -msgid "The directory to scan for music files." -msgstr "" - -#. type: item -#: doc/guix.texi:18112 -#, no-wrap -msgid "@code{playlist-dir} (default: @code{\"~/.mpd/playlists\"})" -msgstr "@code{playlist-dir} (par défaut : @code{\"~/.mpd/playlists\"})" - -#. type: table -#: doc/guix.texi:18114 -msgid "The directory to store playlists." -msgstr "" - -#. type: item -#: doc/guix.texi:18115 -#, no-wrap -msgid "@code{port} (default: @code{\"6600\"})" -msgstr "@code{port} (par défaut : @code{\"6600\"})" - -#. type: table -#: doc/guix.texi:18117 -msgid "The port to run mpd on." -msgstr "" - -#. type: item -#: doc/guix.texi:18118 -#, no-wrap -msgid "@code{address} (default: @code{\"any\"})" -msgstr "@code{address} (par défaut : @code{\"any\"})" - -#. type: table -#: doc/guix.texi:18121 -msgid "The address that mpd will bind to. To use a Unix domain socket, an absolute path can be specified here." -msgstr "" - -#. type: subsubsection -#: doc/guix.texi:18126 -#, no-wrap -msgid "Virtualization services" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:18131 -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:18132 -#, no-wrap -msgid "Libvirt daemon" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:18136 -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:18137 -#, no-wrap -msgid "{Scheme Variable} libvirt-service-type" -msgstr "{Variable Scheme} libvirt-service-type" - -#. type: deffn -#: doc/guix.texi:18140 -msgid "This is the type of the @uref{https://libvirt.org, libvirt daemon}. Its value must be a @code{libvirt-configuration}." -msgstr "" - -#. type: example -#: doc/guix.texi:18146 -#, no-wrap -msgid "" -"(service libvirt-service-type\n" -" (libvirt-configuration\n" -" (unix-sock-group \"libvirt\")\n" -" (tls-port \"16555\")))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:18151 -msgid "Available @code{libvirt-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18152 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} package libvirt" -msgstr "{paramètre de @code{libvirt-configuration}} package libvirt" - -#. type: deftypevr -#: doc/guix.texi:18154 -msgid "Libvirt package." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18157 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} boolean listen-tls?" -msgstr "{paramètre de @code{libvirt-configuration}} boolean listen-tls?" - -#. type: deftypevr -#: doc/guix.texi:18160 -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:18163 -msgid "It is necessary to setup a CA and issue server certificates before using this capability." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18168 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} boolean listen-tcp?" -msgstr "{paramètre de @code{libvirt-configuration}} boolean listen-tcp?" - -#. type: deftypevr -#: doc/guix.texi:18171 -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:18175 -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:18180 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string tls-port" -msgstr "{paramètre de @code{libvirt-configuration}} string tls-port" - -#. type: deftypevr -#: doc/guix.texi:18183 -msgid "Port for accepting secure TLS connections This can be a port number, or service name" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18185 -msgid "Defaults to @samp{\"16514\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18188 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string tcp-port" -msgstr "{paramètre de @code{libvirt-configuration}} string tcp-port" - -#. type: deftypevr -#: doc/guix.texi:18191 -msgid "Port for accepting insecure TCP connections This can be a port number, or service name" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18193 -msgid "Defaults to @samp{\"16509\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18196 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string listen-addr" -msgstr "{paramètre de @code{libvirt-configuration}} string listen-addr" - -#. type: deftypevr -#: doc/guix.texi:18198 -msgid "IP address or hostname used for client connections." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18200 -msgid "Defaults to @samp{\"0.0.0.0\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18203 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} boolean mdns-adv?" -msgstr "{paramètre de @code{libvirt-configuration}} boolean mdns-adv?" - -#. type: deftypevr -#: doc/guix.texi:18205 -msgid "Flag toggling mDNS advertisement of the libvirt service." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18208 -msgid "Alternatively can disable for all services on a host by stopping the Avahi daemon." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18213 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string mdns-name" -msgstr "{paramètre de @code{libvirt-configuration}} string mdns-name" - -#. type: deftypevr -#: doc/guix.texi:18216 -msgid "Default mDNS advertisement name. This must be unique on the immediate broadcast network." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18218 -msgid "Defaults to @samp{\"Virtualization Host \"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18221 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string unix-sock-group" -msgstr "{paramètre de @code{libvirt-configuration}} string unix-sock-group" - -#. type: deftypevr -#: doc/guix.texi:18225 -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:18227 -msgid "Defaults to @samp{\"root\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18230 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string unix-sock-ro-perms" -msgstr "{paramètre de @code{libvirt-configuration}} string unix-sock-ro-perms" - -#. type: deftypevr -#: doc/guix.texi:18233 -msgid "UNIX socket permissions for the R/O socket. This is used for monitoring VM status only." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18235 doc/guix.texi:18253 -msgid "Defaults to @samp{\"0777\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18238 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string unix-sock-rw-perms" -msgstr "{paramètre de @code{libvirt-configuration}} string unix-sock-rw-perms" - -#. type: deftypevr -#: doc/guix.texi:18242 -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:18244 -msgid "Defaults to @samp{\"0770\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18247 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string unix-sock-admin-perms" -msgstr "{paramètre de @code{libvirt-configuration}} string unix-sock-admin-perms" - -#. type: deftypevr -#: doc/guix.texi:18251 -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:18256 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string unix-sock-dir" -msgstr "{paramètre de @code{libvirt-configuration}} string unix-sock-dir" - -#. type: deftypevr -#: doc/guix.texi:18258 -msgid "The directory in which sockets will be found/created." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18260 -msgid "Defaults to @samp{\"/var/run/libvirt\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18263 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string auth-unix-ro" -msgstr "{paramètre de @code{libvirt-configuration}} string auth-unix-ro" - -#. type: deftypevr -#: doc/guix.texi:18266 -msgid "Authentication scheme for UNIX read-only sockets. By default socket permissions allow anyone to connect" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18268 doc/guix.texi:18277 -msgid "Defaults to @samp{\"polkit\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18271 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string auth-unix-rw" -msgstr "{paramètre de @code{libvirt-configuration}} string auth-unix-rw" - -#. type: deftypevr -#: doc/guix.texi:18275 -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:18280 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string auth-tcp" -msgstr "{paramètre de @code{libvirt-configuration}} string auth-tcp" - -#. type: deftypevr -#: doc/guix.texi:18284 -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:18286 -msgid "Defaults to @samp{\"sasl\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18289 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string auth-tls" -msgstr "{paramètre de @code{libvirt-configuration}} string auth-tls" - -#. type: deftypevr -#: doc/guix.texi:18293 -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:18296 -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:18298 -msgid "Defaults to @samp{\"none\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18301 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} optional-list access-drivers" -msgstr "{paramètre de @code{libvirt-configuration}} optional-list access-drivers" - -#. type: deftypevr -#: doc/guix.texi:18303 -msgid "API access control scheme." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18306 -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:18311 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string key-file" -msgstr "{paramètre de @code{libvirt-configuration}} string key-file" - -#. type: deftypevr -#: doc/guix.texi:18314 -msgid "Server key file path. If set to an empty string, then no private key is loaded." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18319 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string cert-file" -msgstr "{paramètre de @code{libvirt-configuration}} string cert-file" - -#. type: deftypevr -#: doc/guix.texi:18322 -msgid "Server key file path. If set to an empty string, then no certificate is loaded." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18327 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string ca-file" -msgstr "{paramètre de @code{libvirt-configuration}} string ca-file" - -#. type: deftypevr -#: doc/guix.texi:18330 -msgid "Server key file path. If set to an empty string, then no CA certificate is loaded." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18335 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string crl-file" -msgstr "{paramètre de @code{libvirt-configuration}} string crl-file" - -#. type: deftypevr -#: doc/guix.texi:18338 -msgid "Certificate revocation list path. If set to an empty string, then no CRL is loaded." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18343 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} boolean tls-no-sanity-cert" -msgstr "{paramètre de @code{libvirt-configuration}} boolean tls-no-sanity-cert" - -#. type: deftypevr -#: doc/guix.texi:18345 -msgid "Disable verification of our own server certificates." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18348 -msgid "When libvirtd starts it performs some sanity checks against its own certificates." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18353 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} boolean tls-no-verify-cert" -msgstr "{paramètre de @code{libvirt-configuration}} boolean tls-no-verify-cert" - -#. type: deftypevr -#: doc/guix.texi:18355 -msgid "Disable verification of client certificates." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18359 -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:18364 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} optional-list tls-allowed-dn-list" -msgstr "{paramètre de @code{libvirt-configuration}} optional-list tls-allowed-dn-list" - -#. type: deftypevr -#: doc/guix.texi:18366 -msgid "Whitelist of allowed x509 Distinguished Name." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18371 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} optional-list sasl-allowed-usernames" -msgstr "{paramètre de @code{libvirt-configuration}} optional-list sasl-allowed-usernames" - -#. type: deftypevr -#: doc/guix.texi:18374 -msgid "Whitelist of allowed SASL usernames. The format for username depends on the SASL authentication mechanism." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18379 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string tls-priority" -msgstr "{paramètre de @code{libvirt-configuration}} string tls-priority" - -#. type: deftypevr -#: doc/guix.texi:18383 -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:18385 -msgid "Defaults to @samp{\"NORMAL\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18388 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer max-clients" -msgstr "{paramètre de @code{libvirt-configuration}} integer max-clients" - -#. type: deftypevr -#: doc/guix.texi:18391 doc/guix.texi:18814 -msgid "Maximum number of concurrent client connections to allow over all sockets combined." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18393 -msgid "Defaults to @samp{5000}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18396 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer max-queued-clients" -msgstr "{paramètre de @code{libvirt-configuration}} integer max-queued-clients" - -#. type: deftypevr -#: doc/guix.texi:18400 -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:18405 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer max-anonymous-clients" -msgstr "{paramètre de @code{libvirt-configuration}} integer max-anonymous-clients" - -#. type: deftypevr -#: doc/guix.texi:18408 -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:18410 doc/guix.texi:18428 doc/guix.texi:18444 -msgid "Defaults to @samp{20}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18413 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer min-workers" -msgstr "{paramètre de @code{libvirt-configuration}} integer min-workers" - -#. type: deftypevr -#: doc/guix.texi:18415 -msgid "Number of workers to start up initially." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18420 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer max-workers" -msgstr "{paramètre de @code{libvirt-configuration}} integer max-workers" - -#. type: deftypevr -#: doc/guix.texi:18422 -msgid "Maximum number of worker threads." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18426 -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:18431 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer prio-workers" -msgstr "{paramètre de @code{libvirt-configuration}} integer prio-workers" - -#. type: deftypevr -#: doc/guix.texi:18435 -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:18440 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer max-requests" -msgstr "{paramètre de @code{libvirt-configuration}} integer max-requests" - -#. type: deftypevr -#: doc/guix.texi:18442 -msgid "Total global limit on concurrent RPC calls." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18447 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer max-client-requests" -msgstr "{paramètre de @code{libvirt-configuration}} integer max-client-requests" - -#. type: deftypevr -#: doc/guix.texi:18451 -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:18456 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer admin-min-workers" -msgstr "{paramètre de @code{libvirt-configuration}} integer admin-min-workers" - -#. type: deftypevr -#: doc/guix.texi:18458 -msgid "Same as @code{min-workers} but for the admin interface." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18463 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer admin-max-workers" -msgstr "{paramètre de @code{libvirt-configuration}} integer admin-max-workers" - -#. type: deftypevr -#: doc/guix.texi:18465 -msgid "Same as @code{max-workers} but for the admin interface." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18470 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer admin-max-clients" -msgstr "{paramètre de @code{libvirt-configuration}} integer admin-max-clients" - -#. type: deftypevr -#: doc/guix.texi:18472 -msgid "Same as @code{max-clients} but for the admin interface." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18477 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer admin-max-queued-clients" -msgstr "{paramètre de @code{libvirt-configuration}} integer admin-max-queued-clients" - -#. type: deftypevr -#: doc/guix.texi:18479 -msgid "Same as @code{max-queued-clients} but for the admin interface." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18484 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer admin-max-client-requests" -msgstr "{paramètre de @code{libvirt-configuration}} integer admin-max-client-requests" - -#. type: deftypevr -#: doc/guix.texi:18486 -msgid "Same as @code{max-client-requests} but for the admin interface." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18491 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer log-level" -msgstr "{paramètre de @code{libvirt-configuration}} integer log-level" - -#. type: deftypevr -#: doc/guix.texi:18493 doc/guix.texi:18716 -msgid "Logging level. 4 errors, 3 warnings, 2 information, 1 debug." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18498 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string log-filters" -msgstr "{paramètre de @code{libvirt-configuration}} string log-filters" - -#. type: deftypevr -#: doc/guix.texi:18500 doc/guix.texi:18723 -msgid "Logging filters." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18503 doc/guix.texi:18726 -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:18507 doc/guix.texi:18730 -msgid "x:name" -msgstr "" - -#. type: itemize -#: doc/guix.texi:18510 doc/guix.texi:18733 -msgid "x:+name" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18520 doc/guix.texi:18743 -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:18524 doc/guix.texi:18569 doc/guix.texi:18747 -#: doc/guix.texi:18792 -msgid "1: DEBUG" -msgstr "" - -#. type: itemize -#: doc/guix.texi:18527 doc/guix.texi:18572 doc/guix.texi:18750 -#: doc/guix.texi:18795 -msgid "2: INFO" -msgstr "" - -#. type: itemize -#: doc/guix.texi:18530 doc/guix.texi:18575 doc/guix.texi:18753 -#: doc/guix.texi:18798 -msgid "3: WARNING" -msgstr "" - -#. type: itemize -#: doc/guix.texi:18533 doc/guix.texi:18578 doc/guix.texi:18756 -#: doc/guix.texi:18801 -msgid "4: ERROR" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18538 doc/guix.texi:18761 -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:18540 doc/guix.texi:18763 -msgid "Defaults to @samp{\"3:remote 4:event\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18543 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string log-outputs" -msgstr "{paramètre de @code{libvirt-configuration}} string log-outputs" - -#. type: deftypevr -#: doc/guix.texi:18545 doc/guix.texi:18768 -msgid "Logging outputs." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18548 doc/guix.texi:18771 -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:18550 doc/guix.texi:18773 -#, no-wrap -msgid "x:stderr" -msgstr "" - -#. type: table -#: doc/guix.texi:18552 doc/guix.texi:18775 -msgid "output goes to stderr" -msgstr "" - -#. type: item -#: doc/guix.texi:18553 doc/guix.texi:18776 -#, no-wrap -msgid "x:syslog:name" -msgstr "" - -#. type: table -#: doc/guix.texi:18555 doc/guix.texi:18778 -msgid "use syslog for the output and use the given name as the ident" -msgstr "" - -#. type: item -#: doc/guix.texi:18556 doc/guix.texi:18779 -#, no-wrap -msgid "x:file:file_path" -msgstr "" - -#. type: table -#: doc/guix.texi:18558 doc/guix.texi:18781 -msgid "output to a file, with the given filepath" -msgstr "" - -#. type: item -#: doc/guix.texi:18559 doc/guix.texi:18782 -#, no-wrap -msgid "x:journald" -msgstr "" - -#. type: table -#: doc/guix.texi:18561 doc/guix.texi:18784 -msgid "output to journald logging system" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18565 doc/guix.texi:18788 -msgid "In all case the x prefix is the minimal level, acting as a filter" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18583 doc/guix.texi:18806 -msgid "Multiple outputs can be defined, they just need to be separated by spaces." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18585 doc/guix.texi:18808 -msgid "Defaults to @samp{\"3:stderr\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18588 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer audit-level" -msgstr "{paramètre de @code{libvirt-configuration}} integer audit-level" - -#. type: deftypevr -#: doc/guix.texi:18590 -msgid "Allows usage of the auditing subsystem to be altered" -msgstr "" - -#. type: itemize -#: doc/guix.texi:18594 -msgid "0: disable all auditing" -msgstr "" - -#. type: itemize -#: doc/guix.texi:18597 -msgid "1: enable auditing, only if enabled on host" -msgstr "" - -#. type: itemize -#: doc/guix.texi:18600 -msgid "2: enable auditing, and exit if disabled on host." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18607 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} boolean audit-logging" -msgstr "{paramètre de @code{libvirt-configuration}} boolean audit-logging" - -#. type: deftypevr -#: doc/guix.texi:18609 -msgid "Send audit messages via libvirt logging infrastructure." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18614 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} optional-string host-uuid" -msgstr "{paramètre de @code{libvirt-configuration}} optional-string host-uuid" - -#. type: deftypevr -#: doc/guix.texi:18616 -msgid "Host UUID. UUID must not have all digits be the same." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18621 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} string host-uuid-source" -msgstr "{paramètre de @code{libvirt-configuration}} string host-uuid-source" - -#. type: deftypevr -#: doc/guix.texi:18623 -msgid "Source to read host UUID." -msgstr "" - -#. type: itemize -#: doc/guix.texi:18627 -msgid "@code{smbios}: fetch the UUID from @code{dmidecode -s system-uuid}" -msgstr "" - -#. type: itemize -#: doc/guix.texi:18630 -msgid "@code{machine-id}: fetch the UUID from @code{/etc/machine-id}" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18635 -msgid "If @code{dmidecode} does not provide a valid UUID a temporary UUID will be generated." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18637 -msgid "Defaults to @samp{\"smbios\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18640 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer keepalive-interval" -msgstr "{paramètre de @code{libvirt-configuration}} integer keepalive-interval" - -#. type: deftypevr -#: doc/guix.texi:18645 -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:18650 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer keepalive-count" -msgstr "{paramètre de @code{libvirt-configuration}} integer keepalive-count" - -#. type: deftypevr -#: doc/guix.texi:18654 -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:18661 -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:18666 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-interval" -msgstr "{paramètre de @code{libvirt-configuration}} integer admin-keepalive-interval" - -#. type: deftypevr -#: doc/guix.texi:18668 doc/guix.texi:18675 -msgid "Same as above but for admin interface." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18673 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-count" -msgstr "{paramètre de @code{libvirt-configuration}} integer admin-keepalive-count" - -#. type: deftypevr -#: doc/guix.texi:18680 -#, no-wrap -msgid "{@code{libvirt-configuration} parameter} integer ovs-timeout" -msgstr "{paramètre de @code{libvirt-configuration}} integer ovs-timeout" - -#. type: deftypevr -#: doc/guix.texi:18682 -msgid "Timeout for Open vSwitch calls." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18686 -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:18693 -#, no-wrap -msgid "Virtlog daemon" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:18696 -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:18702 -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:18703 -#, no-wrap -msgid "{Scheme Variable} virtlog-service-type" -msgstr "{Variable Scheme} virtlog-service-type" - -#. type: deffn -#: doc/guix.texi:18706 -msgid "This is the type of the virtlog daemon. Its value must be a @code{virtlog-configuration}." -msgstr "" - -#. type: example -#: doc/guix.texi:18711 -#, no-wrap -msgid "" -"(service virtlog-service-type\n" -" (virtlog-configuration\n" -" (max-clients 1000)))\n" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18714 -#, no-wrap -msgid "{@code{virtlog-configuration} parameter} integer log-level" -msgstr "{paramètre de @code{virtlog-configuration}} integer log-level" - -#. type: deftypevr -#: doc/guix.texi:18721 -#, no-wrap -msgid "{@code{virtlog-configuration} parameter} string log-filters" -msgstr "{paramètre de @code{virtlog-configuration}} string log-filters" - -#. type: deftypevr -#: doc/guix.texi:18766 -#, no-wrap -msgid "{@code{virtlog-configuration} parameter} string log-outputs" -msgstr "{paramètre de @code{virtlog-configuration}} string log-outputs" - -#. type: deftypevr -#: doc/guix.texi:18811 -#, no-wrap -msgid "{@code{virtlog-configuration} parameter} integer max-clients" -msgstr "{paramètre de @code{virtlog-configuration}} integer max-clients" - -#. type: deftypevr -#: doc/guix.texi:18816 -msgid "Defaults to @samp{1024}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:18819 -#, no-wrap -msgid "{@code{virtlog-configuration} parameter} integer max-size" -msgstr "{paramètre de @code{virtlog-configuration}} integer max-size" - -#. type: deftypevr -#: doc/guix.texi:18821 -msgid "Maximum file size before rolling over." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18823 -msgid "Defaults to @samp{2MB}" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18826 -#, no-wrap -msgid "{@code{virtlog-configuration} parameter} integer max-backups" -msgstr "{paramètre de @code{virtlog-configuration}} integer max-backups" - -#. type: deftypevr -#: doc/guix.texi:18828 -msgid "Maximum number of backup files to keep." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:18830 -msgid "Defaults to @samp{3}" -msgstr "" - -#. type: subsubheading -#: doc/guix.texi:18833 -#, no-wrap -msgid "Transparent Emulation with QEMU" -msgstr "" - -#. type: cindex -#: doc/guix.texi:18835 -#, no-wrap -msgid "emulation" -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:18836 -#, no-wrap -msgid "binfmt_misc" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:18842 -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:18843 -#, no-wrap -msgid "{Scheme Variable} qemu-binfmt-service-type" -msgstr "{Variable Scheme} qemu-binfmt-service-type" - -#. type: defvr -#: doc/guix.texi:18848 -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: example -#: doc/guix.texi:18853 -#, no-wrap -msgid "" -"(service qemu-binfmt-service-type\n" -" (qemu-binfmt-configuration\n" -" (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"ppc\"))))\n" -msgstr "" - -#. type: defvr -#: doc/guix.texi:18859 -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:18861 -#, no-wrap -msgid "{Data Type} qemu-binfmt-configuration" -msgstr "{Type de données} qemu-binfmt-configuration" - -#. type: deftp -#: doc/guix.texi:18863 -msgid "This is the configuration for the @code{qemu-binfmt} service." -msgstr "" - -#. type: item -#: doc/guix.texi:18865 -#, no-wrap -msgid "@code{platforms} (default: @code{'()})" -msgstr "@code{platforms} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:18868 -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:18869 -#, no-wrap -msgid "@code{guix-support?} (default: @code{#f})" -msgstr "@code{guix-support?} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:18875 -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:18878 -msgid "For example, let's suppose you're on an x86_64 machine and you have this service:" -msgstr "" - -#. type: example -#: doc/guix.texi:18884 -#, no-wrap -msgid "" -"(service qemu-binfmt-service-type\n" -" (qemu-binfmt-configuration\n" -" (platforms (lookup-qemu-platforms \"arm\"))\n" -" (guix-support? #t)))\n" -msgstr "" - -#. type: table -#: doc/guix.texi:18887 -msgid "You can run:" -msgstr "" - -#. type: example -#: doc/guix.texi:18890 -#, no-wrap -msgid "guix build -s armhf-linux inkscape\n" -msgstr "" - -#. type: table -#: doc/guix.texi:18897 -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:18898 -#, no-wrap -msgid "@code{qemu} (default: @code{qemu})" -msgstr "@code{qemu} (par défaut : @code{qemu})" - -#. type: table -#: doc/guix.texi:18900 -msgid "The QEMU package to use." -msgstr "Le paquet QEMU à utiliser." - -#. type: deffn -#: doc/guix.texi:18903 -#, no-wrap -msgid "{Scheme Procedure} lookup-qemu-platforms @var{platforms}@dots{}" -msgstr "{Procédure Scheme} lookup-qemu-platforms @var{platforms}@dots{}" - -#. type: deffn -#: doc/guix.texi:18908 -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:18910 -#, no-wrap -msgid "{Scheme Procedure} qemu-platform? @var{obj}" -msgstr "{Procédure Scheme} qemu-platform? @var{obj}" - -#. type: deffn -#: doc/guix.texi:18912 -msgid "Return true if @var{obj} is a platform object." -msgstr "" - -#. type: deffn -#: doc/guix.texi:18914 -#, no-wrap -msgid "{Scheme Procedure} qemu-platform-name @var{platform}" -msgstr "{Procédure Scheme} qemu-platform-name @var{platform}" - -#. type: deffn -#: doc/guix.texi:18916 -msgid "Return the name of @var{platform}---a string such as @code{\"arm\"}." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:18928 -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:18929 -#, no-wrap -msgid "{Scheme Procedure} git-daemon-service [#:config (git-daemon-configuration)]" -msgstr "{Procédure Scheme} git-daemon-service [#:config (git-daemon-configuration)]" - -#. type: deffn -#: doc/guix.texi:18933 -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:18939 -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:18942 -#, no-wrap -msgid "{Data Type} git-daemon-configuration" -msgstr "{Type de données} git-daemon-configuration" - -#. type: deftp -#: doc/guix.texi:18944 -msgid "Data type representing the configuration for @code{git-daemon-service}." -msgstr "" - -#. type: item -#: doc/guix.texi:18946 doc/guix.texi:19002 -#, no-wrap -msgid "@code{package} (default: @var{git})" -msgstr "@code{package} (par défaut : @var{git})" - -#. type: table -#: doc/guix.texi:18948 doc/guix.texi:19004 -msgid "Package object of the Git distributed version control system." -msgstr "" - -#. type: item -#: doc/guix.texi:18949 doc/guix.texi:19008 -#, no-wrap -msgid "@code{export-all?} (default: @var{#f})" -msgstr "@code{export-all?} (par défaut : @var{#f})" - -#. type: table -#: doc/guix.texi:18952 -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:18953 -#, no-wrap -msgid "@code{base-path} (default: @file{/srv/git})" -msgstr "" - -#. type: table -#: doc/guix.texi:18958 -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:18959 -#, no-wrap -msgid "@code{user-path} (default: @var{#f})" -msgstr "@code{user-path} (par défaut : @var{#f})" - -#. type: table -#: doc/guix.texi:18966 -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:18967 -#, no-wrap -msgid "@code{listen} (default: @var{'()})" -msgstr "@code{listen} (par défaut : @var{'()})" - -#. type: table -#: doc/guix.texi:18970 -msgid "Whether to listen on specific IP addresses or hostnames, defaults to all." -msgstr "" - -#. type: item -#: doc/guix.texi:18971 -#, no-wrap -msgid "@code{port} (default: @var{#f})" -msgstr "@code{port} (par défaut : @var{#f})" - -#. type: table -#: doc/guix.texi:18973 -msgid "Whether to listen on an alternative port, which defaults to 9418." -msgstr "" - -#. type: item -#: doc/guix.texi:18974 -#, no-wrap -msgid "@code{whitelist} (default: @var{'()})" -msgstr "@code{whitelist} (par défaut : @var{'()})" - -#. type: table -#: doc/guix.texi:18976 -msgid "If not empty, only allow access to this list of directories." -msgstr "" - -#. type: item -#: doc/guix.texi:18977 -#, no-wrap -msgid "@code{extra-options} (default: @var{'()})" -msgstr "@code{extra-options} (par défaut : @var{'()})" - -#. type: table -#: doc/guix.texi:18980 -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:18994 -msgid "The @code{git://} protocol lacks authentication. When you pull from a repository fetched via @code{git://}, you don't know that the data you receive was modified is really coming from the specified host, and you have 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:18997 -msgid "Guix has a separate configuration data type for serving Git repositories over HTTP." -msgstr "" - -#. type: deftp -#: doc/guix.texi:18998 -#, no-wrap -msgid "{Data Type} git-http-configuration" -msgstr "{Type de données} git-http-configuration" - -#. type: deftp -#: doc/guix.texi:19000 -msgid "Data type representing the configuration for @code{git-http-service}." -msgstr "" - -#. type: item -#: doc/guix.texi:19005 -#, no-wrap -msgid "@code{git-root} (default: @file{/srv/git})" -msgstr "" - -#. type: table -#: doc/guix.texi:19007 -msgid "Directory containing the Git repositories to expose to the world." -msgstr "" - -#. type: table -#: doc/guix.texi:19011 -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:19012 -#, no-wrap -msgid "@code{uri-path} (default: @file{/git/})" -msgstr "" - -#. type: table -#: doc/guix.texi:19017 -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:19018 -#, no-wrap -msgid "@code{fcgiwrap-socket} (default: @code{127.0.0.1:9000})" -msgstr "@code{fcgiwrap-socket} (par défaut : @code{127.0.0.1:9000})" - -#. type: table -#: doc/guix.texi:19021 -msgid "The socket on which the @code{fcgiwrap} daemon is listening. @xref{Web Services}." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:19028 -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:19029 -#, no-wrap -msgid "{Scheme Procedure} git-http-nginx-location-configuration @" -msgstr "{Procédure Scheme} git-http-nginx-location-configuration @" - -#. type: deffn -#: doc/guix.texi:19034 -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: example -#: doc/guix.texi:19051 -#, no-wrap -msgid "" -"(service nginx-service-type\n" -" (nginx-configuration\n" -" (server-blocks\n" -" (list\n" -" (nginx-server-configuration\n" -" (listen '(\"443 ssl\"))\n" -" (server-name \"git.my-host.org\")\n" -" (ssl-certificate\n" -" \"/etc/letsencrypt/live/git.my-host.org/fullchain.pem\")\n" -" (ssl-certificate-key\n" -" \"/etc/letsencrypt/live/git.my-host.org/privkey.pem\")\n" -" (locations\n" -" (list\n" -" (git-http-nginx-location-configuration\n" -" (git-http-configuration (uri-path \"/\"))))))))))\n" -msgstr "" - -#. type: deffn -#: doc/guix.texi:19058 -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:19060 -#, no-wrap -msgid "Cgit Service" -msgstr "" - -#. type: cindex -#: doc/guix.texi:19062 -#, no-wrap -msgid "Cgit service" -msgstr "" - -#. type: cindex -#: doc/guix.texi:19063 -#, no-wrap -msgid "Git, web interface" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:19066 -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:19069 -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: example -#: doc/guix.texi:19072 -#, no-wrap -msgid "(service cgit-service-type)\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:19076 -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:19080 -msgid "Available @code{cgit-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19081 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} package package" -msgstr "{paramètre de @code{cgit-configuration}} package package" - -#. type: deftypevr -#: doc/guix.texi:19083 -msgid "The CGIT package." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19086 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} nginx-server-configuration-list nginx" -msgstr "{paramètre de @code{cgit-configuration}} nginx-server-configuration-list nginx" - -#. type: deftypevr -#: doc/guix.texi:19088 -msgid "NGINX configuration." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19091 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} file-object about-filter" -msgstr "{paramètre de @code{cgit-configuration}} file-object about-filter" - -#. type: deftypevr -#: doc/guix.texi:19094 -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:19099 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string agefile" -msgstr "{paramètre de @code{cgit-configuration}} string agefile" - -#. type: deftypevr -#: doc/guix.texi:19102 -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:19107 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} file-object auth-filter" -msgstr "{paramètre de @code{cgit-configuration}} file-object auth-filter" - -#. type: deftypevr -#: doc/guix.texi:19110 -msgid "Specifies a command that will be invoked for authenticating repository access." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19115 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string branch-sort" -msgstr "{paramètre de @code{cgit-configuration}} string branch-sort" - -#. type: deftypevr -#: doc/guix.texi:19118 -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:19120 -msgid "Defaults to @samp{\"name\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19123 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string cache-root" -msgstr "{paramètre de @code{cgit-configuration}} string cache-root" - -#. type: deftypevr -#: doc/guix.texi:19125 -msgid "Path used to store the cgit cache entries." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19127 -msgid "Defaults to @samp{\"/var/cache/cgit\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19130 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer cache-static-ttl" -msgstr "{paramètre de @code{cgit-configuration}} integer cache-static-ttl" - -#. type: deftypevr -#: doc/guix.texi:19133 -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:19135 doc/guix.texi:19578 -msgid "Defaults to @samp{-1}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19138 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer cache-dynamic-ttl" -msgstr "{paramètre de @code{cgit-configuration}} integer cache-dynamic-ttl" - -#. type: deftypevr -#: doc/guix.texi:19141 -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:19146 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer cache-repo-ttl" -msgstr "{paramètre de @code{cgit-configuration}} integer cache-repo-ttl" - -#. type: deftypevr -#: doc/guix.texi:19149 -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:19154 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer cache-root-ttl" -msgstr "{paramètre de @code{cgit-configuration}} integer cache-root-ttl" - -#. type: deftypevr -#: doc/guix.texi:19157 -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:19162 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer cache-scanrc-ttl" -msgstr "{paramètre de @code{cgit-configuration}} integer cache-scanrc-ttl" - -#. type: deftypevr -#: doc/guix.texi:19165 -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:19170 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer cache-about-ttl" -msgstr "{paramètre de @code{cgit-configuration}} integer cache-about-ttl" - -#. type: deftypevr -#: doc/guix.texi:19173 -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:19178 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer cache-snapshot-ttl" -msgstr "{paramètre de @code{cgit-configuration}} integer cache-snapshot-ttl" - -#. type: deftypevr -#: doc/guix.texi:19181 -msgid "Number which specifies the time-to-live, in minutes, for the cached version of snapshots." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19186 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer cache-size" -msgstr "{paramètre de @code{cgit-configuration}} integer cache-size" - -#. type: deftypevr -#: doc/guix.texi:19189 -msgid "The maximum number of entries in the cgit cache. When set to @samp{0}, caching is disabled." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19194 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean case-sensitive-sort?" -msgstr "{paramètre de @code{cgit-configuration}} boolean case-sensitive-sort?" - -#. type: deftypevr -#: doc/guix.texi:19196 -msgid "Sort items in the repo list case sensitively." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19201 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} list clone-prefix" -msgstr "{paramètre de @code{cgit-configuration}} list clone-prefix" - -#. type: deftypevr -#: doc/guix.texi:19204 -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:19209 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} list clone-url" -msgstr "{paramètre de @code{cgit-configuration}} list clone-url" - -#. type: deftypevr -#: doc/guix.texi:19211 -msgid "List of @code{clone-url} templates." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19216 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} file-object commit-filter" -msgstr "{paramètre de @code{cgit-configuration}} file-object commit-filter" - -#. type: deftypevr -#: doc/guix.texi:19218 -msgid "Command which will be invoked to format commit messages." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19223 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string commit-sort" -msgstr "{paramètre de @code{cgit-configuration}} string commit-sort" - -#. type: deftypevr -#: doc/guix.texi:19227 doc/guix.texi:19785 -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:19229 -msgid "Defaults to @samp{\"git log\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19232 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} file-object css" -msgstr "{paramètre de @code{cgit-configuration}} file-object css" - -#. type: deftypevr -#: doc/guix.texi:19234 -msgid "URL which specifies the css document to include in all cgit pages." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19236 -msgid "Defaults to @samp{\"/share/cgit/cgit.css\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19239 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} file-object email-filter" -msgstr "{paramètre de @code{cgit-configuration}} file-object email-filter" - -#. type: deftypevr -#: doc/guix.texi:19243 -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:19248 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean embedded?" -msgstr "{paramètre de @code{cgit-configuration}} boolean embedded?" - -#. type: deftypevr -#: doc/guix.texi:19251 -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:19256 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean enable-commit-graph?" -msgstr "{paramètre de @code{cgit-configuration}} boolean enable-commit-graph?" - -#. type: deftypevr -#: doc/guix.texi:19260 -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:19265 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean enable-filter-overrides?" -msgstr "{paramètre de @code{cgit-configuration}} boolean enable-filter-overrides?" - -#. type: deftypevr -#: doc/guix.texi:19268 -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:19273 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean enable-follow-links?" -msgstr "{paramètre de @code{cgit-configuration}} boolean enable-follow-links?" - -#. type: deftypevr -#: doc/guix.texi:19276 -msgid "Flag which, when set to @samp{#t}, allows users to follow a file in the log view." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19281 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean enable-http-clone?" -msgstr "{paramètre de @code{cgit-configuration}} boolean enable-http-clone?" - -#. type: deftypevr -#: doc/guix.texi:19284 -msgid "If set to @samp{#t}, cgit will act as an dumb HTTP endpoint for Git clones." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19289 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean enable-index-links?" -msgstr "{paramètre de @code{cgit-configuration}} boolean enable-index-links?" - -#. type: deftypevr -#: doc/guix.texi:19292 -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:19297 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean enable-index-owner?" -msgstr "{paramètre de @code{cgit-configuration}} boolean enable-index-owner?" - -#. type: deftypevr -#: doc/guix.texi:19300 -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:19305 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean enable-log-filecount?" -msgstr "{paramètre de @code{cgit-configuration}} boolean enable-log-filecount?" - -#. type: deftypevr -#: doc/guix.texi:19308 -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:19313 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean enable-log-linecount?" -msgstr "{paramètre de @code{cgit-configuration}} boolean enable-log-linecount?" - -#. type: deftypevr -#: doc/guix.texi:19316 -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:19321 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean enable-remote-branches?" -msgstr "{paramètre de @code{cgit-configuration}} boolean enable-remote-branches?" - -#. type: deftypevr -#: doc/guix.texi:19324 doc/guix.texi:19848 -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:19329 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean enable-subject-links?" -msgstr "{paramètre de @code{cgit-configuration}} boolean enable-subject-links?" - -#. type: deftypevr -#: doc/guix.texi:19333 -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:19338 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean enable-html-serving?" -msgstr "{paramètre de @code{cgit-configuration}} boolean enable-html-serving?" - -#. type: deftypevr -#: doc/guix.texi:19342 -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:19347 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean enable-tree-linenumbers?" -msgstr "{paramètre de @code{cgit-configuration}} boolean enable-tree-linenumbers?" - -#. type: deftypevr -#: doc/guix.texi:19350 -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:19355 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean enable-git-config?" -msgstr "{paramètre de @code{cgit-configuration}} boolean enable-git-config?" - -#. type: deftypevr -#: doc/guix.texi:19358 -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:19363 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} file-object favicon" -msgstr "{paramètre de @code{cgit-configuration}} file-object favicon" - -#. type: deftypevr -#: doc/guix.texi:19365 -msgid "URL used as link to a shortcut icon for cgit." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19367 -msgid "Defaults to @samp{\"/favicon.ico\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19370 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string footer" -msgstr "{paramètre de @code{cgit-configuration}} string footer" - -#. type: deftypevr -#: doc/guix.texi:19374 -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:19379 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string head-include" -msgstr "{paramètre de @code{cgit-configuration}} string head-include" - -#. type: deftypevr -#: doc/guix.texi:19382 -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:19387 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string header" -msgstr "{paramètre de @code{cgit-configuration}} string header" - -#. type: deftypevr -#: doc/guix.texi:19390 -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:19395 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} file-object include" -msgstr "{paramètre de @code{cgit-configuration}} file-object include" - -#. type: deftypevr -#: doc/guix.texi:19398 -msgid "Name of a configfile to include before the rest of the current config- file is parsed." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19403 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string index-header" -msgstr "{paramètre de @code{cgit-configuration}} string index-header" - -#. type: deftypevr -#: doc/guix.texi:19406 -msgid "The content of the file specified with this option will be included verbatim above the repository index." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19411 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string index-info" -msgstr "{paramètre de @code{cgit-configuration}} string index-info" - -#. type: deftypevr -#: doc/guix.texi:19414 -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:19419 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean local-time?" -msgstr "{paramètre de @code{cgit-configuration}} boolean local-time?" - -#. type: deftypevr -#: doc/guix.texi:19422 -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:19427 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} file-object logo" -msgstr "{paramètre de @code{cgit-configuration}} file-object logo" - -#. type: deftypevr -#: doc/guix.texi:19430 -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:19432 -msgid "Defaults to @samp{\"/share/cgit/cgit.png\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19435 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string logo-link" -msgstr "{paramètre de @code{cgit-configuration}} string logo-link" - -#. type: deftypevr -#: doc/guix.texi:19437 doc/guix.texi:19894 -msgid "URL loaded when clicking on the cgit logo image." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19442 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} file-object owner-filter" -msgstr "{paramètre de @code{cgit-configuration}} file-object owner-filter" - -#. type: deftypevr -#: doc/guix.texi:19445 -msgid "Command which will be invoked to format the Owner column of the main page." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19450 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer max-atom-items" -msgstr "{paramètre de @code{cgit-configuration}} integer max-atom-items" - -#. type: deftypevr -#: doc/guix.texi:19452 -msgid "Number of items to display in atom feeds view." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19454 doc/guix.texi:19689 doc/guix.texi:19697 -#: doc/guix.texi:19705 -msgid "Defaults to @samp{10}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19457 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer max-commit-count" -msgstr "{paramètre de @code{cgit-configuration}} integer max-commit-count" - -#. type: deftypevr -#: doc/guix.texi:19459 -msgid "Number of entries to list per page in \"log\" view." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19461 doc/guix.texi:19476 -msgid "Defaults to @samp{50}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19464 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer max-message-length" -msgstr "{paramètre de @code{cgit-configuration}} integer max-message-length" - -#. type: deftypevr -#: doc/guix.texi:19466 -msgid "Number of commit message characters to display in \"log\" view." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19468 doc/guix.texi:19484 -msgid "Defaults to @samp{80}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19471 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer max-repo-count" -msgstr "{paramètre de @code{cgit-configuration}} integer max-repo-count" - -#. type: deftypevr -#: doc/guix.texi:19474 -msgid "Specifies the number of entries to list per page on the repository index page." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19479 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer max-repodesc-length" -msgstr "{paramètre de @code{cgit-configuration}} integer max-repodesc-length" - -#. type: deftypevr -#: doc/guix.texi:19482 -msgid "Specifies the maximum number of repo description characters to display on the repository index page." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19487 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer max-blob-size" -msgstr "{paramètre de @code{cgit-configuration}} integer max-blob-size" - -#. type: deftypevr -#: doc/guix.texi:19489 -msgid "Specifies the maximum size of a blob to display HTML for in KBytes." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19494 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string max-stats" -msgstr "{paramètre de @code{cgit-configuration}} string max-stats" - -#. type: deftypevr -#: doc/guix.texi:19497 -msgid "Maximum statistics period. Valid values are @samp{week},@samp{month}, @samp{quarter} and @samp{year}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19502 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} mimetype-alist mimetype" -msgstr "{paramètre de @code{cgit-configuration}} mimetype-alist mimetype" - -#. type: deftypevr -#: doc/guix.texi:19504 -msgid "Mimetype for the specified filename extension." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19508 -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 "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19511 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} file-object mimetype-file" -msgstr "{paramètre de @code{cgit-configuration}} file-object mimetype-file" - -#. type: deftypevr -#: doc/guix.texi:19513 -msgid "Specifies the file to use for automatic mimetype lookup." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19518 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string module-link" -msgstr "{paramètre de @code{cgit-configuration}} string module-link" - -#. type: deftypevr -#: doc/guix.texi:19521 -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:19526 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean nocache?" -msgstr "{paramètre de @code{cgit-configuration}} boolean nocache?" - -#. type: deftypevr -#: doc/guix.texi:19528 -msgid "If set to the value @samp{#t} caching will be disabled." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19533 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean noplainemail?" -msgstr "{paramètre de @code{cgit-configuration}} boolean noplainemail?" - -#. type: deftypevr -#: doc/guix.texi:19536 -msgid "If set to @samp{#t} showing full author email addresses will be disabled." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19541 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean noheader?" -msgstr "{paramètre de @code{cgit-configuration}} boolean noheader?" - -#. type: deftypevr -#: doc/guix.texi:19544 -msgid "Flag which, when set to @samp{#t}, will make cgit omit the standard header on all pages." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19549 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} project-list project-list" -msgstr "{paramètre de @code{cgit-configuration}} project-list project-list" - -#. type: deftypevr -#: doc/guix.texi:19553 -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:19558 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} file-object readme" -msgstr "{paramètre de @code{cgit-configuration}} file-object readme" - -#. type: deftypevr -#: doc/guix.texi:19560 -msgid "Text which will be used as default value for @code{cgit-repo-readme}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19565 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean remove-suffix?" -msgstr "{paramètre de @code{cgit-configuration}} boolean remove-suffix?" - -#. type: deftypevr -#: doc/guix.texi:19569 -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:19574 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer renamelimit" -msgstr "{paramètre de @code{cgit-configuration}} integer renamelimit" - -#. type: deftypevr -#: doc/guix.texi:19576 -msgid "Maximum number of files to consider when detecting renames." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19581 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string repository-sort" -msgstr "{paramètre de @code{cgit-configuration}} string repository-sort" - -#. type: deftypevr -#: doc/guix.texi:19583 -msgid "The way in which repositories in each section are sorted." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19588 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} robots-list robots" -msgstr "{paramètre de @code{cgit-configuration}} robots-list robots" - -#. type: deftypevr -#: doc/guix.texi:19590 -msgid "Text used as content for the @code{robots} meta-tag." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19592 -msgid "Defaults to @samp{(\"noindex\" \"nofollow\")}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19595 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string root-desc" -msgstr "{paramètre de @code{cgit-configuration}} string root-desc" - -#. type: deftypevr -#: doc/guix.texi:19597 -msgid "Text printed below the heading on the repository index page." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19599 -msgid "Defaults to @samp{\"a fast webinterface for the git dscm\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19602 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string root-readme" -msgstr "{paramètre de @code{cgit-configuration}} string root-readme" - -#. type: deftypevr -#: doc/guix.texi:19605 -msgid "The content of the file specified with this option will be included verbatim below thef \"about\" link on the repository index page." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19610 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string root-title" -msgstr "{paramètre de @code{cgit-configuration}} string root-title" - -#. type: deftypevr -#: doc/guix.texi:19612 -msgid "Text printed as heading on the repository index page." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19617 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean scan-hidden-path" -msgstr "{paramètre de @code{cgit-configuration}} boolean scan-hidden-path" - -#. type: deftypevr -#: doc/guix.texi:19623 -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:19628 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} list snapshots" -msgstr "{paramètre de @code{cgit-configuration}} list snapshots" - -#. type: deftypevr -#: doc/guix.texi:19631 -msgid "Text which specifies the default set of snapshot formats that cgit generates links for." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19636 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} repository-directory repository-directory" -msgstr "{paramètre de @code{cgit-configuration}} repository-directory repository-directory" - -#. type: deftypevr -#: doc/guix.texi:19639 -msgid "Name of the directory to scan for repositories (represents @code{scan-path})." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19641 -msgid "Defaults to @samp{\"/srv/git\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19644 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string section" -msgstr "{paramètre de @code{cgit-configuration}} string section" - -#. type: deftypevr -#: doc/guix.texi:19647 doc/guix.texi:19963 -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:19652 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string section-sort" -msgstr "{paramètre de @code{cgit-configuration}} string section-sort" - -#. type: deftypevr -#: doc/guix.texi:19655 -msgid "Flag which, when set to @samp{1}, will sort the sections on the repository listing by name." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19660 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer section-from-path" -msgstr "{paramètre de @code{cgit-configuration}} integer section-from-path" - -#. type: deftypevr -#: doc/guix.texi:19663 -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:19668 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} boolean side-by-side-diffs?" -msgstr "{paramètre de @code{cgit-configuration}} boolean side-by-side-diffs?" - -#. type: deftypevr -#: doc/guix.texi:19671 -msgid "If set to @samp{#t} shows side-by-side diffs instead of unidiffs per default." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19676 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} file-object source-filter" -msgstr "{paramètre de @code{cgit-configuration}} file-object source-filter" - -#. type: deftypevr -#: doc/guix.texi:19679 -msgid "Specifies a command which will be invoked to format plaintext blobs in the tree view." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19684 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer summary-branches" -msgstr "{paramètre de @code{cgit-configuration}} integer summary-branches" - -#. type: deftypevr -#: doc/guix.texi:19687 -msgid "Specifies the number of branches to display in the repository \"summary\" view." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19692 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer summary-log" -msgstr "{paramètre de @code{cgit-configuration}} integer summary-log" - -#. type: deftypevr -#: doc/guix.texi:19695 -msgid "Specifies the number of log entries to display in the repository \"summary\" view." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19700 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} integer summary-tags" -msgstr "{paramètre de @code{cgit-configuration}} integer summary-tags" - -#. type: deftypevr -#: doc/guix.texi:19703 -msgid "Specifies the number of tags to display in the repository \"summary\" view." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19708 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string strict-export" -msgstr "{paramètre de @code{cgit-configuration}} string strict-export" - -#. type: deftypevr -#: doc/guix.texi:19711 -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:19716 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} string virtual-root" -msgstr "{paramètre de @code{cgit-configuration}} string virtual-root" - -#. type: deftypevr -#: doc/guix.texi:19718 -msgid "URL which, if specified, will be used as root for all cgit links." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19720 -msgid "Defaults to @samp{\"/\"}." -msgstr "La valeur par défaut @samp{#1}." - -#. type: deftypevr -#: doc/guix.texi:19723 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} repository-cgit-configuration-list repositories" -msgstr "{paramètre de @code{cgit-configuration}} repository-cgit-configuration-list repositories" - -#. type: deftypevr -#: doc/guix.texi:19725 -msgid "A list of @dfn{cgit-repo} records to use with config." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19729 -msgid "Available @code{repository-cgit-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19730 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-list snapshots" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-list snapshots" - -#. type: deftypevr -#: doc/guix.texi:19733 -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:19738 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-file-object source-filter" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-file-object source-filter" - -#. type: deftypevr -#: doc/guix.texi:19740 -msgid "Override the default @code{source-filter}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19745 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-string url" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string url" - -#. type: deftypevr -#: doc/guix.texi:19747 -msgid "The relative URL used to access the repository." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19752 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-file-object about-filter" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-file-object about-filter" - -#. type: deftypevr -#: doc/guix.texi:19754 -msgid "Override the default @code{about-filter}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19759 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-string branch-sort" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string branch-sort" - -#. type: deftypevr -#: doc/guix.texi:19762 -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:19767 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-list clone-url" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-list clone-url" - -#. type: deftypevr -#: doc/guix.texi:19769 -msgid "A list of URLs which can be used to clone repo." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19774 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-file-object commit-filter" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-file-object commit-filter" - -#. type: deftypevr -#: doc/guix.texi:19776 -msgid "Override the default @code{commit-filter}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19781 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-string commit-sort" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string commit-sort" - -#. type: deftypevr -#: doc/guix.texi:19790 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-string defbranch" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string defbranch" - -#. type: deftypevr -#: doc/guix.texi:19795 -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:19800 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-string desc" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string desc" - -#. type: deftypevr -#: doc/guix.texi:19802 -msgid "The value to show as repository description." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19807 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-string homepage" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string homepage" - -#. type: deftypevr -#: doc/guix.texi:19809 -msgid "The value to show as repository homepage." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19814 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-file-object email-filter" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-file-object email-filter" - -#. type: deftypevr -#: doc/guix.texi:19816 -msgid "Override the default @code{email-filter}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19821 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-commit-graph?" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean enable-commit-graph?" - -#. type: deftypevr -#: doc/guix.texi:19824 -msgid "A flag which can be used to disable the global setting @code{enable-commit-graph?}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19829 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-log-filecount?" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean enable-log-filecount?" - -#. type: deftypevr -#: doc/guix.texi:19832 -msgid "A flag which can be used to disable the global setting @code{enable-log-filecount?}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19837 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-log-linecount?" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean enable-log-linecount?" - -#. type: deftypevr -#: doc/guix.texi:19840 -msgid "A flag which can be used to disable the global setting @code{enable-log-linecount?}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19845 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-remote-branches?" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean enable-remote-branches?" - -#. type: deftypevr -#: doc/guix.texi:19853 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-subject-links?" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean enable-subject-links?" - -#. type: deftypevr -#: doc/guix.texi:19856 -msgid "A flag which can be used to override the global setting @code{enable-subject-links?}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19861 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-boolean enable-html-serving?" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean enable-html-serving?" - -#. type: deftypevr -#: doc/guix.texi:19864 -msgid "A flag which can be used to override the global setting @code{enable-html-serving?}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19869 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-boolean hide?" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean hide?" - -#. type: deftypevr -#: doc/guix.texi:19872 -msgid "Flag which, when set to @code{#t}, hides the repository from the repository index." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19877 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-boolean ignore?" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-boolean ignore?" - -#. type: deftypevr -#: doc/guix.texi:19879 -msgid "Flag which, when set to @samp{#t}, ignores the repository." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19884 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-file-object logo" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-file-object logo" - -#. type: deftypevr -#: doc/guix.texi:19887 -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:19892 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-string logo-link" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string logo-link" - -#. type: deftypevr -#: doc/guix.texi:19899 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-file-object owner-filter" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-file-object owner-filter" - -#. type: deftypevr -#: doc/guix.texi:19901 -msgid "Override the default @code{owner-filter}." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19906 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-string module-link" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string module-link" - -#. type: deftypevr -#: doc/guix.texi:19910 -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:19915 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} module-link-path module-link-path" -msgstr "{paramètre de @code{repository-cgit-configuration}} module-link-path module-link-path" - -#. type: deftypevr -#: doc/guix.texi:19919 -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:19924 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-string max-stats" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string max-stats" - -#. type: deftypevr -#: doc/guix.texi:19926 -msgid "Override the default maximum statistics period." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19931 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-string name" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string name" - -#. type: deftypevr -#: doc/guix.texi:19933 -msgid "The value to show as repository name." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19938 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-string owner" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string owner" - -#. type: deftypevr -#: doc/guix.texi:19940 -msgid "A value used to identify the owner of the repository." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19945 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-string path" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string path" - -#. type: deftypevr -#: doc/guix.texi:19947 -msgid "An absolute path to the repository directory." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19952 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-string readme" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string readme" - -#. type: deftypevr -#: doc/guix.texi:19955 -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:19960 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-string section" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-string section" - -#. type: deftypevr -#: doc/guix.texi:19968 -#, no-wrap -msgid "{@code{repository-cgit-configuration} parameter} repo-list extra-options" -msgstr "{paramètre de @code{repository-cgit-configuration}} repo-list extra-options" - -#. type: deftypevr -#: doc/guix.texi:19970 doc/guix.texi:19979 -msgid "Extra options will be appended to cgitrc file." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19977 -#, no-wrap -msgid "{@code{cgit-configuration} parameter} list extra-options" -msgstr "{paramètre de @code{cgit-configuration}} list extra-options" - -#. type: Plain text -#: doc/guix.texi:19991 -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:19993 -msgid "Available @code{opaque-cgit-configuration} fields are:" -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19994 -#, no-wrap -msgid "{@code{opaque-cgit-configuration} parameter} package cgit" -msgstr "{paramètre de @code{opaque-cgit-configuration}} package cgit" - -#. type: deftypevr -#: doc/guix.texi:19996 -msgid "The cgit package." -msgstr "" - -#. type: deftypevr -#: doc/guix.texi:19998 -#, no-wrap -msgid "{@code{opaque-cgit-configuration} parameter} string string" -msgstr "{paramètre de @code{opaque-cgit-configuration}} string string" - -#. type: deftypevr -#: doc/guix.texi:20000 -msgid "The contents of the @code{cgitrc}, as a string." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20004 -msgid "For example, if your @code{cgitrc} is just the empty string, you could instantiate a cgit service like this:" -msgstr "" - -#. type: example -#: doc/guix.texi:20009 -#, no-wrap -msgid "" -"(service cgit-service-type\n" -" (opaque-cgit-configuration\n" -" (cgitrc \"\")))\n" -msgstr "" - -#. type: subsubheading -#: doc/guix.texi:20015 -#, no-wrap -msgid "The Battle for Wesnoth Service" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20016 -#, no-wrap -msgid "wesnothd" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20020 -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:20021 -#, no-wrap -msgid "{Scheme Variable} wesnothd-service-type" -msgstr "{Variable Scheme} wesnothd-service-type" - -#. type: defvar -#: doc/guix.texi:20025 -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: example -#: doc/guix.texi:20028 -#, no-wrap -msgid "(service wesnothd-service-type)\n" -msgstr "" - -#. type: deftp -#: doc/guix.texi:20031 -#, no-wrap -msgid "{Data Type} wesnothd-configuration" -msgstr "{Type de données} wesnothd-configuration" - -#. type: deftp -#: doc/guix.texi:20033 -msgid "Data type representing the configuration of @command{wesnothd}." -msgstr "" - -#. type: item -#: doc/guix.texi:20035 -#, no-wrap -msgid "@code{package} (default: @code{wesnoth-server})" -msgstr "@code{package} (par défaut : @code{wesnoth-server})" - -#. type: table -#: doc/guix.texi:20037 -msgid "The wesnoth server package to use." -msgstr "" - -#. type: item -#: doc/guix.texi:20038 -#, no-wrap -msgid "@code{port} (default: @code{15000})" -msgstr "@code{port} (par défaut : @code{15000})" - -#. type: table -#: doc/guix.texi:20040 -msgid "The port to bind the server to." -msgstr "" - -#. type: cindex -#: doc/guix.texi:20046 -#, no-wrap -msgid "sysctl" -msgstr "" - -#. type: subsubheading -#: doc/guix.texi:20047 -#, no-wrap -msgid "System Control Service" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20051 -msgid "The @code{(gnu services sysctl)} provides a service to configure kernel parameters at boot." -msgstr "" - -#. type: defvr -#: doc/guix.texi:20052 -#, no-wrap -msgid "{Scheme Variable} sysctl-service-type" -msgstr "{Variable Scheme} sysctl-service-type" - -#. type: defvr -#: doc/guix.texi:20056 -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: example -#: doc/guix.texi:20061 -#, no-wrap -msgid "" -"(service sysctl-service-type\n" -" (sysctl-configuration\n" -" (settings '((\"net.ipv4.ip_forward\" . \"1\")))))\n" -msgstr "" - -#. type: deftp -#: doc/guix.texi:20064 -#, no-wrap -msgid "{Data Type} sysctl-configuration" -msgstr "{Type de données} sysctl-configuration" - -#. type: deftp -#: doc/guix.texi:20066 -msgid "The data type representing the configuration of @command{sysctl}." -msgstr "" - -#. type: item -#: doc/guix.texi:20068 -#, no-wrap -msgid "@code{sysctl} (default: @code{(file-append procps \"/sbin/sysctl\"})" -msgstr "@code{sysctl} (par défaut : @code{(file-append procps \"/sbin/sysctl\"})" - -#. type: table -#: doc/guix.texi:20070 -msgid "The @command{sysctl} executable to use." -msgstr "" - -#. type: item -#: doc/guix.texi:20071 -#, no-wrap -msgid "@code{settings} (default: @code{'()})" -msgstr "@code{settings} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:20073 -msgid "An association list specifies kernel parameters and their values." -msgstr "" - -#. type: cindex -#: doc/guix.texi:20076 -#, no-wrap -msgid "lirc" -msgstr "" - -#. type: subsubheading -#: doc/guix.texi:20077 -#, no-wrap -msgid "Lirc Service" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20080 -msgid "The @code{(gnu services lirc)} module provides the following service." -msgstr "" - -#. type: deffn -#: doc/guix.texi:20081 -#, no-wrap -msgid "{Scheme Procedure} lirc-service [#:lirc lirc] @" -msgstr "{Procédure Scheme} lirc-service [#:lirc lirc] @" - -#. type: deffn -#: doc/guix.texi:20086 -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:20090 -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:20093 -msgid "Finally, @var{extra-options} is a list of additional command-line options passed to @command{lircd}." -msgstr "" - -#. type: cindex -#: doc/guix.texi:20095 -#, no-wrap -msgid "spice" -msgstr "" - -#. type: subsubheading -#: doc/guix.texi:20096 -#, no-wrap -msgid "Spice Service" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20099 -msgid "The @code{(gnu services spice)} module provides the following service." -msgstr "" - -#. type: deffn -#: doc/guix.texi:20100 -#, no-wrap -msgid "{Scheme Procedure} spice-vdagent-service [#:spice-vdagent]" -msgstr "{Procédure Scheme} spice-vdagent-service [#:spice-vdagent]" - -#. type: deffn -#: doc/guix.texi:20104 -msgid "Returns a service that runs @url{http://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: subsubsection -#: doc/guix.texi:20106 -#, no-wrap -msgid "Dictionary Services" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20107 -#, no-wrap -msgid "dictionary" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20109 -msgid "The @code{(gnu services dict)} module provides the following service:" -msgstr "" - -#. type: deffn -#: doc/guix.texi:20110 -#, no-wrap -msgid "{Scheme Procedure} dicod-service [#:config (dicod-configuration)]" -msgstr "{Procédure Scheme} dicod-service [#:config (dicod-configuration)]" - -#. type: deffn -#: doc/guix.texi:20113 -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:20117 -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." -msgstr "" - -#. type: deffn -#: doc/guix.texi:20121 -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:20123 -#, no-wrap -msgid "{Data Type} dicod-configuration" -msgstr "{Type de données} dicod-configuration" - -#. type: deftp -#: doc/guix.texi:20125 -msgid "Data type representing the configuration of dicod." -msgstr "" - -#. type: item -#: doc/guix.texi:20127 -#, no-wrap -msgid "@code{dico} (default: @var{dico})" -msgstr "@code{dico} (par défaut : @var{dico})" - -#. type: table -#: doc/guix.texi:20129 -msgid "Package object of the GNU Dico dictionary server." -msgstr "" - -#. type: item -#: doc/guix.texi:20130 -#, no-wrap -msgid "@code{interfaces} (default: @var{'(\"localhost\")})" -msgstr "@code{interfaces} (par défaut : @var{'(\"localhost\")})" - -#. type: table -#: doc/guix.texi:20134 -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:20135 -#, no-wrap -msgid "@code{handlers} (default: @var{'()})" -msgstr "@code{handlers} (par défaut : @var{'()})" - -#. type: table -#: doc/guix.texi:20137 -msgid "List of @code{} objects denoting handlers (module instances)." -msgstr "" - -#. type: item -#: doc/guix.texi:20138 -#, no-wrap -msgid "@code{databases} (default: @var{(list %dicod-database:gcide)})" -msgstr "@code{databases} (par défaut : @var{(list %dicod-database:gcide)})" - -#. type: table -#: doc/guix.texi:20140 -msgid "List of @code{} objects denoting dictionaries to be served." -msgstr "" - -#. type: deftp -#: doc/guix.texi:20143 -#, no-wrap -msgid "{Data Type} dicod-handler" -msgstr "{Type de données} dicod-handler" - -#. type: deftp -#: doc/guix.texi:20145 -msgid "Data type representing a dictionary handler (module instance)." -msgstr "" - -#. type: table -#: doc/guix.texi:20149 -msgid "Name of the handler (module instance)." -msgstr "" - -#. type: item -#: doc/guix.texi:20150 -#, no-wrap -msgid "@code{module} (default: @var{#f})" -msgstr "@code{module} (par défaut : @var{#f})" - -#. type: table -#: doc/guix.texi:20154 -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: code{#1} -#: doc/guix.texi:20155 doc/guix.texi:20175 -#, no-wrap -msgid "options" -msgstr "" - -#. type: table -#: doc/guix.texi:20157 -msgid "List of strings or gexps representing the arguments for the module handler" -msgstr "" - -#. type: deftp -#: doc/guix.texi:20160 -#, no-wrap -msgid "{Data Type} dicod-database" -msgstr "{Type de données} dicod-database" - -#. type: deftp -#: doc/guix.texi:20162 -msgid "Data type representing a dictionary database." -msgstr "" - -#. type: table -#: doc/guix.texi:20166 -msgid "Name of the database, will be used in DICT commands." -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:20167 -#, no-wrap -msgid "handler" -msgstr "" - -#. type: table -#: doc/guix.texi:20170 -msgid "Name of the dicod handler (module instance) used by this database (@pxref{Handlers,,, dico, GNU Dico Manual})." -msgstr "" - -#. type: item -#: doc/guix.texi:20171 -#, no-wrap -msgid "@code{complex?} (default: @var{#f})" -msgstr "@code{complex?} (par défaut : @var{#f})" - -#. type: table -#: doc/guix.texi:20174 -msgid "Whether the database configuration complex. The complex configuration will need a corresponding @code{} object, otherwise not." -msgstr "" - -#. type: table -#: doc/guix.texi:20178 -msgid "List of strings or gexps representing the arguments for the database (@pxref{Databases,,, dico, GNU Dico Manual})." -msgstr "" - -#. type: defvr -#: doc/guix.texi:20181 -#, no-wrap -msgid "{Scheme Variable} %dicod-database:gcide" -msgstr "{Variable Scheme} %dicod-database:gcide" - -#. type: defvr -#: doc/guix.texi:20184 -msgid "A @code{} object serving the GNU Collaborative International Dictionary of English using the @code{gcide} package." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20187 -msgid "The following is an example @code{dicod-service} configuration." -msgstr "" - -#. type: example -#: doc/guix.texi:20202 -#, no-wrap -msgid "" -"(dicod-service #:config\n" -" (dicod-configuration\n" -" (handlers (list (dicod-handler\n" -" (name \"wordnet\")\n" -" (module \"dictorg\")\n" -" (options\n" -" (list #~(string-append \"dbdir=\" #$wordnet))))))\n" -" (databases (list (dicod-database\n" -" (name \"wordnet\")\n" -" (complex? #t)\n" -" (handler \"wordnet\")\n" -" (options '(\"database=wn\")))\n" -" %dicod-database:gcide))))\n" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20207 -#, no-wrap -msgid "setuid programs" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20217 -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:20224 -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:20230 -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:20233 -#, no-wrap -msgid "#~(string-append #$shadow \"/bin/passwd\")\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20237 -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:20238 -#, no-wrap -msgid "{Scheme Variable} %setuid-programs" -msgstr "{Variable Scheme} %setuid-programs" - -#. type: defvr -#: doc/guix.texi:20240 -msgid "A list of G-expressions denoting common programs that are setuid-root." -msgstr "" - -#. type: defvr -#: doc/guix.texi:20243 -msgid "The list includes commands such as @command{passwd}, @command{ping}, @command{su}, and @command{sudo}." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20249 -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:20253 -#, no-wrap -msgid "HTTPS, certificates" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20254 -#, no-wrap -msgid "X.509 certificates" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20255 -#, no-wrap -msgid "TLS" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20262 -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:20266 -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:20270 -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:20277 -msgid "In GuixSD, 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}). GuixSD 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:20282 -msgid "Note that it is @emph{not} part of @var{%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:20292 -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:20298 -#, no-wrap -msgid "" -"$ guix package -i nss-certs\n" -"$ export SSL_CERT_DIR=\"$HOME/.guix-profile/etc/ssl/certs\"\n" -"$ export SSL_CERT_FILE=\"$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt\"\n" -"$ export GIT_SSL_CAINFO=\"$SSL_CERT_FILE\"\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20303 -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:20307 -#, no-wrap -msgid "" -"$ guix package -i nss-certs\n" -"$ export CURL_CA_BUNDLE=\"$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt\"\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20311 -msgid "For other applications you may want to look up the required environment variable in the relevant documentation." -msgstr "" - -#. type: cindex -#: doc/guix.texi:20316 -#, no-wrap -msgid "name service switch" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20317 -#, no-wrap -msgid "NSS" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20326 -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:20333 -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:20334 -#, no-wrap -msgid "nss-mdns" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20335 -#, no-wrap -msgid ".local, host name lookup" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20340 -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}:" -msgstr "" - -#. type: example -#: doc/guix.texi:20344 -#, no-wrap -msgid "" -"(name-service-switch\n" -" (hosts (list %files ;first, check /etc/hosts\n" -"\n" -msgstr "" - -#. type: example -#: doc/guix.texi:20349 -#, no-wrap -msgid "" -" ;; If the above did not succeed, try\n" -" ;; with 'mdns_minimal'.\n" -" (name-service\n" -" (name \"mdns_minimal\")\n" -"\n" -msgstr "" - -#. type: example -#: doc/guix.texi:20355 -#, no-wrap -msgid "" -" ;; 'mdns_minimal' is authoritative for\n" -" ;; '.local'. When it returns \"not found\",\n" -" ;; no need to try the next methods.\n" -" (reaction (lookup-specification\n" -" (not-found => return))))\n" -"\n" -msgstr "" - -#. type: example -#: doc/guix.texi:20359 -#, no-wrap -msgid "" -" ;; Then fall back to DNS.\n" -" (name-service\n" -" (name \"dns\"))\n" -"\n" -msgstr "" - -#. type: example -#: doc/guix.texi:20363 -#, no-wrap -msgid "" -" ;; Finally, try with the \"full\" 'mdns'.\n" -" (name-service\n" -" (name \"mdns\")))))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20368 -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:20376 -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} (@pxref{Networking Services, @code{avahi-service}}), or @var{%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:20379 -msgid "For convenience, the following variables provide typical NSS configurations." -msgstr "" - -#. type: defvr -#: doc/guix.texi:20380 -#, no-wrap -msgid "{Scheme Variable} %default-nss" -msgstr "{Variable Scheme} %default-nss" - -#. type: defvr -#: doc/guix.texi:20383 -msgid "This is the default name service switch configuration, a @code{name-service-switch} object." -msgstr "" - -#. type: defvr -#: doc/guix.texi:20385 -#, no-wrap -msgid "{Scheme Variable} %mdns-host-lookup-nss" -msgstr "{Variable Scheme} %mdns-host-lookup-nss" - -#. type: defvr -#: doc/guix.texi:20388 -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:20398 -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:20399 -#, no-wrap -msgid "{Data Type} name-service-switch" -msgstr "{Type de données} name-service-switch" - -#. type: deftp -#: doc/guix.texi:20404 -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:20406 -#, no-wrap -msgid "aliases" -msgstr "" - -#. type: itemx -#: doc/guix.texi:20407 -#, no-wrap -msgid "ethers" -msgstr "" - -#. type: itemx -#: doc/guix.texi:20409 -#, no-wrap -msgid "gshadow" -msgstr "" - -#. type: itemx -#: doc/guix.texi:20410 -#, no-wrap -msgid "hosts" -msgstr "" - -#. type: itemx -#: doc/guix.texi:20411 -#, no-wrap -msgid "initgroups" -msgstr "" - -#. type: itemx -#: doc/guix.texi:20412 -#, no-wrap -msgid "netgroup" -msgstr "" - -#. type: itemx -#: doc/guix.texi:20413 -#, no-wrap -msgid "networks" -msgstr "" - -#. type: itemx -#: doc/guix.texi:20415 -#, no-wrap -msgid "public-key" -msgstr "" - -#. type: itemx -#: doc/guix.texi:20416 -#, no-wrap -msgid "rpc" -msgstr "" - -#. type: itemx -#: doc/guix.texi:20418 -#, no-wrap -msgid "shadow" -msgstr "" - -#. type: table -#: doc/guix.texi:20421 -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:20424 -#, no-wrap -msgid "{Data Type} name-service" -msgstr "{Type de données} name-service" - -#. type: deftp -#: doc/guix.texi:20428 -msgid "This is the data type representing an actual name service and the associated lookup action." -msgstr "" - -#. type: table -#: doc/guix.texi:20433 -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:20438 -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:20439 -#, no-wrap -msgid "reaction" -msgstr "" - -#. type: table -#: doc/guix.texi:20443 -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: example -#: doc/guix.texi:20447 -#, no-wrap -msgid "" -"(lookup-specification (unavailable => continue)\n" -" (success => return))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20461 -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:20470 -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: example -#: doc/guix.texi:20475 -#, no-wrap -msgid "" -"(operating-system\n" -" ;; @dots{}\n" -" (initrd-modules (cons \"megaraid_sas\" %base-initrd-modules)))\n" -msgstr "" - -#. type: defvr -#: doc/guix.texi:20477 -#, no-wrap -msgid "{Scheme Variable} %base-initrd-modules" -msgstr "{Variable Scheme} %base-initrd-modules" - -#. type: defvr -#: doc/guix.texi:20479 -msgid "This is the list of kernel modules included in the initrd by default." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20487 -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:20492 -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: example -#: doc/guix.texi:20500 -#, no-wrap -msgid "" -"(initrd (lambda (file-systems . rest)\n" -" ;; Create a standard initrd but set up networking\n" -" ;; with the parameters QEMU expects by default.\n" -" (apply base-initrd file-systems\n" -" #:qemu-networking? #t\n" -" rest)))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20505 -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:20512 -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:20517 -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:20519 -#, no-wrap -msgid "--load=@var{boot}" -msgstr "" - -#. type: table -#: doc/guix.texi:20522 -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:20526 -msgid "GuixSD 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:20527 -#, no-wrap -msgid "--root=@var{root}" -msgstr "" - -#. type: table -#: doc/guix.texi:20531 -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:20535 -msgid "Have @file{/run/booted-system} and @file{/run/current-system} point to @var{system}." -msgstr "" - -#. type: item -#: doc/guix.texi:20536 -#, no-wrap -msgid "modprobe.blacklist=@var{modules}@dots{}" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20537 -#, no-wrap -msgid "module, black-listing" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20538 -#, no-wrap -msgid "black list, of kernel modules" -msgstr "" - -#. type: table -#: doc/guix.texi:20543 -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:20544 -#, no-wrap -msgid "--repl" -msgstr "" - -#. type: table -#: doc/guix.texi:20550 -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:20556 -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:20559 -#, no-wrap -msgid "{Monadic Procedure} raw-initrd @var{file-systems} @" -msgstr "" - -#. type: deffn -#: doc/guix.texi:20571 -msgid "[#:linux-modules '()] [#:mapped-devices '()] @ [#:helper-packages '()] [#:qemu-networking? #f] [#:volatile-root? #f] Return a monadic 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:20575 -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:20578 -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:20580 -#, no-wrap -msgid "{Monadic Procedure} base-initrd @var{file-systems} @" -msgstr "" - -#. type: deffn -#: doc/guix.texi:20588 -msgid "[#:mapped-devices '()] [#:qemu-networking? #f] [#:volatile-root? #f]@ [#:linux-modules '()] Return a monadic derivation that builds 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:20590 -msgid "@var{qemu-networking?} and @var{volatile-root?} behaves as in @code{raw-initrd}." -msgstr "" - -#. type: deffn -#: doc/guix.texi:20595 -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:20602 -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:20603 -#, no-wrap -msgid "{Monadic Procedure} expression->initrd @var{exp} @" -msgstr "" - -#. type: deffn -#: doc/guix.texi:20609 -msgid "[#:guile %guile-static-stripped] [#:name \"guile-initrd\"] Return a derivation that builds 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:20615 -#, no-wrap -msgid "boot loader" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20622 -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:20627 -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:20628 -#, no-wrap -msgid "{Data Type} bootloader-configuration" -msgstr "{Type de données} bootloader-configuration" - -#. type: deftp -#: doc/guix.texi:20630 -msgid "The type of a bootloader configuration declaration." -msgstr "" - -#. type: cindex -#: doc/guix.texi:20634 -#, no-wrap -msgid "EFI, bootloader" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20635 -#, no-wrap -msgid "UEFI, bootloader" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20636 -#, no-wrap -msgid "BIOS, bootloader" -msgstr "" - -#. type: table -#: doc/guix.texi:20642 -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. @code{grub-efi-bootloader} allows to boot on modern systems using the @dfn{Unified Extensible Firmware Interface} (UEFI)." -msgstr "" - -#. type: table -#: doc/guix.texi:20645 -msgid "Available bootloaders are described in @code{(gnu bootloader @dots{})} modules." -msgstr "" - -#. type: table -#: doc/guix.texi:20655 -msgid "This is a string denoting the target onto which to install the bootloader. The exact 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)} (for GRUB, @pxref{Invoking grub-install,,, grub, GNU GRUB Manual}). For @code{grub-efi-bootloader}, it should be the path to a mounted EFI file system." -msgstr "" - -#. type: item -#: doc/guix.texi:20656 -#, no-wrap -msgid "@code{menu-entries} (default: @code{()})" -msgstr "@code{menu-entries} (par défaut : @code{()})" - -#. type: table -#: doc/guix.texi:20660 -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:20661 -#, no-wrap -msgid "@code{default-entry} (default: @code{0})" -msgstr "@code{default-entry} (par défaut : @code{0})" - -#. type: table -#: doc/guix.texi:20664 -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:20665 -#, no-wrap -msgid "@code{timeout} (default: @code{5})" -msgstr "@code{timeout} (par défaut : @code{5})" - -#. type: table -#: doc/guix.texi:20668 -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: item -#: doc/guix.texi:20669 -#, no-wrap -msgid "@code{theme} (default: @var{#f})" -msgstr "@code{theme} (par défaut : @var{#f})" - -#. type: table -#: doc/guix.texi:20673 -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:20674 -#, no-wrap -msgid "@code{terminal-outputs} (default: @code{'gfxterm})" -msgstr "@code{terminal-outputs} (par défaut : @code{'gfxterm})" - -#. type: table -#: doc/guix.texi:20681 -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 GRUB_TERMINAL_OUTPUT (@pxref{Simple configuration,,, grub,GNU GRUB manual})." -msgstr "" - -#. type: item -#: doc/guix.texi:20682 -#, no-wrap -msgid "@code{terminal-inputs} (default: @code{'()})" -msgstr "@code{terminal-inputs} (par défaut : @code{'()})" - -#. type: table -#: doc/guix.texi:20690 -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 GRUB_TERMINAL_INPUT (@pxref{Simple configuration,,, grub,GNU GRUB manual})." -msgstr "" - -#. type: item -#: doc/guix.texi:20691 -#, no-wrap -msgid "@code{serial-unit} (default: @code{#f})" -msgstr "@code{serial-unit} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:20695 -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:20696 -#, no-wrap -msgid "@code{serial-speed} (default: @code{#f})" -msgstr "@code{serial-speed} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:20700 -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:20704 -#, no-wrap -msgid "dual boot" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20705 -#, no-wrap -msgid "boot menu" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20711 -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: example -#: doc/guix.texi:20718 -#, no-wrap -msgid "" -"(menu-entry\n" -" (label \"The Other Distro\")\n" -" (linux \"/boot/old/vmlinux-2.6.32\")\n" -" (linux-arguments '(\"root=/dev/sda2\"))\n" -" (initrd \"/boot/old/initrd\"))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20721 -msgid "Details below." -msgstr "" - -#. type: deftp -#: doc/guix.texi:20722 -#, no-wrap -msgid "{Data Type} menu-entry" -msgstr "{Type de données} menu-entry" - -#. type: deftp -#: doc/guix.texi:20724 -msgid "The type of an entry in the bootloader menu." -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:20727 -#, no-wrap -msgid "label" -msgstr "" - -#. type: table -#: doc/guix.texi:20729 -msgid "The label to show in the menu---e.g., @code{\"GNU\"}." -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:20730 -#, no-wrap -msgid "linux" -msgstr "" - -#. type: table -#: doc/guix.texi:20732 -msgid "The Linux kernel image to boot, for example:" -msgstr "" - -#. type: example -#: doc/guix.texi:20735 -#, no-wrap -msgid "(file-append linux-libre \"/bzImage\")\n" -msgstr "" - -#. type: table -#: doc/guix.texi:20740 -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:20743 -#, no-wrap -msgid "\"(hd0,msdos1)/boot/vmlinuz\"\n" -msgstr "" - -#. type: table -#: doc/guix.texi:20747 -msgid "If the device is specified explicitly as above, then the @code{device} field is ignored entirely." -msgstr "" - -#. type: item -#: doc/guix.texi:20748 -#, no-wrap -msgid "@code{linux-arguments} (default: @code{()})" -msgstr "@code{linux-arguments} (par défaut : @code{()})" - -#. type: table -#: doc/guix.texi:20751 -msgid "The list of extra Linux kernel command-line arguments---e.g., @code{(\"console=ttyS0\")}." -msgstr "" - -#. type: table -#: doc/guix.texi:20755 -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:20755 -#, no-wrap -msgid "@code{device} (default: @code{#f})" -msgstr "@code{device} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:20758 -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:20764 -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: Plain text -#: doc/guix.texi:20771 -msgid "Fow now only GRUB has theme support. GRUB themes are created using the @code{grub-theme} form, which is not documented yet." -msgstr "" - -#. type: defvr -#: doc/guix.texi:20776 -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:20779 -msgid "It comes with a fancy background image displaying the GNU and Guix logos." -msgstr "" - -#. type: subsection -#: doc/guix.texi:20783 -#, no-wrap -msgid "Invoking @code{guix system}" -msgstr "Invoquer @code{guix system}" - -#. type: Plain text -#: doc/guix.texi:20788 -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:20791 -#, no-wrap -msgid "guix system @var{options}@dots{} @var{action} @var{file}\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:20797 -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:20799 -#, no-wrap -msgid "search" -msgstr "" - -#. type: table -#: doc/guix.texi:20802 -msgid "Display available service type definitions that match the given regular expressions, sorted by relevance:" -msgstr "" - -#. type: example -#: doc/guix.texi:20814 -#, no-wrap -msgid "" -"$ guix system search console font\n" -"name: console-fonts\n" -"location: gnu/services/base.scm:729:2\n" -"extends: shepherd-root\n" -"description: Install the given fonts on the specified ttys (fonts are\n" -"+ per virtual console on GNU/Linux). The value of this service is a list\n" -"+ of tty/font pairs like:\n" -"+ \n" -"+ '((\"tty1\" . \"LatGrkCyr-8x16\"))\n" -"relevance: 20\n" -"\n" -msgstr "" - -#. type: example -#: doc/guix.texi:20820 -#, no-wrap -msgid "" -"name: mingetty\n" -"location: gnu/services/base.scm:1048:2\n" -"extends: shepherd-root\n" -"description: Provide console login using the `mingetty' program.\n" -"relevance: 2\n" -"\n" -msgstr "" - -#. type: example -#: doc/guix.texi:20827 -#, no-wrap -msgid "" -"name: login\n" -"location: gnu/services/base.scm:775:2\n" -"extends: pam\n" -"description: Provide a console log-in service as specified by its\n" -"+ configuration value, a `login-configuration' object.\n" -"relevance: 2\n" -"\n" -msgstr "" - -#. type: example -#: doc/guix.texi:20829 -#, no-wrap -msgid "@dots{}\n" -msgstr "@dots{}\n" - -#. type: table -#: doc/guix.texi:20834 -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:20835 -#, no-wrap -msgid "reconfigure" -msgstr "" - -#. type: table -#: doc/guix.texi:20840 -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 GuixSD.}." -msgstr "" - -#. type: table -#: doc/guix.texi:20847 -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, it does not attempt to upgrade it since this would not be possible without stopping it first." -msgstr "" - -#. type: table -#: doc/guix.texi:20853 -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:20858 -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: quotation -#: doc/guix.texi:20866 -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: item -#: doc/guix.texi:20868 -#, no-wrap -msgid "switch-generation" -msgstr "" - -#. type: table -#: doc/guix.texi:20877 -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." -msgstr "" - -#. type: table -#: doc/guix.texi:20881 -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:20885 -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:20888 -#, no-wrap -msgid "guix system switch-generation 7\n" -msgstr "" - -#. type: table -#: doc/guix.texi:20896 -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:20899 -#, no-wrap -msgid "guix system switch-generation -- -1\n" -msgstr "" - -#. type: table -#: doc/guix.texi:20907 -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:20909 -msgid "This action will fail if the specified generation does not exist." -msgstr "" - -#. type: item -#: doc/guix.texi:20910 -#, no-wrap -msgid "roll-back" -msgstr "" - -#. type: table -#: doc/guix.texi:20916 -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:20920 -msgid "Currently, as with @command{switch-generation}, you must reboot after running this action to actually start using the preceding system generation." -msgstr "" - -#. type: table -#: doc/guix.texi:20925 -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:20926 -#, no-wrap -msgid "init" -msgstr "" - -#. type: table -#: doc/guix.texi:20930 -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 GuixSD. For instance:" -msgstr "" - -#. type: example -#: doc/guix.texi:20933 -#, no-wrap -msgid "guix system init my-os-config.scm /mnt\n" -msgstr "" - -#. type: table -#: doc/guix.texi:20940 -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:20944 -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:20945 -#, no-wrap -msgid "vm" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20946 doc/guix.texi:21210 -#, no-wrap -msgid "virtual machine" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20947 -#, no-wrap -msgid "VM" -msgstr "" - -#. type: anchor{#1} -#: doc/guix.texi:20954 -msgid "guix system vm" -msgstr "" - -#. type: table -#: doc/guix.texi:20954 -msgid "Build a virtual machine that contains the operating system declared in @var{file}, and return a script to run that virtual machine (VM). 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:20957 -#, no-wrap -msgid "$ /gnu/store/@dots{}-run-vm.sh -m 1024 -net user\n" -msgstr "" - -#. type: table -#: doc/guix.texi:20960 -msgid "The VM shares its store with the host system." -msgstr "" - -#. type: table -#: doc/guix.texi:20965 -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:20969 -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:20973 -#, no-wrap -msgid "" -"guix system vm my-config.scm \\\n" -" --expose=$HOME --share=$HOME/tmp=/exchange\n" -msgstr "" - -#. type: table -#: doc/guix.texi:20978 -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:20984 -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:20985 -#, no-wrap -msgid "System images, creation in various formats" -msgstr "" - -#. type: cindex -#: doc/guix.texi:20986 -#, no-wrap -msgid "Creating system images in various formats" -msgstr "" - -#. type: item -#: doc/guix.texi:20987 -#, no-wrap -msgid "vm-image" -msgstr "" - -#. type: itemx -#: doc/guix.texi:20988 -#, no-wrap -msgid "disk-image" -msgstr "" - -#. type: itemx -#: doc/guix.texi:20989 -#, no-wrap -msgid "docker-image" -msgstr "" - -#. type: table -#: doc/guix.texi:20997 -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:21000 -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:21004 -msgid "When using @code{vm-image}, the returned image is in qcow2 format, which the QEMU emulator can efficiently use. @xref{Running GuixSD in a VM}, for more information on how to run the image in a virtual machine." -msgstr "" - -#. type: table -#: doc/guix.texi:21009 -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:21012 -#, no-wrap -msgid "# dd if=$(guix system disk-image my-os.scm) of=/dev/sdc\n" -msgstr "" - -#. type: table -#: doc/guix.texi:21019 -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:21025 -#, no-wrap -msgid "" -"image_id=\"$(docker load < guixsd-docker-image.tar.gz)\"\n" -"docker run -e GUIX_NEW_SYSTEM=/var/guix/profiles/system \\\\\n" -" --entrypoint /var/guix/profiles/system/profile/bin/guile \\\\\n" -" $image_id /var/guix/profiles/system/boot\n" -msgstr "" - -#. type: table -#: doc/guix.texi:21035 -msgid "This command starts a new Docker container from the specified image. It will boot the GuixSD system in the usual manner, which means it will start any services you have defined in the operating system configuration. 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 run}." -msgstr "" - -#. type: table -#: doc/guix.texi:21043 -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:21047 -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:21051 -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:21055 -#, no-wrap -msgid "" -"guix system container my-config.scm \\\n" -" --expose=$HOME --share=$HOME/tmp=/exchange\n" -msgstr "" - -#. type: quotation -#: doc/guix.texi:21059 -msgid "This option requires Linux-libre 3.19 or newer." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21066 -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:21075 -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 GuixSD installer @pxref{Building the Installation Image})." -msgstr "" - -#. type: table -#: doc/guix.texi:21080 -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: item -#: doc/guix.texi:21081 -#, no-wrap -msgid "--derivation" -msgstr "" - -#. type: table -#: doc/guix.texi:21085 -msgid "Return the derivation file name of the given operating system without building anything." -msgstr "" - -#. type: item -#: doc/guix.texi:21086 -#, no-wrap -msgid "--file-system-type=@var{type}" -msgstr "" - -#. type: table -#: doc/guix.texi:21090 -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:21092 -msgid "When this option is omitted, @command{guix system} uses @code{ext4}." -msgstr "" - -#. type: cindex -#: doc/guix.texi:21093 -#, no-wrap -msgid "ISO-9660 format" -msgstr "" - -#. type: cindex -#: doc/guix.texi:21094 -#, no-wrap -msgid "CD image format" -msgstr "" - -#. type: cindex -#: doc/guix.texi:21095 -#, no-wrap -msgid "DVD image format" -msgstr "" - -#. type: table -#: doc/guix.texi:21098 -msgid "@code{--file-system-type=iso9660} produces an ISO-9660 image, suitable for burning on CDs and DVDs." -msgstr "" - -#. type: item -#: doc/guix.texi:21099 -#, no-wrap -msgid "--image-size=@var{size}" -msgstr "" - -#. type: table -#: doc/guix.texi:21104 -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:21108 -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: item -#: doc/guix.texi:21114 -#, no-wrap -msgid "--skip-checks" -msgstr "--skip-checks" - -#. type: table -#: doc/guix.texi:21116 -msgid "Skip pre-installation safety checks." -msgstr "" - -#. type: table -#: doc/guix.texi:21123 -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: item -#: doc/guix.texi:21124 -#, no-wrap -msgid "--on-error=@var{strategy}" -msgstr "" - -#. type: table -#: doc/guix.texi:21127 -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:21129 -#, no-wrap -msgid "nothing-special" -msgstr "" - -#. type: table -#: doc/guix.texi:21131 -msgid "Report the error concisely and exit. This is the default strategy." -msgstr "" - -#. type: item -#: doc/guix.texi:21132 -#, no-wrap -msgid "backtrace" -msgstr "" - -#. type: table -#: doc/guix.texi:21134 -msgid "Likewise, but also display a backtrace." -msgstr "" - -#. type: item -#: doc/guix.texi:21135 -#, no-wrap -msgid "debug" -msgstr "" - -#. type: table -#: doc/guix.texi:21141 -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: quotation -#: doc/guix.texi:21151 -msgid "All the actions above, except @code{build} and @code{init}, 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: Plain text -#: doc/guix.texi:21157 -msgid "Once you have built, configured, re-configured, and re-re-configured your GuixSD 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:21160 -#, no-wrap -msgid "list-generations" -msgstr "" - -#. type: table -#: doc/guix.texi:21165 -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:21170 -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:21173 -#, no-wrap -msgid "$ guix system list-generations 10d\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21180 -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:21182 -msgid "system-extension-graph" -msgstr "" - -#. type: item -#: doc/guix.texi:21184 -#, no-wrap -msgid "extension-graph" -msgstr "" - -#. type: table -#: doc/guix.texi:21189 -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:21191 -msgid "The command:" -msgstr "" - -#. type: example -#: doc/guix.texi:21194 -#, no-wrap -msgid "$ guix system extension-graph @var{file} | dot -Tpdf > services.pdf\n" -msgstr "" - -#. type: table -#: doc/guix.texi:21197 -msgid "produces a PDF file showing the extension relations among services." -msgstr "" - -#. type: anchor{#1} -#: doc/guix.texi:21199 -msgid "system-shepherd-graph" -msgstr "" - -#. type: item -#: doc/guix.texi:21199 -#, no-wrap -msgid "shepherd-graph" -msgstr "" - -#. type: table -#: doc/guix.texi:21204 -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: subsection -#: doc/guix.texi:21208 -#, no-wrap -msgid "Running GuixSD in a Virtual Machine" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21218 -msgid "To run GuixSD in a virtual machine (VM), one can either use the pre-built GuixSD VM image distributed at @indicateurl{ftp://alpha.gnu.org/guix/guixsd-vm-image-@value{VERSION}.@var{system}.tar.xz} , or 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{http://qemu.org/, QEMU emulator} can efficiently use." -msgstr "" - -#. type: cindex -#: doc/guix.texi:21219 -#, no-wrap -msgid "QEMU" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21226 -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:21231 -#, no-wrap -msgid "" -"$ qemu-system-x86_64 \\\n" -" -net user -net nic,model=virtio \\\n" -" -enable-kvm -m 256 /tmp/qemu-image\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21234 -msgid "Here is what each of these options means:" -msgstr "" - -#. type: item -#: doc/guix.texi:21236 -#, no-wrap -msgid "qemu-system-x86_64" -msgstr "" - -#. type: table -#: doc/guix.texi:21239 -msgid "This specifies the hardware platform to emulate. This should match the host." -msgstr "" - -#. type: item -#: doc/guix.texi:21240 -#, no-wrap -msgid "-net user" -msgstr "" - -#. type: table -#: doc/guix.texi:21244 -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." -msgstr "" - -#. type: item -#: doc/guix.texi:21245 -#, no-wrap -msgid "-net nic,model=virtio" -msgstr "" - -#. type: table -#: doc/guix.texi:21250 -msgid "You must create a network interface of a given model. If you do not create a NIC, the boot will fail. Assuming your hardware platform is x86_64, you can get a list of available NIC models by running @command{qemu-system-x86_64 -net nic,model=help}." -msgstr "" - -#. type: item -#: doc/guix.texi:21251 -#, no-wrap -msgid "-enable-kvm" -msgstr "" - -#. type: table -#: doc/guix.texi:21255 -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:21256 -#, no-wrap -msgid "-m 256" -msgstr "" - -#. type: table -#: doc/guix.texi:21259 -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:21260 -#, no-wrap -msgid "/tmp/qemu-image" -msgstr "" - -#. type: table -#: doc/guix.texi:21262 -msgid "The file name of the qcow2 image." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21272 -msgid "The default @command{run-vm.sh} script that is returned by an invocation of @command{guix system vm} does not add a @command{-net 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` -net user}. An important caveat of using @command{-net 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: subsubsection -#: doc/guix.texi:21273 -#, no-wrap -msgid "Connecting Through SSH" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21282 -msgid "To enable SSH inside a VM you need to add a SSH server like @code{(dropbear-service)} or @code{(lsh-service)} to your VM. The @code{(lsh-service}) doesn't currently boot unsupervised. It requires you to type some characters to initialize the randomness generator. 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:21285 -#, no-wrap -msgid "`guix system vm config.scm` -net user,hostfwd=tcp::10022-:22\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21288 -msgid "To connect to the VM you can run" -msgstr "" - -#. type: example -#: doc/guix.texi:21291 -#, no-wrap -msgid "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21298 -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: subsubsection -#: doc/guix.texi:21299 -#, no-wrap -msgid "Using @command{virt-viewer} with Spice" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21305 -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:21308 -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:21314 -#, no-wrap -msgid "" -"-device virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x5\n" -"-chardev spicevmc,name=vdagent,id=vdagent\n" -"-device virtserialport,nr=1,bus=virtio-serial0.0,chardev=vdagent,\n" -"name=com.redhat.spice.0\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21317 -msgid "You'll also need to add the @pxref{Miscellaneous Services, Spice service}." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21324 -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:21336 -#, no-wrap -msgid "daemons" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21349 -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:21350 -#, no-wrap -msgid "service extensions" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21362 -msgid "GuixSD services are connected by @dfn{extensions}. For instance, the secure shell service @emph{extends} the Shepherd---the GuixSD 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{lsh-service}}); 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:21366 -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:21368 -msgid "@image{images/service-graph,,5in,Typical service extension graph.}" -msgstr "" - -#. type: cindex -#: doc/guix.texi:21369 -#, no-wrap -msgid "system service" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21377 -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:21378 -#, no-wrap -msgid "service types" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21384 -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 @var{lsh-service-type}, with different parameters." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21387 -msgid "The following section describes the programming interface for service types and services." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21394 -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: example -#: doc/guix.texi:21404 -#, no-wrap -msgid "" -"(define guix-service-type\n" -" (service-type\n" -" (name 'guix)\n" -" (extensions\n" -" (list (service-extension shepherd-root-service-type guix-shepherd-service)\n" -" (service-extension account-service-type guix-accounts)\n" -" (service-extension activation-service-type guix-activation)))\n" -" (default-value (guix-configuration))))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21408 -msgid "It defines three things:" -msgstr "" - -#. type: enumerate -#: doc/guix.texi:21412 -msgid "A name, whose sole purpose is to make inspection and debugging easier." -msgstr "" - -#. type: enumerate -#: doc/guix.texi:21417 -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:21420 -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:21423 -msgid "Optionally, a default value for instances of this type." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21426 -msgid "In this example, @var{guix-service-type} extends three services:" -msgstr "" - -#. type: item -#: doc/guix.texi:21428 -#, no-wrap -msgid "shepherd-root-service-type" -msgstr "" - -#. type: table -#: doc/guix.texi:21433 -msgid "The @var{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:21434 -#, no-wrap -msgid "account-service-type" -msgstr "" - -#. type: table -#: doc/guix.texi:21439 -msgid "This extension for this service is computed by @var{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:21440 -#, no-wrap -msgid "activation-service-type" -msgstr "" - -#. type: table -#: doc/guix.texi:21444 -msgid "Here @var{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:21447 -msgid "A service of this type is instantiated like this:" -msgstr "" - -#. type: example -#: doc/guix.texi:21453 -#, no-wrap -msgid "" -"(service guix-service-type\n" -" (guix-configuration\n" -" (build-accounts 5)\n" -" (use-substitutes? #f)))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21461 -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: example -#: doc/guix.texi:21464 -#, no-wrap -msgid "(service guix-service-type)\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21468 -msgid "@var{guix-service-type} is quite simple because it extends other services but is not extensible itself." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21472 -msgid "The service type for an @emph{extensible} service looks like this:" -msgstr "" - -#. type: example -#: doc/guix.texi:21479 -#, no-wrap +#: guix/scripts/publish.scm:81 msgid "" -"(define udev-service-type\n" -" (service-type (name 'udev)\n" -" (extensions\n" -" (list (service-extension shepherd-root-service-type\n" -" udev-shepherd-service)))\n" "\n" +" --workers=N use N workers to bake items" msgstr "" +"\n" +" --workers=N utiliser N travailleurs pour préparer les éléments" -#. type: example -#: doc/guix.texi:21487 -#, no-wrap -msgid "" -" (compose concatenate) ;concatenate the list of rules\n" -" (extend (lambda (config rules)\n" -" (match config\n" -" (($ udev initial-rules)\n" -" (udev-configuration\n" -" (udev udev) ;the udev package to use\n" -" (rules (append initial-rules rules)))))))))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21493 -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 @var{shepherd-root-service-type}, we see two new fields:" -msgstr "" - -#. type: item -#: doc/guix.texi:21495 -#, no-wrap -msgid "compose" -msgstr "" - -#. type: table -#: doc/guix.texi:21498 -msgid "This is the procedure to @dfn{compose} the list of extensions to services of this type." -msgstr "" - -#. type: table -#: doc/guix.texi:21501 -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:21502 -#, no-wrap -msgid "extend" -msgstr "" - -#. type: table -#: doc/guix.texi:21505 -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:21510 -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:21516 -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:21521 -msgid "There can be only one instance of an extensible service type such as @var{udev-service-type}. If there were more, the @code{service-extension} specifications would be ambiguous." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21524 -msgid "Still here? The next section provides a reference of the programming interface for services." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21532 -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:21533 -#, no-wrap -msgid "{Scheme Procedure} service @var{type} [@var{value}]" -msgstr "{Procédure Scheme} service @var{type} [@var{value}]" - -#. type: deffn -#: doc/guix.texi:21537 -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:21541 -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:21543 -msgid "For instance, this:" -msgstr "" - -#. type: example -#: doc/guix.texi:21546 -#, no-wrap -msgid "(service openssh-service-type)\n" -msgstr "" - -#. type: deffn -#: doc/guix.texi:21550 -msgid "is equivalent to this:" -msgstr "" - -#. type: example -#: doc/guix.texi:21554 -#, no-wrap +#: guix/scripts/publish.scm:83 msgid "" -"(service openssh-service-type\n" -" (openssh-configuration))\n" -msgstr "" - -#. type: deffn -#: doc/guix.texi:21558 -msgid "In both cases the result is an instance of @code{openssh-service-type} with the default configuration." -msgstr "" - -#. type: deffn -#: doc/guix.texi:21560 -#, no-wrap -msgid "{Scheme Procedure} service? @var{obj}" -msgstr "{Procédure Scheme} service? @var{obj}" - -#. type: deffn -#: doc/guix.texi:21562 -msgid "Return true if @var{obj} is a service." -msgstr "" - -#. type: deffn -#: doc/guix.texi:21564 -#, no-wrap -msgid "{Scheme Procedure} service-kind @var{service}" -msgstr "{Procédure Scheme} service-kind @var{service}" - -#. type: deffn -#: doc/guix.texi:21566 -msgid "Return the type of @var{service}---i.e., a @code{} object." -msgstr "" - -#. type: deffn -#: doc/guix.texi:21568 -#, no-wrap -msgid "{Scheme Procedure} service-value @var{service}" -msgstr "{Procédure Scheme} service-value @var{service}" - -#. type: deffn -#: doc/guix.texi:21571 -msgid "Return the value associated with @var{service}. It represents its parameters." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21574 -msgid "Here is an example of how a service is created and manipulated:" +"\n" +" --ttl=TTL announce narinfos can be cached for TTL seconds" msgstr "" +"\n" +" --ttl=TTL les annonces narinfos peuvent être mises en cache\n" +" pendant TTL secondes" -#. type: example -#: doc/guix.texi:21583 -#, no-wrap +#: guix/scripts/publish.scm:85 msgid "" -"(define s\n" -" (service nginx-service-type\n" -" (nginx-configuration\n" -" (nginx nginx)\n" -" (log-directory log-directory)\n" -" (run-directory run-directory)\n" -" (file config-file))))\n" "\n" +" --nar-path=PATH use PATH as the prefix for nar URLs" msgstr "" +"\n" +" --nar-path=CHEMIN utiliser le CHEMIN comme préfixe pour les URL nar" -#. type: example -#: doc/guix.texi:21586 -#, no-wrap +#: guix/scripts/publish.scm:87 msgid "" -"(service? s)\n" -"@result{} #t\n" "\n" +" --public-key=FILE use FILE as the public key for signatures" msgstr "" +"\n" +" --public-key=FICHIER\n" +" utiliser le FICHIER comme clé publique pour les signatures" -#. type: example -#: doc/guix.texi:21589 -#, no-wrap +#: guix/scripts/publish.scm:89 msgid "" -"(eq? (service-kind s) nginx-service-type)\n" -"@result{} #t\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21599 -msgid "The @code{modify-services} form provides a handy way to change the parameters of some of the services of a list such as @var{%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:21600 -#, no-wrap -msgid "{Scheme Syntax} modify-services @var{services} @" -msgstr "" - -#. type: deffn -#: doc/guix.texi:21602 -msgid "(@var{type} @var{variable} => @var{body}) @dots{}" -msgstr "" - -#. type: deffn -#: doc/guix.texi:21605 -msgid "Modify the services listed in @var{services} according to the given clauses. Each clause has the form:" -msgstr "" - -#. type: example -#: doc/guix.texi:21608 -#, no-wrap -msgid "(@var{type} @var{variable} => @var{body})\n" -msgstr "" - -#. type: deffn -#: doc/guix.texi:21615 -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:21622 -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:21624 -msgid "@xref{Using the Configuration System}, for example usage." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21631 -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:21632 -#, no-wrap -msgid "{Data Type} service-type" -msgstr "{Type de données} service-type" - -#. type: cindex -#: doc/guix.texi:21633 -#, no-wrap -msgid "service type" -msgstr "" - -#. type: deftp -#: doc/guix.texi:21636 -msgid "This is the representation of a @dfn{service type} (@pxref{Service Types and Services})." -msgstr "" - -#. type: table -#: doc/guix.texi:21640 -msgid "This is a symbol, used only to simplify inspection and debugging." -msgstr "" - -#. type: code{#1} -#: doc/guix.texi:21641 -#, no-wrap -msgid "extensions" -msgstr "" - -#. type: table -#: doc/guix.texi:21643 -msgid "A non-empty list of @code{} objects (see below)." -msgstr "" - -#. type: item -#: doc/guix.texi:21644 -#, no-wrap -msgid "@code{compose} (default: @code{#f})" -msgstr "@code{compose} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:21648 -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:21652 -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:21653 -#, no-wrap -msgid "@code{extend} (default: @code{#f})" -msgstr "@code{extend} (par défaut : @code{#f})" - -#. type: table -#: doc/guix.texi:21655 -msgid "If this is @code{#f}, services of this type cannot be extended." -msgstr "" - -#. type: table -#: doc/guix.texi:21661 -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:21664 -msgid "@xref{Service Types and Services}, for examples." -msgstr "" - -#. type: deffn -#: doc/guix.texi:21666 -#, no-wrap -msgid "{Scheme Procedure} service-extension @var{target-type} @" -msgstr "{Procédure Scheme} service-extension @var{target-type} @" - -#. type: deffn -#: doc/guix.texi:21672 -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:21674 -#, no-wrap -msgid "{Scheme Procedure} service-extension? @var{obj}" -msgstr "{Procédure Scheme} service-extension? @var{obj}" - -#. type: deffn -#: doc/guix.texi:21676 -msgid "Return true if @var{obj} is a service extension." -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21682 -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:21683 -#, no-wrap -msgid "{Scheme Procedure} simple-service @var{name} @var{target} @var{value}" -msgstr "{Procédure Scheme} simple-service @var{name} @var{target} @var{value}" - -#. type: deffn -#: doc/guix.texi:21687 -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:21690 -msgid "For example, this extends mcron (@pxref{Scheduled Job Execution}) with an additional job:" +"\n" +" --private-key=FILE use FILE as the private key for signatures" msgstr "" +"\n" +" --private-key=FICHIER\n" +" utiliser le FICHIER comme clé privée pour les signatures" -#. type: example -#: doc/guix.texi:21694 -#, no-wrap +#: guix/scripts/publish.scm:91 msgid "" -"(simple-service 'my-mcron-job mcron-service-type\n" -" #~(job '(next-hour (3)) \"guix gc -F 2G\"))\n" -msgstr "" - -#. type: Plain text -#: doc/guix.texi:21704 -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." +"\n" +" -r, --repl[=PORT] spawn REPL server on PORT" msgstr "" +"\n" +" -r, --repl[=PORT] créer le serveur REPL sur le PORT" -#. type: deffn -#: doc/guix.texi:21705 -#, no-wrap -msgid "{Scheme Procedure} fold-services @var{services} @" -msgstr "{Procédure Scheme} fold-services @var{services} @" - -#. type: deffn -#: doc/guix.texi:21709 -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 "" +#: guix/scripts/publish.scm:107 +#, scheme-format +msgid "lookup of host '~a' failed: ~a~%" +msgstr "la recherche de l'hôte « ~a » a échoué : ~a~%" -#. type: Plain text -#: doc/guix.texi:21713 -msgid "Lastly, the @code{(gnu services)} module also defines several essential service types, some of which are listed below." -msgstr "" +#: guix/scripts/publish.scm:152 +#, scheme-format +msgid "lookup of host '~a' returned nothing" +msgstr "la recherche de l'hôte « ~a » n'a rien retourné" -#. type: defvr -#: doc/guix.texi:21714 -#, no-wrap -msgid "{Scheme Variable} system-service-type" -msgstr "{Variable Scheme} system-service-type" +#: guix/scripts/publish.scm:165 +#, scheme-format +msgid "zlib support is missing; compression disabled~%" +msgstr "le support zlib est manquant. La compression est désactivée~%" -#. type: defvr -#: doc/guix.texi:21717 -msgid "This is the root of the service graph. It produces the system directory as returned by the @command{guix system build} command." -msgstr "" +#: guix/scripts/publish.scm:179 +#, scheme-format +msgid "~a: invalid duration~%" +msgstr "~a : durée non valide~%" -#. type: defvr -#: doc/guix.texi:21719 -#, no-wrap -msgid "{Scheme Variable} boot-service-type" -msgstr "{Variable Scheme} boot-service-type" +#: guix/scripts/publish.scm:869 +#, scheme-format +msgid "user '~a' not found: ~a~%" +msgstr "utilisateur « ~a » non trouvé : ~a~%" -#. type: defvr -#: doc/guix.texi:21722 -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 "" +#: guix/scripts/publish.scm:910 +#, scheme-format +msgid "server running as root; consider using the '--user' option!~%" +msgstr "le serveur tourne en tant que root. Envisagez d'utiliser l'option « --user » !~%" -#. type: defvr -#: doc/guix.texi:21724 -#, no-wrap -msgid "{Scheme Variable} etc-service-type" -msgstr "{Variable Scheme} etc-service-type" +#: guix/scripts/publish.scm:915 +#, scheme-format +msgid "publishing ~a on ~a, port ~d~%" +msgstr "diffusion de ~a sur ~a, port ~d~%" -#. type: defvr -#: doc/guix.texi:21728 -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:" +#: guix/scripts/edit.scm:41 +msgid "" +"Usage: guix edit PACKAGE...\n" +"Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n" msgstr "" +"Usage : guix edit PAQUET...\n" +"Démarrer $VISUAL ou $EDITOR pour éditer la définition de PAQUET...\n" -#. type: example -#: doc/guix.texi:21731 -#, no-wrap -msgid "(list `(\"issue\" ,(plain-file \"issue\" \"Welcome!\\n\")))\n" -msgstr "" +#: guix/scripts/edit.scm:62 +#, scheme-format +msgid "file '~a' not found in search path ~s~%" +msgstr "fichier « ~a » pas trouvé dans le chemin de recherche ~s~%" -#. type: defvr -#: doc/guix.texi:21735 -msgid "In this example, the effect would be to add an @file{/etc/issue} file pointing to the given file." -msgstr "" +#: guix/scripts/edit.scm:90 +#, scheme-format +msgid "source location of package '~a' is unknown~%" +msgstr "l'emplacement source du paquet « ~a » est inconnue~%" -#. type: defvr -#: doc/guix.texi:21737 -#, no-wrap -msgid "{Scheme Variable} setuid-program-service-type" -msgstr "{Variable Scheme} setuid-program-service-type" +#: guix/scripts/edit.scm:103 +#, scheme-format +msgid "failed to launch '~a': ~a~%" +msgstr "impossible de démarrer « ~a » : ~a~%" -#. type: defvr -#: doc/guix.texi:21741 -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 "" +#: guix/scripts/size.scm:77 +#, scheme-format +msgid "no available substitute information for '~a'~%" +msgstr "pas d'information de substitution disponible pour « ~a »~%" -#. type: defvr -#: doc/guix.texi:21743 -#, no-wrap -msgid "{Scheme Variable} profile-service-type" -msgstr "{Variable Scheme} profile-service-type" +#: guix/scripts/size.scm:99 +msgid "store item" +msgstr "élément stockage" -#. type: defvr -#: doc/guix.texi:21747 -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 "" +#: guix/scripts/size.scm:99 +msgid "total" +msgstr "total" -#. type: cindex -#: doc/guix.texi:21753 -#, no-wrap -msgid "shepherd services" -msgstr "" +#: guix/scripts/size.scm:99 +msgid "self" +msgstr "lui-même" -#. type: cindex -#: doc/guix.texi:21754 -#, no-wrap -msgid "PID 1" -msgstr "" +#: guix/scripts/size.scm:107 +#, scheme-format +msgid "total: ~,1f MiB~%" +msgstr "total : ~,1f MiB~%" -#. type: cindex -#: doc/guix.texi:21755 -#, no-wrap -msgid "init system" -msgstr "" +#. TRANSLATORS: This is the title of a graph, meaning that the graph +#. represents a profile of the store (the "store" being the place where +#. packages are stored.) +#: guix/scripts/size.scm:221 +msgid "store profile" +msgstr "profil du dépôt" -#. type: Plain text -#: doc/guix.texi:21761 -msgid "The @code{(gnu services shepherd)} module provides a way to define services managed by the GNU@tie{}Shepherd, which is the GuixSD 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})." +#: guix/scripts/size.scm:230 +msgid "" +"Usage: guix size [OPTION]... PACKAGE\n" +"Report the size of PACKAGE and its dependencies.\n" msgstr "" +"Usage : guix size [OPTION]... PAQUET\n" +"Rapporter la taille du PAQUET et de ses dépendances.\n" -#. type: Plain text -#: doc/guix.texi:21767 -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:" +#: guix/scripts/size.scm:235 +msgid "" +"\n" +" -s, --system=SYSTEM consider packages for SYSTEM--e.g., \"i686-linux\"" msgstr "" +"\n" +" -s, --system=SYSTÈME prend en compte les paquets pour le SYSTÈME, par exemple « i686-linux »" -#. type: Plain text -#: doc/guix.texi:21769 -msgid "@image{images/shepherd-graph,,5in,Typical shepherd service graph.}" +#. TRANSLATORS: "closure" and "self" must not be translated. +#: guix/scripts/size.scm:238 +msgid "" +"\n" +" --sort=KEY sort according to KEY--\"closure\" or \"self\"" msgstr "" +"\n" +" --sort=CLEF tri en fonction de la CLEF : « closure » ou « self »" -#. type: Plain text -#: doc/guix.texi:21773 -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}})." +#: guix/scripts/size.scm:240 +msgid "" +"\n" +" -m, --map-file=FILE write to FILE a graphical map of disk usage" msgstr "" +"\n" +" -m, --map-file=FICHIER écrit dans le FICHIER une carte graphique de l'utilisation du disque" -#. type: Plain text -#: doc/guix.texi:21777 -msgid "The @var{%shepherd-root-service} is a service object representing PID@tie{}1, of type @var{shepherd-root-service-type}; it can be extended by passing it lists of @code{} objects." -msgstr "" +#: guix/scripts/size.scm:271 +#, scheme-format +msgid "~a: invalid sorting key~%" +msgstr "~a : clef de tri invalide~%" -#. type: deftp -#: doc/guix.texi:21778 -#, no-wrap -msgid "{Data Type} shepherd-service" -msgstr "{Type de données} shepherd-service" +#: guix/scripts/size.scm:306 +msgid "missing store item argument\n" +msgstr "argument d'élément de stockage manquant\n" -#. type: deftp -#: doc/guix.texi:21780 -msgid "The data type representing a service managed by the Shepherd." -msgstr "" +#: guix/scripts/graph.scm:87 +#, scheme-format +msgid "~a: invalid argument (package name expected)" +msgstr "~a : argument invalide (nom de paquet attendu)" -#. type: code{#1} -#: doc/guix.texi:21782 -#, no-wrap -msgid "provision" -msgstr "" +#: guix/scripts/graph.scm:98 +msgid "the DAG of packages, excluding implicit inputs" +msgstr "le DAG des paquets en excluant les entrées implicites" -#. type: table -#: doc/guix.texi:21784 -msgid "This is a list of symbols denoting what the service provides." -msgstr "" +#: guix/scripts/graph.scm:124 +msgid "the reverse DAG of packages" +msgstr "le graphe orienté acyclique (DAG) inversé des paquets" -#. type: table -#: doc/guix.texi:21789 -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 "" +#: guix/scripts/graph.scm:174 +msgid "the DAG of packages, including implicit inputs" +msgstr "le DAG des paquets en incluant les entrées implicites" -#. type: item -#: doc/guix.texi:21790 -#, no-wrap -msgid "@code{requirements} (default: @code{'()})" -msgstr "@code{requirements} (par défaut : @code{'()})" +#: guix/scripts/graph.scm:184 +msgid "the DAG of packages and origins, including implicit inputs" +msgstr "le DAG des paquets et origines en incluant les entrées implicites" -#. type: table -#: doc/guix.texi:21792 -msgid "List of symbols denoting the Shepherd services this one depends on." -msgstr "" +#: guix/scripts/graph.scm:214 +msgid "same as 'bag', but without the bootstrap nodes" +msgstr "comme « bag » mais sans les nœuds d'amorçage" -#. type: item -#: doc/guix.texi:21793 -#, no-wrap -msgid "@code{respawn?} (default: @code{#t})" -msgstr "@code{respawn?} (par défaut : @code{#t})" +#: guix/scripts/graph.scm:256 +msgid "the DAG of derivations" +msgstr "le DAG des dérivations" -#. type: table -#: doc/guix.texi:21796 -msgid "Whether to restart the service when it stops, for instance when the underlying process dies." -msgstr "" +#: guix/scripts/graph.scm:268 +msgid "unsupported argument for derivation graph" +msgstr "argument non supporté pour le graphe de dérivation" -#. type: code{#1} -#: doc/guix.texi:21797 -#, no-wrap -msgid "start" -msgstr "" +#: guix/scripts/graph.scm:294 +msgid "unsupported argument for this type of graph" +msgstr "argument non supporté pour ce type de graphe" -#. type: itemx -#: doc/guix.texi:21798 -#, no-wrap -msgid "@code{stop} (default: @code{#~(const #f)})" -msgstr "@code{stop} (par défaut : @code{#~(const #f)})" +#: guix/scripts/graph.scm:307 +#, scheme-format +msgid "references for '~a' are not known~%" +msgstr "les références pour « ~a » sont inconnues~%" -#. type: table -#: doc/guix.texi:21804 -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 "" +#: guix/scripts/graph.scm:314 +msgid "the DAG of run-time dependencies (store references)" +msgstr "le DAG des dépendances à l'exécution (stockage des références)" -#. type: table -#: doc/guix.texi:21807 -msgid "A documentation string, as shown when running:" -msgstr "" +#: guix/scripts/graph.scm:330 +msgid "the DAG of referrers in the store" +msgstr "le graphe orienté acyclique (DAG) des référents dans le stockage" -#. type: example -#: doc/guix.texi:21810 -#, no-wrap -msgid "herd doc @var{service-name}\n" -msgstr "" +#: guix/scripts/graph.scm:360 +msgid "the graph of package modules" +msgstr "le graphe des modules de paquets" -#. type: table -#: doc/guix.texi:21814 -msgid "where @var{service-name} is one of the symbols in @var{provision} (@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual})." -msgstr "" +#: guix/scripts/graph.scm:388 +#, scheme-format +msgid "~a: unknown node type~%" +msgstr "~a : type de nœud inconnu~%" -#. type: item -#: doc/guix.texi:21815 -#, no-wrap -msgid "@code{modules} (default: @var{%default-modules})" -msgstr "@code{modules} (par défaut : @var{%default-modules})" +#: guix/scripts/graph.scm:395 +#, scheme-format +msgid "~a: unknown backend~%" +msgstr "~a : moteur de graphe inconnu~%" -#. type: table -#: doc/guix.texi:21818 -msgid "This is the list of modules that must be in scope when @code{start} and @code{stop} are evaluated." -msgstr "" +#: guix/scripts/graph.scm:399 +msgid "The available node types are:\n" +msgstr "Les types de nœuds disponibles sont :\n" -#. type: defvr -#: doc/guix.texi:21822 -#, no-wrap -msgid "{Scheme Variable} shepherd-root-service-type" -msgstr "{Variable Scheme} shepherd-root-service-type" +#: guix/scripts/graph.scm:409 +msgid "The available backend types are:\n" +msgstr "Les types de moteurs de graphes disponibles sont :\n" -#. type: defvr -#: doc/guix.texi:21824 -msgid "The service type for the Shepherd ``root service''---i.e., PID@tie{}1." +#. TRANSLATORS: Here 'dot' is the name of a program; it must not be +#. translated. +#: guix/scripts/graph.scm:453 +msgid "" +"Usage: guix graph PACKAGE...\n" +"Emit a representation of the dependency graph of PACKAGE...\n" msgstr "" +"Usage : guix graph PAQUET...\n" +"Produit une représentation du graphe des dépendances de PAQUET...\n" -#. type: defvr -#: doc/guix.texi:21828 -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{}." +#: guix/scripts/graph.scm:455 +msgid "" +"\n" +" -b, --backend=TYPE produce a graph with the given backend TYPE" msgstr "" +"\n" +" -b, --backend=TYPE produire un graphe avec le TYPE de moteur donné" -#. type: defvr -#: doc/guix.texi:21830 -#, no-wrap -msgid "{Scheme Variable} %shepherd-root-service" -msgstr "{Variable Scheme} %shepherd-root-service" - -#. type: defvr -#: doc/guix.texi:21832 -msgid "This service represents PID@tie{}1." +#: guix/scripts/graph.scm:457 +msgid "" +"\n" +" --list-backends list the available graph backends" msgstr "" +"\n" +" --list-backends lister les types de moteurs de graphes disponibles" -#. type: cindex -#: doc/guix.texi:21838 -#, no-wrap -msgid "documentation, searching for" +#: guix/scripts/graph.scm:459 +msgid "" +"\n" +" -t, --type=TYPE represent nodes of the given TYPE" msgstr "" +"\n" +" -t, --type=TYPE représenter les nœuds du TYPE donné" -#. type: cindex -#: doc/guix.texi:21839 -#, no-wrap -msgid "searching for documentation" +#: guix/scripts/graph.scm:461 +msgid "" +"\n" +" --list-types list the available graph types" msgstr "" +"\n" +" --list-types lister les types de graphes disponibles" -#. type: cindex -#: doc/guix.texi:21840 -#, no-wrap -msgid "Info, documentation format" +#: guix/scripts/graph.scm:463 guix/scripts/pack.scm:644 +msgid "" +"\n" +" -e, --expression=EXPR consider the package EXPR evaluates to" msgstr "" +"\n" +" -e, --expression=EXPR considère le paquet évalué par EXPR" -#. type: cindex -#: doc/guix.texi:21841 -#, no-wrap -msgid "man pages" -msgstr "" +#: guix/scripts/challenge.scm:191 +#, scheme-format +msgid " local hash: ~a~%" +msgstr " empreinte locale : ~a~%" -#. type: cindex -#: doc/guix.texi:21842 -#, no-wrap -msgid "manual pages" -msgstr "" +#: guix/scripts/challenge.scm:192 +#, scheme-format +msgid " no local build for '~a'~%" +msgstr " aucune compilation locale pour « ~a »~%" -#. type: Plain text -#: doc/guix.texi:21849 -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 "" +#: guix/scripts/challenge.scm:194 +#, scheme-format +msgid " ~50a: ~a~%" +msgstr " ~50a : ~a~%" -#. type: Plain text -#: doc/guix.texi:21853 -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 "" +#: guix/scripts/challenge.scm:202 +#, scheme-format +msgid "~a contents differ:~%" +msgstr "le contenu de ~a diffère :~%" -#. type: example -#: doc/guix.texi:21861 -#, no-wrap -msgid "" -"$ info -k TLS\n" -"\"(emacs)Network Security\" -- STARTTLS\n" -"\"(emacs)Network Security\" -- TLS\n" -"\"(gnutls)Core TLS API\" -- gnutls_certificate_set_verify_flags\n" -"\"(gnutls)Core TLS API\" -- gnutls_certificate_set_verify_function\n" -"@dots{}\n" -msgstr "" +#: guix/scripts/challenge.scm:205 +#, scheme-format +msgid "could not challenge '~a': no local build~%" +msgstr "impossible de mettre « ~a » au défi : aucune construction locale~%" -#. type: Plain text -#: doc/guix.texi:21865 -msgid "The command below searches for the same keyword in man pages:" -msgstr "" +#: guix/scripts/challenge.scm:207 +#, scheme-format +msgid "could not challenge '~a': no substitutes~%" +msgstr "impossible de mettre « ~a » au défi : aucune substitution~%" -#. type: example -#: doc/guix.texi:21871 -#, no-wrap -msgid "" -"$ man -k TLS\n" -"SSL (7) - OpenSSL SSL/TLS library\n" -"certtool (1) - GnuTLS certificate tool\n" -"@dots {}\n" -msgstr "" +#: guix/scripts/challenge.scm:210 +#, scheme-format +msgid "~a contents match:~%" +msgstr "le contenu de ~a correspond:~%" -#. type: Plain text -#: doc/guix.texi:21877 -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 "" +#: guix/scripts/challenge.scm:219 +msgid "~h store items were analyzed:~%" +msgstr "~h éléments du dépôt ont été analysés :~%" -#. type: Plain text -#: doc/guix.texi:21880 -msgid "Once you have these results, you can view the relevant documentation by running, say:" -msgstr "" +#: guix/scripts/challenge.scm:220 +msgid " - ~h (~,1f%) were identical~%" +msgstr " - ~h (~,1f%) étaient identiques~%" -#. type: example -#: doc/guix.texi:21883 -#, no-wrap -msgid "$ info \"(gnutls)Core TLS API\"\n" -msgstr "" +#: guix/scripts/challenge.scm:222 +msgid " - ~h (~,1f%) differed~%" +msgstr " - ~h (~,1f%) étaient différents~%" -#. type: Plain text -#: doc/guix.texi:21887 -msgid "or:" -msgstr "" +#: guix/scripts/challenge.scm:224 +msgid " - ~h (~,1f%) were inconclusive~%" +msgstr " - ~h (~,1f%) étaient impossibles à évaluer~%" -#. type: example -#: doc/guix.texi:21890 -#, no-wrap -msgid "$ man certtool\n" +#: guix/scripts/challenge.scm:233 +msgid "" +"Usage: guix challenge [PACKAGE...]\n" +"Challenge the substitutes for PACKAGE... provided by one or more servers.\n" msgstr "" +"Usage : guix challenge [PAQUET...]\n" +"Contrôle les substituts du PAQUET... fourni par un ou plusieurs serveurs.\n" -#. type: Plain text -#: doc/guix.texi:21898 -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." +#: guix/scripts/challenge.scm:235 +msgid "" +"\n" +" --substitute-urls=URLS\n" +" compare build results with those at URLS" msgstr "" +"\n" +" --substitute-urls=URLS\n" +" comparer les résultats de compilation avec ceux aux URLS" -#. type: cindex -#: doc/guix.texi:21902 -#, no-wrap -msgid "debugging files" +#: guix/scripts/challenge.scm:238 +msgid "" +"\n" +" -v, --verbose show details about successful comparisons" msgstr "" +"\n" +" -v, --verbose montrer les détails des comparaisons réussies" -#. type: Plain text -#: doc/guix.texi:21908 -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 "" +#: guix/scripts/copy.scm:59 +#, scheme-format +msgid "~a: invalid TCP port number~%" +msgstr "~a : numéro de port TCP invalide~%" -#. type: Plain text -#: doc/guix.texi:21916 -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 "Le problème avec les informations de débogage est qu'elles prennent pas mal de place sur le disque. Par exemple, les informations de débogage de la bibliothèque C de GNU prend plus de 60 Mo. Ainsi, en tant qu'utilisateur, garder toutes les informations de débogage de tous les programmes installés n'est souvent pas une possibilité. Cependant, l'économie d'espace ne devrait pas empêcher le débogage — en particulier, dans le système GNU, qui devrait faciliter pour ses utilisateurs l'exercice de leurs libertés (@pxref{Distribution GNU})." +#: guix/scripts/copy.scm:61 +#, scheme-format +msgid "~a: invalid SSH specification~%" +msgstr "~a : spécification SSH invalide~%" -#. type: Plain text -#: doc/guix.texi:21923 -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})." +#: guix/scripts/copy.scm:113 +msgid "" +"Usage: guix copy [OPTION]... ITEMS...\n" +"Copy ITEMS to or from the specified host over SSH.\n" msgstr "" +"Usage: guix copy [OPTION]... ÉLÉMENTS...\n" +"Copier les ÉLÉMENTS vers ou depuis l'hôte spécifié en SSH.\n" -#. type: Plain text -#: doc/guix.texi:21931 -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:" +#: guix/scripts/copy.scm:115 +msgid "" +"\n" +" --to=HOST send ITEMS to HOST" msgstr "" +"\n" +" --to=HÔTE envoyer les ÉLÉMENTS vers l'HÔTE" -#. type: example -#: doc/guix.texi:21934 -#, no-wrap -msgid "guix package -i glibc:debug guile:debug\n" +#: guix/scripts/copy.scm:117 +msgid "" +"\n" +" --from=HOST receive ITEMS from HOST" msgstr "" +"\n" +" --from=HÔTE recevoir les ÉLÉMENTS depuis l'HÔTE" -#. type: Plain text -#: doc/guix.texi:21940 -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 "" +#: guix/scripts/copy.scm:169 +#, scheme-format +msgid "use '--to' or '--from'~%" +msgstr "utilisez « --to » ou « --from »~%" + +#: guix/scripts/pack.scm:89 +#, scheme-format +msgid "~a: compressor not found~%" +msgstr "~a : compresseur introuvable~%" -#. type: example -#: doc/guix.texi:21943 -#, no-wrap -msgid "(gdb) set debug-file-directory ~/.guix-profile/lib/debug\n" +#: guix/scripts/pack.scm:467 +#, scheme-format +msgid "" +"cross-compilation not implemented here;\n" +"please email '~a'~%" msgstr "" +"la compilation croisée n'est pas implémentée ici ;\n" +"envoyez un courriel à « ~a »~%" + +#: guix/scripts/pack.scm:621 +#, scheme-format +msgid "~a: invalid symlink specification~%" +msgstr "~a : spécification de lien symbolique invalide~%" -#. type: Plain text -#: doc/guix.texi:21947 -msgid "From there on, GDB will pick up debugging information from the @code{.debug} files under @file{~/.guix-profile/lib/debug}." +#: guix/scripts/pack.scm:634 +msgid "" +"Usage: guix pack [OPTION]... PACKAGE...\n" +"Create a bundle of PACKAGE.\n" msgstr "" +"Utilisation : guix pack [OPTION]... PAQUET...\n" +"Créer un lot applicatif de PAQUET.\n" -#. type: Plain text -#: doc/guix.texi:21954 -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})." +#: guix/scripts/pack.scm:640 +msgid "" +"\n" +" -f, --format=FORMAT build a pack in the given FORMAT" msgstr "" +"\n" +" -f, --format=FORMAT créer un lot applicatif dans le FORMAT donné" -#. type: Plain text -#: doc/guix.texi:21963 -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})." +#: guix/scripts/pack.scm:642 +msgid "" +"\n" +" -R, --relocatable produce relocatable executables" msgstr "" +"\n" +" -R, --relocatable produire des exécutables repositionnables" -#. type: cindex -#: doc/guix.texi:21968 -#, no-wrap -msgid "security updates" +#: guix/scripts/pack.scm:650 +msgid "" +"\n" +" -C, --compression=TOOL compress using TOOL--e.g., \"lzip\"" msgstr "" +"\n" +" -C, --compression=OUTIL\n" +" compresser en utilisant l'OUTIL, par ex, « lzip »" -#. type: Plain text -#: doc/guix.texi:21977 -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:" +#: guix/scripts/pack.scm:652 +msgid "" +"\n" +" -S, --symlink=SPEC create symlinks to the profile according to SPEC" msgstr "" +"\n" +" -S, --symlink=SPEC créer des liens symboliques vers le profil selon la SPEC" -#. type: smallexample -#: doc/guix.texi:21984 -#, no-wrap +#: guix/scripts/pack.scm:654 msgid "" -"$ guix lint -c cve\n" -"gnu/packages/base.scm:652:2: glibc@@2.21: probably vulnerable to CVE-2015-1781, CVE-2015-7547\n" -"gnu/packages/gcc.scm:334:2: gcc@@4.9.3: probably vulnerable to CVE-2015-5276\n" -"gnu/packages/image.scm:312:2: openjpeg@@2.1.0: probably vulnerable to CVE-2016-1923, CVE-2016-1924\n" -"@dots{}\n" +"\n" +" -m, --manifest=FILE create a pack with the manifest from FILE" msgstr "" +"\n" +" -m, --manifest=FICHIER créer un lot avec le manifeste dans FICHIER" -#. type: Plain text -#: doc/guix.texi:21987 -msgid "@xref{Invoking guix lint}, for more information." +#: guix/scripts/pack.scm:656 +msgid "" +"\n" +" --localstatedir include /var/guix in the resulting pack" msgstr "" +"\n" +" --localstatedir inclure /var/guix dans le lot résultant" -#. type: quotation -#: doc/guix.texi:21991 -msgid "As of version @value{VERSION}, the feature described below is considered ``beta''." +#: guix/scripts/pack.scm:658 +msgid "" +"\n" +" --bootstrap use the bootstrap binaries to build the pack" msgstr "" +"\n" +" --bootstrap utiliser les programmes d'amorçage pour compiler le lot" -#. type: Plain text -#: doc/guix.texi:22001 -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 "Guix suit une discipline de gestion de paquets fonctionnelle (@pxref{Introduction}), ce qui implique que lorsqu'un paquet change, @emph{tous les paquets qui en dépendent} doivent être reconstruits. Cela peut grandement ralentir le déploiement de corrections dans les paquets du cœur comme libc ou bash comme presque toute la distribution aurait besoin d'être reconstruite. Cela aide d'utiliser des binaires pré-construits (@pxref{Substituts}), mais le déploiement peut toujours prendre plus de temps de souhaité." +#: guix/scripts/pack.scm:700 +#, scheme-format +msgid "both a manifest and a package list were given~%" +msgstr "vous avez donné à la fois un manifeste et une liste de paquets~%" -#. type: cindex -#: doc/guix.texi:22002 -#, no-wrap -msgid "grafts" -msgstr "" +#: guix/scripts/pack.scm:743 +#, scheme-format +msgid "~a: unknown pack format" +msgstr "~a : format de paquet inconnu" -#. type: Plain text -#: doc/guix.texi:22010 -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 "" +#: guix/scripts/weather.scm:72 +msgid "computing ~h package derivations for ~a...~%" +msgstr "calcul de ~h dérivations de paquets pour ~a…~%" -#. type: cindex -#: doc/guix.texi:22011 -#, no-wrap -msgid "replacements of packages, for grafts" -msgstr "" +#: guix/scripts/weather.scm:161 +msgid "looking for ~h store items on ~a...~%" +msgstr "recherche de ~h éléments du dépôt sur ~a...~%" -#. type: Plain text -#: doc/guix.texi:22017 -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 @var{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 "" +#: guix/scripts/weather.scm:173 +msgid " ~2,1f% substitutes available (~h out of ~h)~%" +msgstr " ~2,1f% substituts disponibles (~h sur ~h)~%" -#. type: example -#: doc/guix.texi:22024 -#, no-wrap -msgid "" -"(define bash\n" -" (package\n" -" (name \"bash\")\n" -" ;; @dots{}\n" -" (replacement bash-fixed)))\n" -msgstr "" +#: guix/scripts/weather.scm:179 +#, scheme-format +msgid " unknown substitute sizes~%" +msgstr " taille des substituts inconnue~%" -#. type: Plain text -#: doc/guix.texi:22034 -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 @var{bash-fixed} instead of @var{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 "" +#: guix/scripts/weather.scm:182 +msgid " ~,1h MiB of nars (compressed)~%" +msgstr " ~,1h Mo de fichiers nar (compressés)~%" -#. type: Plain text -#: doc/guix.texi:22042 -msgid "Currently, the length of the name and version of the graft and that of the package it replaces (@var{bash-fixed} and @var{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 "" +#: guix/scripts/weather.scm:183 +msgid " at least ~,1h MiB of nars (compressed)~%" +msgstr " au moins ~,1h Mo de fichiers nar (compressés)~%" -#. type: Plain text -#: doc/guix.texi:22046 -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 "" +#: guix/scripts/weather.scm:185 +msgid " ~,1h MiB on disk (uncompressed)~%" +msgstr " ~,1h Mo sur le disque (décompressé)~%" -#. type: example -#: doc/guix.texi:22049 -#, no-wrap -msgid "guix build bash --no-grafts\n" -msgstr "" +#: guix/scripts/weather.scm:187 +msgid " ~,3h seconds per request (~,1h seconds in total)~%" +msgstr " ~,3h secondes par requête (~,1h secondesen tout)~%" -#. type: Plain text -#: doc/guix.texi:22053 -msgid "returns the store file name of the original Bash, whereas:" -msgstr "" +#: guix/scripts/weather.scm:189 +msgid " ~,1h requests per second~%" +msgstr " ~,1h requêtes par seconde~%" -#. type: example -#: doc/guix.texi:22056 -#, no-wrap -msgid "guix build bash\n" -msgstr "" +#: guix/scripts/weather.scm:195 +#, scheme-format +msgid " (continuous integration information unavailable)~%" +msgstr " (informations sur l’intégration continue indisponibles)~%" -#. type: Plain text -#: doc/guix.texi:22061 -msgid "returns the store file name of the ``fixed'', replacement Bash. This allows you to distinguish between the two variants of Bash." -msgstr "" +#: guix/scripts/weather.scm:198 +#, scheme-format +msgid " '~a' returned ~a (~s)~%" +msgstr " « ~a » a renvoyé ~a (~s)~%" -#. type: Plain text -#: doc/guix.texi:22064 -msgid "To verify which Bash your whole profile refers to, you can run (@pxref{Invoking guix gc}):" -msgstr "" +#: guix/scripts/weather.scm:215 +msgid " ~,1f% (~h out of ~h) of the missing items are queued~%" +msgstr " ~,1f% (~h sur ~h) des éléments manquants sont dans la queue~%" -#. type: example -#: doc/guix.texi:22067 -#, no-wrap -msgid "guix gc -R `readlink -f ~/.guix-profile` | grep bash\n" -msgstr "" +#: guix/scripts/weather.scm:221 +msgid " at least ~h queued builds~%" +msgstr " au moins ~h constructions dans la queue~%" -#. type: Plain text -#: doc/guix.texi:22072 -msgid "@dots{} and compare the store file names that you get with those above. Likewise for a complete GuixSD system generation:" -msgstr "" +#: guix/scripts/weather.scm:222 +msgid " ~h queued builds~%" +msgstr " ~h constructions dans la queue~%" -#. type: example -#: doc/guix.texi:22075 -#, no-wrap -msgid "guix gc -R `guix system build my-config.scm` | grep bash\n" -msgstr "" +#: guix/scripts/weather.scm:225 +#, scheme-format +msgid " ~a: ~a (~0,1f%)~%" +msgstr " ~a : ~a (~0,1f%)~%" -#. type: Plain text -#: doc/guix.texi:22079 -msgid "Lastly, to check which Bash running processes are using, you can use the @command{lsof} command:" -msgstr "" +#: guix/scripts/weather.scm:231 +#, scheme-format +msgid " build rate: ~1,2f builds per hour~%" +msgstr " vitesse de construction : ~1,2f constructions par l'heure~%" -#. type: example -#: doc/guix.texi:22082 -#, no-wrap -msgid "lsof | grep /gnu/store/.*bash\n" -msgstr "" +#: guix/scripts/weather.scm:235 +#, scheme-format +msgid " ~a: ~,2f builds per hour~%" +msgstr " ~a: ~,2f constructions par heure~%" -#. type: Plain text -#: doc/guix.texi:22099 -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})." +#: guix/scripts/weather.scm:247 +msgid "" +"Usage: guix weather [OPTIONS]\n" +"Report the availability of substitutes.\n" msgstr "" +"Usage : guix weather [OPTIONS]\n" +"Rapporte la disponibilité des substituts.\n" -#. type: Plain text -#: doc/guix.texi:22106 -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 package -i 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." +#: guix/scripts/weather.scm:249 +msgid "" +"\n" +" --substitute-urls=URLS\n" +" check for available substitutes at URLS" msgstr "" +"\n" +" --substitute-urls=URLS\n" +" vérifie la disponibilité des substituts aux URLS" -#. type: cindex -#: doc/guix.texi:22108 -#, no-wrap -msgid "package module search path" +#: guix/scripts/weather.scm:252 +msgid "" +"\n" +" -m, --manifest=MANIFEST\n" +" look up substitutes for packages specified in MANIFEST" msgstr "" +"\n" +" -m, --manifest=MANIFESTE\n" +" recherche les substituts des paquets du MANIFESTE" -#. type: Plain text -#: doc/guix.texi:22125 -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.}. These package definitions will not be visible by default. Users can invoke commands such as @command{guix package} and @command{guix build} with the @code{-e} option so that they know where to find the package. Better yet, they can use the @code{-L} option of these commands to make those modules visible (@pxref{Invoking guix build, @code{--load-path}}), or define the @code{GUIX_PACKAGE_PATH} environment variable. This environment variable makes it easy to extend or customize the distribution and is honored by all the user interfaces." +#: guix/scripts/weather.scm:255 +msgid "" +"\n" +" -s, --system=SYSTEM consider substitutes for SYSTEM--e.g., \"i686-linux\"" msgstr "" +"\n" +" -s, --system=SYSTÈME prend en compte les substituts pour le SYSTÈME, par exemple « i686-linux »" -#. type: defvr -#: doc/guix.texi:22126 -#, no-wrap -msgid "{Environment Variable} GUIX_PACKAGE_PATH" -msgstr "" +#: guix/scripts/weather.scm:279 +#, scheme-format +msgid "~a: invalid URL~%" +msgstr "~a : URL invalide~%" -#. type: defvr -#: doc/guix.texi:22130 -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 "" +#: guix/gnu-maintenance.scm:570 +msgid "Updater for GNU packages" +msgstr "Logiciel de mise à jour des paquets GNU" -#. type: Plain text -#: doc/guix.texi:22138 -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 "" +#: guix/gnu-maintenance.scm:579 +msgid "Updater for GNU packages only available via FTP" +msgstr "Logiciel de mise à jour des paquets GNU disponibles uniquement par FTP" -#. type: cindex -#: doc/guix.texi:22142 -#, no-wrap -msgid "packages, creating" -msgstr "" +#: guix/gnu-maintenance.scm:588 +msgid "Updater for KDE packages" +msgstr "Logiciel de mise à jour des paquets KDE" -#. type: Plain text -#: doc/guix.texi:22147 -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. @xref{Contributing}, for additional information on how you can help." -msgstr "" +#: guix/gnu-maintenance.scm:595 +msgid "Updater for X.org packages" +msgstr "Logiciel de mise à jour des paquets X.org" -#. type: Plain text -#: doc/guix.texi:22155 -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 "" +#: guix/gnu-maintenance.scm:602 +msgid "Updater for packages hosted on kernel.org" +msgstr "Logiciel de mise à jour des paquets hébergés sur kernel.org" -#. type: Plain text -#: doc/guix.texi:22164 -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}." +#: guix/scripts/container.scm:25 +msgid "" +"Usage: guix container ACTION ARGS...\n" +"Build and manipulate Linux containers.\n" msgstr "" +"Usage : guix container ACTION ARGS...\n" +"Compile et manipule des containers Linux.\n" -#. type: Plain text -#: doc/guix.texi:22170 -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/scripts/container.scm:30 +msgid " exec execute a command inside of an existing container\n" +msgstr " exec exécuter une commande dans un container existant\n" -#. type: example -#: doc/guix.texi:22173 -#, no-wrap -msgid "./pre-inst-env guix build gnew --keep-failed\n" -msgstr "" +#: guix/scripts/container.scm:53 +#, scheme-format +msgid "guix container: missing action~%" +msgstr "guix container : action manquante~%" -#. type: Plain text -#: doc/guix.texi:22179 -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 "" +#: guix/scripts/container.scm:63 +#, scheme-format +msgid "guix container: invalid action~%" +msgstr "guix container : action invalide~%" -#. type: Plain text -#: doc/guix.texi:22184 -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:" +#: guix/scripts/container/exec.scm:40 +msgid "" +"Usage: guix container exec PID COMMAND [ARGS...]\n" +"Execute COMMMAND within the container process PID.\n" msgstr "" +"Usage : guix container exec PID COMMANDE [ARGS...]\n" +"Exécuter la COMMANDE dans le container du processus PID.\n" -#. type: example -#: doc/guix.texi:22187 -#, no-wrap -msgid "./pre-inst-env guile -c '(use-modules (gnu packages gnew))'\n" -msgstr "" +#: guix/scripts/container/exec.scm:69 +#, scheme-format +msgid "~a: extraneous argument~%" +msgstr "~a : argument superflu~%" -#. type: Plain text -#: doc/guix.texi:22195 -msgid "Once your package builds correctly, please send us a patch (@pxref{Contributing}). 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{http://hydra.gnu.org/jobset/gnu/master, our continuous integration system}." -msgstr "" +#: guix/scripts/container/exec.scm:87 +#, scheme-format +msgid "no pid specified~%" +msgstr "aucun pid spécifié~%" -#. type: cindex -#: doc/guix.texi:22196 -#, no-wrap -msgid "substituter" -msgstr "" +#: guix/scripts/container/exec.scm:90 +#, scheme-format +msgid "no command specified~%" +msgstr "aucune commande spécifiée~%" -#. type: Plain text -#: doc/guix.texi:22203 -msgid "Users can obtain the new package definition simply by running @command{guix pull} (@pxref{Invoking guix pull}). When @code{hydra.gnu.org} 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 "On peut obtenir la nouvelle définition du paquet simplement en lançant @command{guix pull} (@pxref{Invoking guix pull}). Lorsque @code{hydra.gnu.org} a fini de construire le paquet, l'installation du paquet y télécharge automatiquement les binaires (@pxref{Substituts}). La seule intervention humaine requise est pendant la revue et l'application du correctif." +#: guix/scripts/container/exec.scm:93 +#, scheme-format +msgid "no such process ~d~%" +msgstr "aucun processus ~d~%" -#. type: cindex -#: doc/guix.texi:22220 -#, no-wrap -msgid "free software" -msgstr "" +#: guix/scripts/container/exec.scm:105 +#, scheme-format +msgid "exec failed with status ~d~%" +msgstr "exec a échoué avec le statut ~d~%" -#. type: Plain text -#: doc/guix.texi:22228 -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." -msgstr "" +#: guix/upstream.scm:250 +#, scheme-format +msgid "signature verification failed for `~a'~%" +msgstr "la vérification de la signature a échoué pour « ~a »~%" -#. type: Plain text -#: doc/guix.texi:22234 -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." -msgstr "" +#: guix/upstream.scm:252 +#, scheme-format +msgid "(could be because the public key is not in your keyring)~%" +msgstr "(il est possible que la clé publique ne soit pas dans dans votre trousseau)~%" + +#: guix/upstream.scm:337 +#, scheme-format +msgid "~a: could not locate source file" +msgstr "~a : le fichier source est introuvable" -#. type: Plain text -#: doc/guix.texi:22242 -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 "" +#: guix/upstream.scm:342 +#, scheme-format +msgid "~a: ~a: no `version' field in source; skipping~%" +msgstr "~a : ~a : aucun champ « version » dans la source ; ignoré~%" + +#: guix/ui.scm:169 +#, scheme-format +msgid "error: ~a: unbound variable" +msgstr "erreur : ~a : variable non liée" -#. type: cindex -#: doc/guix.texi:22247 -#, no-wrap -msgid "package name" -msgstr "" +#: guix/ui.scm:265 +msgid "entering debugger; type ',bt' for a backtrace\n" +msgstr "entrée dans le débogueur; tapez « ,bt » pour la trace d'exécution\n" -#. type: Plain text -#: doc/guix.texi:22255 -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 "" +#: guix/ui.scm:314 +#, scheme-format +msgid "hint: ~a~%" +msgstr "conseil : ~a~%" -#. type: Plain text -#: doc/guix.texi:22260 -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 "" +#: guix/ui.scm:330 +msgid "Did you forget a @code{use-modules} form?" +msgstr "Auriez-vous oublié un @code{use-modules} ?" -#. type: Plain text -#: doc/guix.texi:22265 -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 "" +#: guix/ui.scm:332 +#, scheme-format +msgid "Did you forget @code{(use-modules ~a)}?" +msgstr "Auriez-vous oublié @code{(use-modules ~a)} ?" -#. type: Plain text -#: doc/guix.texi:22267 -msgid "Font package names are handled differently, @pxref{Fonts}." -msgstr "" +#: guix/ui.scm:341 guix/ui.scm:381 guix/ui.scm:388 +#, scheme-format +msgid "failed to load '~a': ~a~%" +msgstr "impossible de charger « ~a » : ~a~%" -#. type: cindex -#: doc/guix.texi:22272 -#, no-wrap -msgid "package version" -msgstr "" +#: guix/ui.scm:348 +#, scheme-format +msgid "~amissing closing parenthesis~%" +msgstr "~a parenthèses fermantes manquantes~%" -#. type: Plain text -#: doc/guix.texi:22281 -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 "" +#: guix/ui.scm:353 guix/ui.scm:361 guix/ui.scm:692 +#, scheme-format +msgid "~a: error: ~a~%" +msgstr "~a : erreur: ~a~%" -#. type: Plain text -#: doc/guix.texi:22284 -msgid "The name inside the package definition is the same for all versions of a package and does not contain any version number." -msgstr "" +#: guix/ui.scm:368 guix/ui.scm:762 +#, scheme-format +msgid "exception thrown: ~s~%" +msgstr "exception générée : ~s~%" -#. type: Plain text -#: doc/guix.texi:22286 -msgid "For instance, the versions 2.24.20 and 3.9.12 of GTK+ may be packaged as follows:" -msgstr "" +#: guix/ui.scm:372 guix/ui.scm:394 +#, scheme-format +msgid "failed to load '~a':~%" +msgstr "échec lors du chargement de « ~a » :~%" -#. type: example -#: doc/guix.texi:22298 -#, no-wrap -msgid "" -"(define-public gtk+\n" -" (package\n" -" (name \"gtk+\")\n" -" (version \"3.9.12\")\n" -" ...))\n" -"(define-public gtk+-2\n" -" (package\n" -" (name \"gtk+\")\n" -" (version \"2.24.20\")\n" -" ...))\n" -msgstr "" +#: guix/ui.scm:384 +#, scheme-format +msgid "~a: warning: ~a~%" +msgstr "~a : avertissement : ~a~%" -#. type: Plain text -#: doc/guix.texi:22300 -msgid "If we also wanted GTK+ 3.8.2, this would be packaged as" -msgstr "" +#: guix/ui.scm:391 +#, scheme-format +msgid "failed to load '~a': exception thrown: ~s~%" +msgstr "échec lors du chargement de « ~a » : exception générée : ~s~%" -#. type: example -#: doc/guix.texi:22306 -#, no-wrap -msgid "" -"(define-public gtk+-3.8\n" -" (package\n" -" (name \"gtk+\")\n" -" (version \"3.8.2\")\n" -" ...))\n" -msgstr "" +#: guix/ui.scm:424 +#, scheme-format +msgid "failed to install locale: ~a~%" +msgstr "impossible d'installer l'environnement linguistique : ~a~%" -#. type: cindex -#: doc/guix.texi:22310 -#, no-wrap -msgid "version number, for VCS snapshots" -msgstr "" +#. TRANSLATORS: Translate "(C)" to the copyright symbol +#. (C-in-a-circle), if this symbol is available in the user's +#. locale. Otherwise, do not translate "(C)"; leave it as-is. */ +#: guix/ui.scm:454 +msgid "(C)" +msgstr "©" -#. type: Plain text -#: doc/guix.texi:22316 -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 "" +#: guix/ui.scm:455 +msgid "the Guix authors\n" +msgstr "les auteurs de Guix\n" -#. type: Plain text -#: doc/guix.texi:22324 -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:" +#: guix/ui.scm:456 +msgid "" +"License GPLv3+: GNU GPL version 3 or later \n" +"This is free software: you are free to change and redistribute it.\n" +"There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" +"Licence GPLv3+ : GNU GPL version 3 ou ultérieure \n" +"Ceci est un logiciel libre : vous êtes libre de le modifier et de le redistribuer.\n" +"Il n'y a AUCUNE GARANTIE, dans les limites permises par la loi.\n" -#. type: example -#: doc/guix.texi:22333 -#, no-wrap +#. TRANSLATORS: The placeholder indicates the bug-reporting address for this +#. package. Please add another line saying "Report translation bugs to +#. ...\n" with the address for translation bugs (typically your translation +#. team's web or email address). +#: guix/ui.scm:468 +#, scheme-format msgid "" -"2.0.11-3.cabba9e\n" -" ^ ^ ^\n" -" | | `-- upstream commit ID\n" -" | |\n" -" | `--- Guix package revision\n" -" |\n" -"latest upstream version\n" +"\n" +"Report bugs to: ~a." msgstr "" +"\n" +"Signalez toute anomalie à : ~a.\n" +"Signalez toute erreur de traduction à : traduc@traduc.org." -#. type: Plain text -#: doc/guix.texi:22342 -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:" +#: guix/ui.scm:470 +#, scheme-format +msgid "" +"\n" +"~a home page: <~a>" msgstr "" +"\n" +"~a page d'accueil : <~a>" -#. type: example -#: doc/guix.texi:22358 -#, no-wrap +#: guix/ui.scm:472 msgid "" -"(define my-package\n" -" (let ((commit \"c3f29bc928d5900971f65965feaae59e1272a3f7\")\n" -" (revision \"1\")) ;Guix package revision\n" -" (package\n" -" (version (git-version \"0.9\" revision commit))\n" -" (source (origin\n" -" (method git-fetch)\n" -" (uri (git-reference\n" -" (url \"git://example.org/my-package.git\")\n" -" (commit commit)))\n" -" (sha256 (base32 \"1mbikn@dots{}\"))\n" -" (file-name (git-file-name name version))))\n" -" ;; @dots{}\n" -" )))\n" -msgstr "" -"(define my-package\n" -" (let ((commit \"c3f29bc928d5900971f65965feaae59e1272a3f7\")\n" -" (revision \"1\")) ;révision du paquet Guix\n" -" (package\n" -" (version (git-version \"0.9\" revision commit))\n" -" (source (origin\n" -" (method git-fetch)\n" -" (uri (git-reference\n" -" (url \"git://example.org/my-package.git\")\n" -" (commit commit)))\n" -" (sha256 (base32 \"1mbikn@dots{}\"))\n" -" (file-name (git-file-name name version))))\n" -" ;; @dots{}\n" -" )))\n" - -#. type: cindex -#: doc/guix.texi:22363 -#, no-wrap -msgid "package description" +"\n" +"General help using GNU software: " msgstr "" +"\n" +"Aide générale sur l'utilisation des logiciels GNU : " -#. type: cindex -#: doc/guix.texi:22364 -#, no-wrap -msgid "package synopsis" -msgstr "" +#: guix/ui.scm:517 +#, scheme-format +msgid "'~a' is not a valid regular expression: ~a~%" +msgstr "« ~a » n'est pas une expression rationnelle valide : ~a~%" -#. type: Plain text -#: doc/guix.texi:22371 -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 "" +#: guix/ui.scm:523 +#, scheme-format +msgid "~a: invalid number~%" +msgstr "~a : nombre non valide~%" -#. type: Plain text -#: doc/guix.texi:22379 -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 "" +#: guix/ui.scm:540 +#, scheme-format +msgid "invalid number: ~a~%" +msgstr "nombre non valide : ~a~%" -#. type: Plain text -#: doc/guix.texi:22389 -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 "" +#: guix/ui.scm:563 +#, scheme-format +msgid "unknown unit: ~a~%" +msgstr "unité inconnue : ~a~%" -#. type: Plain text -#: doc/guix.texi:22397 -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." +#: guix/ui.scm:578 +#, scheme-format +msgid "" +"You cannot have two different versions\n" +"or variants of @code{~a} in the same profile." msgstr "" +"Vous ne pouvez pas avoir deux versions ou variantes\n" +"différentes de @code{~a} dans le même profil." -#. type: cindex -#: doc/guix.texi:22398 -#, no-wrap -msgid "Texinfo markup, in package descriptions" +#: guix/ui.scm:581 +#, scheme-format +msgid "" +"Try upgrading both @code{~a} and @code{~a},\n" +"or remove one of them from the profile." msgstr "" +"Essayez de mettre à jour à la fois @code{~a} et @code{~a},\n" +"ou supprimez-en un du profil." -#. type: Plain text -#: doc/guix.texi:22407 -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 "" +#: guix/ui.scm:600 +#, scheme-format +msgid "~a:~a:~a: package `~a' has an invalid input: ~s~%" +msgstr "~a :~a :~a : le paquet « ~a » a une entrée non valide : ~s~%" -#. type: Plain text -#: doc/guix.texi:22413 -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." -msgstr "" +#: guix/ui.scm:607 +#, scheme-format +msgid "~a: ~a: build system `~a' does not support cross builds~%" +msgstr "~a : ~a : le système de compilation « ~a » ne supporte pas la compilation croisée~%" -#. type: Plain text -#: doc/guix.texi:22418 -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 "" +#: guix/ui.scm:613 +#, scheme-format +msgid "~s: invalid G-expression input~%" +msgstr "~s : entrée G-expression invalide~%" -#. type: lisp -#: doc/guix.texi:22424 -#, no-wrap -msgid "" -"(package\n" -" ;; @dots{}\n" -" (synopsis \"This is translatable\")\n" -" (description (string-append \"This is \" \"*not*\" \" translatable.\")))\n" -msgstr "" +#: guix/ui.scm:616 +#, scheme-format +msgid "profile '~a' does not exist~%" +msgstr "le profile « ~a » n'existe pas~%" -#. type: Plain text -#: doc/guix.texi:22432 -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 "" +#: guix/ui.scm:619 +#, scheme-format +msgid "generation ~a of profile '~a' does not exist~%" +msgstr "la génération ~a du profile « ~a » n'existe pas~%" -#. type: example -#: doc/guix.texi:22437 -#, no-wrap -msgid "" -";; TRANSLATORS: \"X11 resize-and-rotate\" should not be translated.\n" -"(description \"ARandR is designed to provide a simple visual front end\n" -"for the X11 resize-and-rotate (RandR) extension. @dots{}\")\n" -msgstr "" +#: guix/ui.scm:628 +#, scheme-format +msgid " ... propagated from ~a@~a~%" +msgstr " ... propagé depuis ~a@~a~%" -#. type: cindex -#: doc/guix.texi:22443 -#, no-wrap -msgid "python" -msgstr "" +#: guix/ui.scm:638 +#, scheme-format +msgid "profile contains conflicting entries for ~a~a~%" +msgstr "le profil contient des entrées en conflit pour ~a~a~%" -#. type: Plain text -#: doc/guix.texi:22449 -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 "" +#: guix/ui.scm:641 +#, scheme-format +msgid " first entry: ~a@~a~a ~a~%" +msgstr " première entrée : ~a@~a~a ~a~%" + +#: guix/ui.scm:647 +#, scheme-format +msgid " second entry: ~a@~a~a ~a~%" +msgstr " deuxième entrée : ~a@~a~a ~a~%" + +#: guix/ui.scm:659 +#, scheme-format +msgid "corrupt input while restoring '~a' from ~s~%" +msgstr "entrée corrompue en restaurant « ~a » depuis ~s~%" + +#: guix/ui.scm:661 +#, scheme-format +msgid "corrupt input while restoring archive from ~s~%" +msgstr "entrée corrompue en restaurant l'archive depuis ~s~%" + +#: guix/ui.scm:664 +#, scheme-format +msgid "failed to connect to `~a': ~a~%" +msgstr "impossible de se connecter à « ~a » : ~a~%" + +#: guix/ui.scm:669 +#, scheme-format +msgid "build failed: ~a~%" +msgstr "la compilation a échoué : ~a~%" + +#: guix/ui.scm:672 +#, scheme-format +msgid "reference to invalid output '~a' of derivation '~a'~%" +msgstr "référence à la sortie invalide « ~a » de la dérivation « ~a »~%" + +#: guix/ui.scm:676 +#, scheme-format +msgid "file '~a' could not be found in these directories:~{ ~a~}~%" +msgstr "le fichier « ~a » n'a pas été trouvé dans ces répertoires :~{ ~a~}~%" + +#: guix/ui.scm:681 +#, scheme-format +msgid "program exited~@[ with non-zero exit status ~a~]~@[ terminated by signal ~a~]~@[ stopped by signal ~a~]: ~s~%" +msgstr "le programme a quitté~@[ avec un statut non nul ~a~]~@[ terminé par le signal ~a~]~@[ arrêté par le signal ~a~] : ~s~%" + +#: guix/ui.scm:712 +#, scheme-format +msgid "~a: ~a~%" +msgstr "~a: ~a~%" + +#: guix/ui.scm:747 +#, scheme-format +msgid "failed to read expression ~s: ~s~%" +msgstr "impossible de lire l'expression ~s : ~s~%" + +#: guix/ui.scm:753 +#, scheme-format +msgid "failed to evaluate expression '~a':~%" +msgstr "impossible d'évaluer l'expression « ~a » :~%" + +#: guix/ui.scm:756 +#, scheme-format +msgid "syntax error: ~a~%" +msgstr "erreur de syntaxe : ~a~%" + +#: guix/ui.scm:774 +#, scheme-format +msgid "expression ~s does not evaluate to a package~%" +msgstr "l'expression ~s ne correspond à aucun paquet~%" + +#: guix/ui.scm:793 +msgid "at least ~,1h MB needed but only ~,1h MB available in ~a~%" +msgstr "au moins ~,1h Mo sont nécessaires mais seulement ~,1h Mo sont disponibles dans ~a~%" + +#: guix/ui.scm:861 +#, scheme-format +msgid "~:[The following derivation would be built:~%~{ ~a~%~}~;~]" +msgid_plural "~:[The following derivations would be built:~%~{ ~a~%~}~;~]" +msgstr[0] "~:[La dérivation suivante serait compilée :~%~{ ~a~%~}~;~]" +msgstr[1] "~:[Les dérivations suivantes seraient compilées :~%~{ ~a~%~}~;~]" + +#. TRANSLATORS: "MB" is for "megabyte"; it should be +#. translated to the corresponding abbreviation. +#: guix/ui.scm:869 +msgid "~:[~,1h MB would be downloaded:~%~{ ~a~%~}~;~]" +msgstr "~:[~,1h Mo seraient téléchargés :~%~{ ~a~%~}~;~]" + +#: guix/ui.scm:874 +#, scheme-format +msgid "~:[The following file would be downloaded:~%~{ ~a~%~}~;~]" +msgid_plural "~:[The following files would be downloaded:~%~{ ~a~%~}~;~]" +msgstr[0] "~:[Le fichier suivant serait téléchargé :~%~{ ~a~%~}~;~]" +msgstr[1] "~:[Les fichiers suivants seraient téléchargés :~%~{ ~a~%~}~;~]" + +#: guix/ui.scm:881 +#, scheme-format +msgid "~:[The following derivation will be built:~%~{ ~a~%~}~;~]" +msgid_plural "~:[The following derivations will be built:~%~{ ~a~%~}~;~]" +msgstr[0] "~:[La dérivation suivante sera compilée :~%~{ ~a~%~}~;~]" +msgstr[1] "~:[Les dérivations suivantes seront compilées :~%~{ ~a~%~}~;~]" + +#. TRANSLATORS: "MB" is for "megabyte"; it should be +#. translated to the corresponding abbreviation. +#: guix/ui.scm:889 +msgid "~:[~,1h MB will be downloaded:~%~{ ~a~%~}~;~]" +msgstr "~:[~,1h Mo seront téléchargés :~%~{ ~a~%~}~;~]" + +#: guix/ui.scm:894 +#, scheme-format +msgid "~:[The following file will be downloaded:~%~{ ~a~%~}~;~]" +msgid_plural "~:[The following files will be downloaded:~%~{ ~a~%~}~;~]" +msgstr[0] "~:[Le fichier suivant sera téléchargé :~%~{ ~a~%~}~;~]" +msgstr[1] "~:[Les fichiers suivants seront téléchargés :~%~{ ~a~%~}~;~]" + +#: guix/ui.scm:954 +#, scheme-format +msgid "The following package would be removed:~%~{~a~%~}~%" +msgid_plural "The following packages would be removed:~%~{~a~%~}~%" +msgstr[0] "Le paquet suivant serait supprimé :~%~{~a~%~}~%" +msgstr[1] "Les paquets suivants seraient supprimés :~%~{~a~%~}~%" + +#: guix/ui.scm:959 +#, scheme-format +msgid "The following package will be removed:~%~{~a~%~}~%" +msgid_plural "The following packages will be removed:~%~{~a~%~}~%" +msgstr[0] "Le paquet suivant sera supprimé :~%~{~a~%~}~%" +msgstr[1] "Les paquets suivants seront supprimés :~%~{~a~%~}~%" + +#: guix/ui.scm:972 +#, scheme-format +msgid "The following package would be downgraded:~%~{~a~%~}~%" +msgid_plural "The following packages would be downgraded:~%~{~a~%~}~%" +msgstr[0] "Le paquet suivant serait mis à une version inférieure :~%~{~a~%~}~%" +msgstr[1] "Les paquets suivants seraient mis à des versions inférieures :~%~{~a~%~}~%" + +#: guix/ui.scm:977 +#, scheme-format +msgid "The following package will be downgraded:~%~{~a~%~}~%" +msgid_plural "The following packages will be downgraded:~%~{~a~%~}~%" +msgstr[0] "Le paquet suivant sera mis à une version inférieure :~%~{~a~%~}~%" +msgstr[1] "Les paquets suivants seront mis à des versions inférieures :~%~{~a~%~}~%" + +#: guix/ui.scm:990 +#, scheme-format +msgid "The following package would be upgraded:~%~{~a~%~}~%" +msgid_plural "The following packages would be upgraded:~%~{~a~%~}~%" +msgstr[0] "Le paquet suivant serait mis à jour :~%~{~a~%~}~%" +msgstr[1] "Les paquets suivants seraient mis à jour :~%~{~a~%~}~%" + +#: guix/ui.scm:995 +#, scheme-format +msgid "The following package will be upgraded:~%~{~a~%~}~%" +msgid_plural "The following packages will be upgraded:~%~{~a~%~}~%" +msgstr[0] "Le paquet suivant sera mis à jour :~%~{~a~%~}~%" +msgstr[1] "Les paquets suivants seront mis à jour :~%~{~a~%~}~%" + +#: guix/ui.scm:1006 +#, scheme-format +msgid "The following package would be installed:~%~{~a~%~}~%" +msgid_plural "The following packages would be installed:~%~{~a~%~}~%" +msgstr[0] "Le paquet suivant serait installé :~%~{~a~%~}~%" +msgstr[1] "Les paquets suivants seraient installés :~%~{~a~%~}~%" + +#: guix/ui.scm:1011 +#, scheme-format +msgid "The following package will be installed:~%~{~a~%~}~%" +msgid_plural "The following packages will be installed:~%~{~a~%~}~%" +msgstr[0] "Le paquet suivant sera installé :~%~{~a~%~}~%" +msgstr[1] "Les paquets suivants seront installés :~%~{~a~%~}~%" + +#: guix/ui.scm:1028 +msgid "" +msgstr "" + +#: guix/ui.scm:1390 +#, scheme-format +msgid "Generation ~a\t~a" +msgstr "Génération ~a\t~a" + +#. TRANSLATORS: This is a format-string for date->string. +#. Please choose a format that corresponds to the +#. usual way of presenting dates in your locale. +#. See https://www.gnu.org/software/guile/manual/html_node/SRFI_002d19-Date-to-string.html +#. for details. +#: guix/ui.scm:1399 +#, scheme-format +msgid "~b ~d ~Y ~T" +msgstr "~d ~b ~Y ~T" + +#. TRANSLATORS: The word "current" here is an adjective for +#. "Generation", as in "current generation". Use the appropriate +#. gender where applicable. +#: guix/ui.scm:1405 +#, scheme-format +msgid "~a\t(current)~%" +msgstr "~a\t(actuelle)~%" + +#: guix/ui.scm:1448 +#, scheme-format +msgid "switched from generation ~a to ~a~%" +msgstr "passé de la génération ~a à ~a~%" + +#: guix/ui.scm:1464 +#, scheme-format +msgid "deleting ~a~%" +msgstr "suppression de ~a~%" + +#: guix/ui.scm:1495 +#, scheme-format +msgid "Try `guix --help' for more information.~%" +msgstr "Essayez « guix --help » pour plus d'informations.~%" + +#: guix/ui.scm:1523 +msgid "" +"Usage: guix COMMAND ARGS...\n" +"Run COMMAND with ARGS.\n" +msgstr "" +"Usage : guix COMMANDE ARGS...\n" +"Lance la COMMANDE avec les arguments ARGS.\n" + +#: guix/ui.scm:1526 +msgid "COMMAND must be one of the sub-commands listed below:\n" +msgstr "COMMANDE doit être une des sous-commandes listées ci-dessous :\n" + +#: guix/ui.scm:1546 +#, scheme-format +msgid "guix: ~a: command not found~%" +msgstr "guix : ~a : commande introuvable~%" + +#: guix/ui.scm:1576 +#, scheme-format +msgid "guix: missing command name~%" +msgstr "guix : nom de commande manquant~%" + +#: guix/ui.scm:1584 +#, scheme-format +msgid "guix: unrecognized option '~a'~%" +msgstr "guix : option « ~a » non reconnue ~%" + +#: guix/http-client.scm:117 +#, scheme-format +msgid "following redirection to `~a'...~%" +msgstr "redirection vers « ~a »...~%" + +#: guix/http-client.scm:129 +#, scheme-format +msgid "~a: HTTP download failed: ~a (~s)" +msgstr "~a : le téléchargement HTTP a échoué : ~a (~s)" + +#: guix/nar.scm:156 +msgid "signature is not a valid s-expression" +msgstr "la signature n'est pas une s-expression valide" + +#: guix/nar.scm:165 +msgid "invalid signature" +msgstr "signature non valide" + +#: guix/nar.scm:169 +msgid "invalid hash" +msgstr "empreinte non valide" + +#: guix/nar.scm:177 +msgid "unauthorized public key" +msgstr "clé publique non autorisée" + +#: guix/nar.scm:182 +msgid "corrupt signature data" +msgstr "signature corrompue" + +#: guix/nar.scm:202 +msgid "corrupt file set archive" +msgstr "ensemble de fichiers corrompu dans l'archive" + +#: guix/nar.scm:212 +#, scheme-format +msgid "importing file or directory '~a'...~%" +msgstr "import du fichier ou répertoire « ~a »...~%" + +#: guix/nar.scm:223 +#, scheme-format +msgid "found valid signature for '~a'~%" +msgstr "signature valide trouvée pour « ~a »~%" + +#: guix/nar.scm:230 +msgid "imported file lacks a signature" +msgstr "les fichiers importés requièrent une signature" + +#: guix/nar.scm:269 +msgid "invalid inter-file archive mark" +msgstr "marque d'archive inter-fichier non valide" + +#: nix/nix-daemon/guix-daemon.cc:66 +msgid "guix-daemon -- perform derivation builds and store accesses" +msgstr "guix-daemon -- réalise les compilations des dérivations et les accès au stockage" + +#: nix/nix-daemon/guix-daemon.cc:68 +msgid "This program is a daemon meant to run in the background. It serves requests sent over a Unix-domain socket. It accesses the store, and builds derivations on behalf of its clients." +msgstr "Ce programme est un démon qui tourne en tâche de fond. Il répond aux requêtes envoyées via des socket de type Unix-domain. Il accède au stockage et compile les dérivations pour le compte de ses clients." + +#: nix/nix-daemon/guix-daemon.cc:95 +msgid "SYSTEM" +msgstr "SYSTÈME" + +#: nix/nix-daemon/guix-daemon.cc:96 +msgid "assume SYSTEM as the current system type" +msgstr "suppose que SYSTÈME est le type de système actuel" -#. type: Plain text -#: doc/guix.texi:22455 -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." -msgstr "" +#: nix/nix-daemon/guix-daemon.cc:97 nix/nix-daemon/guix-daemon.cc:100 +msgid "N" +msgstr "N" -#. type: Plain text -#: doc/guix.texi:22461 -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 "" +#: nix/nix-daemon/guix-daemon.cc:98 +msgid "use N CPU cores to build each derivation; 0 means as many as available" +msgstr "utilise N cœurs CPU pour compiler chaque dérivation ; 0 signifie autant que disponible" + +#: nix/nix-daemon/guix-daemon.cc:101 +msgid "allow at most N build jobs" +msgstr "autorise au plus N tâches de compilation" + +#: nix/nix-daemon/guix-daemon.cc:102 nix/nix-daemon/guix-daemon.cc:104 +msgid "SECONDS" +msgstr "SECONDES" + +#: nix/nix-daemon/guix-daemon.cc:103 +msgid "mark builds as failed after SECONDS of activity" +msgstr "marque les constructions comme ayant échoué après SECONDES d'activité" -#. type: subsubsection -#: doc/guix.texi:22462 -#, no-wrap -msgid "Specifying Dependencies" -msgstr "" +#: nix/nix-daemon/guix-daemon.cc:105 +msgid "mark builds as failed after SECONDS of silence" +msgstr "marque les constructions comme ayant échoué après SECONDES de silence" -#. type: cindex -#: doc/guix.texi:22463 -#, no-wrap -msgid "inputs, for Python packages" -msgstr "" +#: nix/nix-daemon/guix-daemon.cc:107 +msgid "disable chroot builds" +msgstr "désactive les compilations chroot" -#. type: Plain text -#: doc/guix.texi:22468 -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 "" +#: nix/nix-daemon/guix-daemon.cc:108 +msgid "DIR" +msgstr "RÉP" -#. type: Plain text -#: doc/guix.texi:22474 -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 "" +#: nix/nix-daemon/guix-daemon.cc:109 +msgid "add DIR to the build chroot" +msgstr "ajoute RÉP au chroot de compilation" -#. type: itemize -#: doc/guix.texi:22482 -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 "" +#: nix/nix-daemon/guix-daemon.cc:110 +msgid "GROUP" +msgstr "GROUPE" -#. type: itemize -#: doc/guix.texi:22488 -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 "" +#: nix/nix-daemon/guix-daemon.cc:111 +msgid "perform builds as a user of GROUP" +msgstr "réalise les compilations en tant qu'un utilisateur du GROUPE" -#. type: itemize -#: doc/guix.texi:22496 -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 "" +#: nix/nix-daemon/guix-daemon.cc:113 +msgid "do not use substitutes" +msgstr "ne pas utiliser de substituts" -#. type: itemize -#: doc/guix.texi:22500 -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 "" +#: nix/nix-daemon/guix-daemon.cc:114 +msgid "URLS" +msgstr "URLS" -#. type: itemize -#: doc/guix.texi:22505 -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 "" +#: nix/nix-daemon/guix-daemon.cc:115 +msgid "use URLS as the default list of substitute providers" +msgstr "utilise URLS comme liste par défaut de fournisseurs de substituts" -#. type: itemize -#: doc/guix.texi:22511 -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 "" +#: nix/nix-daemon/guix-daemon.cc:117 +msgid "do not use the 'build hook'" +msgstr "n'utilise pas le « build hook »" -#. type: cindex -#: doc/guix.texi:22518 -#, no-wrap -msgid "perl" -msgstr "" +#: nix/nix-daemon/guix-daemon.cc:119 +msgid "cache build failures" +msgstr "garde les fonctionnalités de compilation en cache" -#. type: Plain text -#: doc/guix.texi:22529 -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 "" +#: nix/nix-daemon/guix-daemon.cc:121 +msgid "build each derivation N times in a row" +msgstr "compile chaque dérivation N fois de suite" -#. type: cindex -#: doc/guix.texi:22534 -#, no-wrap -msgid "java" -msgstr "" +#: nix/nix-daemon/guix-daemon.cc:123 +msgid "do not keep build logs" +msgstr "ne conserve pas les journaux de compilation" -#. type: Plain text -#: doc/guix.texi:22537 -msgid "Java programs standing for themselves are named as any other package, using the lowercase upstream name." -msgstr "" +#: nix/nix-daemon/guix-daemon.cc:126 +msgid "disable compression of the build logs" +msgstr "désactive la compression des journaux de compilation" -#. type: Plain text -#: doc/guix.texi:22543 -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 "" +#: nix/nix-daemon/guix-daemon.cc:128 +msgid "use the specified compression type for build logs" +msgstr "utilise le type de compression spécifié pour les journaux de compilation" -#. type: Plain text -#: doc/guix.texi:22549 -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 "" +#: nix/nix-daemon/guix-daemon.cc:133 +msgid "disable automatic file \"deduplication\" in the store" +msgstr "désactive la « déduplication » automatique des fichiers dans le stockage" -#. type: Plain text -#: doc/guix.texi:22560 -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 "" +#: nix/nix-daemon/guix-daemon.cc:143 +msgid "impersonate Linux 2.6" +msgstr "se faire passer pour Linux 2.6" -#. type: Plain text -#: doc/guix.texi:22564 -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 "" +#: nix/nix-daemon/guix-daemon.cc:147 +msgid "tell whether the GC must keep outputs of live derivations" +msgstr "indique si le GC doit garder les sorties des dérivations en temps réel" -#. type: Plain text -#: doc/guix.texi:22572 -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 "" +#: nix/nix-daemon/guix-daemon.cc:150 +msgid "tell whether the GC must keep derivations corresponding to live outputs" +msgstr "indique si le GC doit garder les dérivations correspondant aux sorties en temps réel" -#. type: Plain text -#: doc/guix.texi:22581 -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 "" +#: nix/nix-daemon/guix-daemon.cc:153 +msgid "SOCKET" +msgstr "SOCKET" -#. type: Plain text -#: doc/guix.texi:22587 -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 "" +#: nix/nix-daemon/guix-daemon.cc:154 +msgid "listen for connections on SOCKET" +msgstr "écoute sur SOCKET pour des connexions" -#. type: cindex -#: doc/guix.texi:22595 -#, no-wrap -msgid "bootstrapping" -msgstr "" +#: nix/nix-daemon/guix-daemon.cc:156 +msgid "produce debugging output" +msgstr "produit une sortie de déboguage" -#. type: Plain text -#: doc/guix.texi:22605 -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 "" +#~ msgid "Guix already up to date\n" +#~ msgstr "Guix est déjà à jour\n" -#. type: cindex -#: doc/guix.texi:22606 doc/guix.texi:22728 -#, no-wrap -msgid "bootstrap binaries" -msgstr "" +#~ msgid "updated ~a successfully deployed under `~a'~%" +#~ msgstr "~a a été mis à jour et déployé avec succès sous « ~a »~%" -#. type: Plain text -#: doc/guix.texi:22616 -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 "" +#~ msgid "failed to update Guix, check the build log~%" +#~ msgstr "échec de la mise à jour de Guix ; consultez le journal de compilation~%" -#. type: Plain text -#: doc/guix.texi:22619 -msgid "These bootstrap binaries are ``taken for granted'', though we can also re-create them if needed (more on that later)." -msgstr "" +#~ msgid "Try adding @code{(use-modules ~a)}." +#~ msgstr "Essayez d'ajouter @code{(use-modules ~a)}." -#. type: unnumberedsubsec -#: doc/guix.texi:22620 -#, no-wrap -msgid "Preparing to Use the Bootstrap Binaries" -msgstr "" +#~ msgid "unrecognized option: ~a~%" +#~ msgstr "option non reconnue: ~a~%" -#. type: Plain text -#: doc/guix.texi:22625 -msgid "@image{images/bootstrap-graph,6in,,Dependency graph of the early bootstrap derivations}" -msgstr "" +#~ msgid "tarball did not produce a single source directory" +#~ msgstr "la tarball n'a produit aucun répertoire source" -#. type: Plain text -#: doc/guix.texi:22630 -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 "" +#~ msgid "failed to unpack source code" +#~ msgstr "échec du dépaquetage du code source" -#. type: example -#: doc/guix.texi:22635 -#, no-wrap -msgid "" -"guix graph -t derivation \\\n" -" -e '(@@@@ (gnu packages bootstrap) %bootstrap-gcc)' \\\n" -" | dot -Tps > t.ps\n" -msgstr "" -"guix graph -t derivation \\\n" -" -e '(@@@@ (gnu packages bootstrap) %bootstrap-gcc)' \\\n" -" | dot -Tps > t.ps\n" +#~ msgid "failed to download up-to-date source, exiting\n" +#~ msgstr "impossible de télécharger une source à jour; fin\n" -#. type: Plain text -#: doc/guix.texi:22644 -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 "" +#~ msgid "substitute at '~a' lacks a signature~%" +#~ msgstr "le substitut à « ~a » n'a pas de signature~%" -#. type: Plain text -#: doc/guix.texi:22653 -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 "" +#~ msgid "Found valid signature for ~a~%" +#~ msgstr "Signature valide trouvée pour ~a~%" -#. type: Plain text -#: doc/guix.texi:22665 -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 "" +#~ msgid "From ~a~%" +#~ msgstr "De ~a~%" -#. type: Plain text -#: doc/guix.texi:22669 -msgid "Finally, the various tarballs are unpacked by the derivations @code{gcc-bootstrap-0.drv}, @code{glibc-bootstrap-0.drv}, etc., at which point we have a working C tool chain." -msgstr "" +#~ msgid "Downloading ~a~:[~*~; (~a installed)~]...~%" +#~ msgstr "Téléchargement de ~a~:[~*~; (~a installé)~]...~%" -#. type: unnumberedsubsec -#: doc/guix.texi:22671 -#, no-wrap -msgid "Building the Build Tools" -msgstr "" +#~ msgid "failed to install GRUB on device '~a'~%" +#~ msgstr "échec de l'installation de GRUB sur le périphérique « ~a »~%" -#. type: Plain text -#: doc/guix.texi:22680 -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 "" +#~ msgid "failed to re-install GRUB configuration file: '~a'~%" +#~ msgstr "échec à la ré-installation du fichier de configuration de GRUB: « ~a »~%" -#. type: Plain text -#: doc/guix.texi:22687 -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 "" +#~ msgid "assuming no CVE vulnerabilities~%" +#~ msgstr "on suppose qu'il n'y a pas de vulnérabilités CVE~%" -#. type: example -#: doc/guix.texi:22692 -#, no-wrap -msgid "" -"guix graph -t bag \\\n" -" -e '(@@@@ (gnu packages commencement)\n" -" glibc-final-with-bootstrap-bash)' | dot -Tps > t.ps\n" -msgstr "" -"guix graph -t bag \\\n" -" -e '(@@@@ (gnu packages commencement)\n" -" glibc-final-with-bootstrap-bash)' | dot -Tps > t.ps\n" +#~ msgid "failed to lookup NIST host: ~a~%" +#~ msgstr "impossible de trouver l'hôte NIST: ~a~%" -#. type: Plain text -#: doc/guix.texi:22699 -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 "" +#~ msgid "Updater for GNOME packages" +#~ msgstr "Logiciel de mise à jour des paquets GNOME" -#. type: Plain text -#: doc/guix.texi:22701 -msgid "@image{images/bootstrap-packages,6in,,Dependency graph of the early packages}" -msgstr "" +#~ msgid "failed to create configuration directory `~a': ~a~%" +#~ msgstr "impossible de créer le répertoire de configuration « ~a »: ~a~%" -#. type: Plain text -#: doc/guix.texi:22707 -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 "" +#~ msgid "deprecated NAME-VERSION syntax; use NAME@VERSION instead~%" +#~ msgstr "syntaxe NOM-VERSION dépréciée. Utilisez plutôt NOM@VERSION~%" -#. type: Plain text -#: doc/guix.texi:22712 -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 "" +#~ msgid "/" +#~ msgstr "/" -#. type: Plain text -#: doc/guix.texi:22718 -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 "" +#~ msgid "~A: unexpected argument~%" +#~ msgstr "~A: argument inattendu~%" -#. type: Plain text -#: doc/guix.texi:22724 -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 "" +#~ msgid "~a: no substitute at '~a'~%" +#~ msgstr "~a: pas de substitut à « ~a »~%" -#. type: unnumberedsubsec -#: doc/guix.texi:22726 -#, no-wrap -msgid "Building the Bootstrap Binaries" -msgstr "" +#~ msgid "gz" +#~ msgstr "gz" -#. type: Plain text -#: doc/guix.texi:22733 -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 "" +#~ msgid "download failed" +#~ msgstr "le téléchargement a échoué" -#. type: Plain text -#: doc/guix.texi:22737 -msgid "The following command builds the tarballs containing the bootstrap binaries (Guile, Binutils, GCC, libc, and a tarball containing a mixture of Coreutils and other basic command-line tools):" -msgstr "" +#~ msgid "error: %s: invalid number of rounds\n" +#~ msgstr "erreur: %s: nombre de tours invalide\n" -#. type: example -#: doc/guix.texi:22740 -#, no-wrap -msgid "guix build bootstrap-tarballs\n" -msgstr "" +#~ msgid "error: %s\n" +#~ msgstr "erreur: %s\n" -#. type: Plain text -#: doc/guix.texi:22745 -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 "" +#~ msgid "error: libgcrypt version mismatch\n" +#~ msgstr "erreur: désaccord de version de libgcrypt\n" -#. type: Plain text -#: doc/guix.texi:22751 -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 "" +#~ msgid "warning: daemon is running as root, so using `--build-users-group' is highly recommended\n" +#~ msgstr "avertissement: le daemon fonctionne en tant que root, l'utilisation de « --build-users-group » est fortement recommandée\n" -#. type: unnumberedsubsec -#: doc/guix.texi:22752 -#, no-wrap -msgid "Reducing the Set of Bootstrap Binaries" -msgstr "" +#~ msgid "unsupported argument for reference graph" +#~ msgstr "argument non supporté pour le graphe de référence" -#. type: Plain text -#: doc/guix.texi:22760 -msgid "Our bootstrap binaries currently include GCC, 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 "" +#~ msgid "~a: note: using ~a but ~a is available upstream~%" +#~ msgstr "~a: note: utilisation de ~a mais ~a est disponible en amont" -#. type: Plain text -#: doc/guix.texi:22766 -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 "" +#~ msgid "~a: not a number~%" +#~ msgstr "~a: pas un nombre~%" -#. type: Plain text -#: doc/guix.texi:22772 -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. Your help is welcome!" -msgstr "" +#~ msgid "sources do not match any package:~{ ~a~}~%" +#~ msgstr "les sources ne correspondent à aucun paquet:~{ ~a~}~%" -#. type: section -#: doc/guix.texi:22775 -#, no-wrap -msgid "Porting to a New Platform" -msgstr "" +#~ msgid "failed to build the empty profile~%" +#~ msgstr "échec de la compilation du profil vide~%" -#. type: Plain text -#: doc/guix.texi:22784 -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 "" +#~ msgid "nothing to do: already at the empty profile~%" +#~ msgstr "aucune action à faire: profil courant vide" -#. type: Plain text -#: doc/guix.texi:22789 -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 "" +#~ msgid "(Please consider upgrading Guile to get proper progress report.)~%" +#~ msgstr "(Veuillez mettre Guile à jour pour obtenir le rapport de progression approprié.)~%" -#. type: example -#: doc/guix.texi:22792 -#, no-wrap -msgid "guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs\n" -msgstr "" +#~ msgid "these substitute URLs will not be used:~{ ~a~}~%" +#~ msgstr "ces URL de substitution ne seront pas utilisées:~{ ~a~}~%" -#. type: Plain text -#: doc/guix.texi:22799 -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 "" +#~ msgid "failed to look up host '~a' (~a), substituter disabled~%" +#~ msgstr "impossible de trouver l'hôte \"~a\" (~a), substitution désactivée~%" -#. type: Plain text -#: doc/guix.texi:22808 -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 do download it for the supported architectures; a rule for the new platform must be added as well." -msgstr "" +#~ msgid "failed to open operating system file '~a': ~a~%" +#~ msgstr "impossible d'ouvrir le fichier du système d'exploitation \"~a\": ~a~%" -#. type: Plain text -#: doc/guix.texi:22817 -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 "" +#~ msgid "using Guile ~a, which does not support ~s encoding~%" +#~ msgstr "utilisation de Guile ~a, qui ne supporte pas l'encodage ~s~%" -#. type: include -#: doc/guix.texi:22819 -#, no-wrap -msgid "contributing.texi" -msgstr "contributing.fr.texi" - -#. type: Plain text -#: doc/guix.texi:22832 -msgid "Guix is based on the @uref{http://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 "Guix se base sur le @uref{http://nixos.org/nix/, gestionnaire de paquets Nix} conçu et implémenté par Eelco Dolstra, avec des constributions d'autres personnes (voir le fichier @file{nix/AUTHORS} dans Guix). Nix a inventé la gestion de paquet fonctionnelle et promu des fonctionnalités sans précédents comme les mises à jour de paquets transactionnelles et les retours en arrière, les profils par utilisateurs et les processus de constructions transparents pour les références. Sans ce travail, Guix n'existerait pas." - -#. type: Plain text -#: doc/guix.texi:22835 -msgid "The Nix-based software distributions, Nixpkgs and NixOS, have also been an inspiration for Guix." -msgstr "Les distributions logicielles basées sur Nix, Nixpkgs et NixOS, ont aussi été une inspiration pour Guix." - -#. type: Plain text -#: doc/guix.texi:22841 -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 "GNU@tie{}Guix lui-même est un travail collectif avec des contributions d'un grand nombre de personnes. Voyez le fichier @file{AUTHORS} dans Guix pour plus d'information sur ces personnes de qualité. Le fichier @file{THANKS} liste les personnes qui ont aidé en rapportant des bogues, en prenant soin de l'infrastructure, en fournissant des images et des thèmes, en faisant des suggestions et bien plus. Merci !" - -#. type: cindex -#: doc/guix.texi:22846 -#, no-wrap -msgid "license, GNU Free Documentation License" -msgstr "license, GNU Free Documentation License" - -#. type: include -#: doc/guix.texi:22847 -#, no-wrap -msgid "fdl-1.3.texi" -msgstr "fdl-1.3.texi" - -#~ msgid "Note that @command{./pre-inst-env guix pull} does @emph{not} upgrade the local source tree; it simply updates the @file{~/.config/guix/latest} symlink (@pxref{Invoking guix pull}). Run @command{git pull} instead if you want to upgrade your local source tree.@footnote{If you would like to set up @command{guix} to use your Git checkout, you can point the @file{~/.config/guix/latest} symlink to your Git checkout directory. If you are the sole user of your system, you may also consider pointing the @file{/root/.config/guix/latest} symlink to point to @file{~/.config/guix/latest}; this way it will always use the same @command{guix} as your user does.}" -#~ msgstr "Remarquez que @command{./pre-inst-env guix pull} ne met @emph{pas} à jour l'arborescence des sources locale ; il met seulement à jour le lien symbolique @file{~/.config/guix/latest} (@pxref{Invoquer guix pull}). Lancez @command{git pull} à la place si vous voulez mettre à jour votre arborescence des sources locale@footnote{Si vous voulez paramétrer @command{guix} pour qu'il utilise votre dépôt Git, vous pouvez faire pointer le lien symbolique @file{~/.config/guix/latest} vers le répertoire contenant ce dépôt. Si vous le seul utilisateur du système, vous pouvez aussi considérer faire pointer le lien symbolique @file{/root/.config/guix/latest} vers @file{~/.config/guix/latest} ; comme ça root aura toujours la même commande @command{guix} que votre utilisateur}." +#~ msgid "download failed; use a newer Guile~%" +#~ msgstr "le téléchargement a échoué; veuillez utiliser une version plus récente de Guile~%" -- cgit v1.2.3 From 6948fa087522928b277288aa84e1b3270ca7474b Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Sun, 26 Aug 2018 07:02:04 -0400 Subject: gnu: emacs-racket-mode: Update to commit add0190. * gnu/packages/emacs.scm (emacs-racket-mode): Update to commit add0190. --- gnu/packages/emacs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 18aac36f02..92d02df49c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -10025,8 +10025,8 @@ perform regression test for packages that provide font-lock rules.") (license license:gpl3+)))) (define-public emacs-racket-mode - (let ((commit "1b78827d310b6d655782b7bba0f2360c9ef34ff6") - (revision "2")) + (let ((commit "add0190d3c9bdad25fee57f8efd0460c9a45c2ec") + (revision "1")) (package (name "emacs-racket-mode") (version (string-append "0.0.2" "-" revision "." @@ -10040,7 +10040,7 @@ perform regression test for packages that provide font-lock rules.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "04mzxcg32av8p6v0pqb0si6qk5qxbrbllx6m3j16fp32bdz71sps")))) + "0bf6s4nqjfacij20x9vppdnq8fq1bf53cch6p4g8xqcqri3ms4jw")))) (build-system emacs-build-system) (arguments `(#:include '("\\.el$" "\\.rkt$"))) -- cgit v1.2.3 From 60ecc10f18117b5f1603d7e4d52add8a6427ab0d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 16:17:31 +0200 Subject: gnu: xorg-server@1.19.3: Rename to "xorg-server-for-tests". ...and update to the latest xorg-server. * gnu/packages/gtk.scm (gtk+, gtkmm, girara): Change XORG-SERVER-1.19.3 references to XORG-SERVER-FOR-TESTS. * gnu/packages/pdf.scm (zathura)[native-inputs]: Likewise. * gnu/packages/xorg.scm (xorg-server-1.19.3): Rename to ... (xorg-server-for-tests): ... this. --- gnu/packages/gtk.scm | 10 +++++----- gnu/packages/pdf.scm | 2 +- gnu/packages/xorg.scm | 15 ++------------- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 38b65946b8..caa9e38a9e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -715,9 +715,9 @@ application suites.") ("python-wrapper" ,python-wrapper) ;; By using a special xorg-server for GTK+'s tests, we reduce the impact ;; of updating xorg-server directly on the master branch. - ("xorg-server" ,xorg-server-1.19.3))) + ("xorg-server" ,xorg-server-for-tests))) (arguments - `(#:disallowed-references (,xorg-server-1.19.3) + `(#:disallowed-references (,xorg-server-for-tests) ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes ;; to "doc". #:configure-flags (list (string-append "--with-html-dir=" @@ -1081,7 +1081,7 @@ toolkit.") (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ;for 'glib-compile-resources' - ("xorg-server" ,xorg-server-1.19.3))) + ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs `(("pangomm" ,pangomm) ("cairomm" ,cairomm) @@ -1092,7 +1092,7 @@ toolkit.") `(;; XXX: Tests require C++14 or later. Remove this when the default ;; compiler is >= GCC6. #:configure-flags '("CXXFLAGS=-std=gnu++14") - #:disallowed-references (,xorg-server-1.19.3) + #:disallowed-references (,xorg-server-for-tests) #:phases (modify-phases %standard-phases (add-before 'check 'run-xvfb (lambda* (#:key inputs #:allow-other-keys) @@ -1376,7 +1376,7 @@ and routines to assist in editing internationalized text.") ("check" ,check) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") - ("xorg-server" ,xorg-server-1.19.3))) + ("xorg-server" ,xorg-server-for-tests))) ;; Listed in 'Requires.private' of 'girara.pc'. (propagated-inputs `(("gtk+" ,gtk+))) (arguments diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index b82222c2fe..0feffec541 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -511,7 +511,7 @@ by using the poppler rendering engine.") ;; For tests. ("check" ,check) - ("xorg-server" ,xorg-server-1.19.3))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("sqlite" ,sqlite))) ;; Listed in 'Requires.private' of 'zathura.pc'. (propagated-inputs `(("cairo" ,cairo) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 5de3becf79..6b99a3a8a8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5198,21 +5198,10 @@ draggable titlebars and borders.") ;; This package is intended to be used when building GTK+. ;; Note: It's currently marked as "hidden" to avoid having two non-eq? ;; packages with the same name and version. -(define-public xorg-server-1.19.3 +(define-public xorg-server-for-tests (hidden-package (package - (inherit xorg-server) - (name "xorg-server") - (version "1.19.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/xserver/" - name "-" version ".tar.bz2")) - (sha256 - (base32 - "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"))))))) + (inherit xorg-server)))) (define-public xorg-server-xwayland (package -- cgit v1.2.3 From 8d48f358e965536f01a2d9b1e51f74d428091b90 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 16:20:04 +0200 Subject: gnu: parted: Fix build with glibc >= 2.28. * gnu/packages/patches/parted-glibc-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/disk.scm (parted)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/disk.scm | 1 + gnu/packages/patches/parted-glibc-compat.patch | 17 +++++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 gnu/packages/patches/parted-glibc-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index bacfc28c6e..0a593fac2c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1009,6 +1009,7 @@ dist_patch_DATA = \ %D%/packages/patches/p7zip-CVE-2016-9296.patch \ %D%/packages/patches/p7zip-CVE-2017-17969.patch \ %D%/packages/patches/p7zip-remove-unused-code.patch \ + %D%/packages/patches/parted-glibc-compat.patch \ %D%/packages/patches/patchelf-page-size.patch \ %D%/packages/patches/patchelf-rework-for-arm.patch \ %D%/packages/patches/patchutils-xfail-gendiff-tests.patch \ diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index f1b3f265fe..34709b73fc 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -76,6 +76,7 @@ (method url-fetch) (uri (string-append "mirror://gnu/parted/parted-" version ".tar.xz")) + (patches (search-patches "parted-glibc-compat.patch")) (sha256 (base32 "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5")))) diff --git a/gnu/packages/patches/parted-glibc-compat.patch b/gnu/packages/patches/parted-glibc-compat.patch new file mode 100644 index 0000000000..edf4afb0d1 --- /dev/null +++ b/gnu/packages/patches/parted-glibc-compat.patch @@ -0,0 +1,17 @@ +Include for "major" and "minor". + +Taken from upstream: +https://git.savannah.gnu.org/cgit/parted.git/commit/?id=ba5e0451b51c983e40afd123b6e0d3eddb55e610 + +diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c +index 31b98ab..7e86b51 100644 +--- a/libparted/arch/linux.c ++++ b/libparted/arch/linux.c +@@ -41,6 +41,7 @@ + #include /* for uname() */ + #include + #include ++#include + #ifdef ENABLE_DEVICE_MAPPER + #include + #endif -- cgit v1.2.3 From 45c78bf92487fbc659593a9ae75f15281a1068b7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 16:50:39 +0200 Subject: gnu: gcc: Include libsanitizer patch for versions 6 and 7. * gnu/packages/gcc.scm (gcc-6, gcc-7)[source](patches): Add "gcc-libsanitizer-ustat.patch". --- gnu/packages/gcc.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 2f4198fdea..e5b1433f92 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -469,6 +469,7 @@ Go. It also includes runtime support libraries for these languages.") (base32 "1m0lr7938lw5d773dkvwld90hjlcq2282517d1gwvrfzmwgg42w5")) (patches (search-patches "gcc-libsanitizer-fix.patch" + "gcc-libsanitizer-ustat.patch" "gcc-strmov-store-file-names.patch" "gcc-6-source-date-epoch-1.patch" "gcc-6-source-date-epoch-2.patch" @@ -513,6 +514,7 @@ Go. It also includes runtime support libraries for these languages.") (base32 "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43")) (patches (search-patches "gcc-strmov-store-file-names.patch" + "gcc-libsanitizer-ustat.patch" "gcc-5.0-libvtv-runpath.patch")))) (description "GCC is the GNU Compiler Collection. It provides compiler front-ends -- cgit v1.2.3 From 69502b5eb43aa6316ddf1ad2ee9a373346d0b765 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 26 Aug 2018 14:52:31 +0200 Subject: gnu: Add guile-aa-tree. * gnu/packages/guile.scm (guile-aa-tree): New variable. --- gnu/packages/guile.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f2a252b8d3..a585dd6dc8 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -2013,6 +2013,30 @@ Vicare Scheme and IronScheme. Right now it contains: @end itemize\n") (license license:bsd-3))) +(define-public guile-aa-tree + (package + (name "guile-aa-tree") + (version "3.1.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/guile-aa-tree/guile-aa-tree-" + version ".tar.gz")) + (sha256 + (base32 + "0044c105r3q9vpl17pv3phl1b79kjm1llhkakqgiasixyav01blh")))) + (build-system guile-build-system) + (native-inputs `(("guile" ,guile-2.2))) + ;; https://savannah.nongnu.org/projects/guile-aa-tree + (home-page "https://qlfiles.net/guile-aa-tree/") + (synopsis "AA tree data structure for Guile") + (description + "This package provides an implementation of @dfn{AA trees}, a +self-balancing binary tree data structure, for Guile. It ensure @math{O(log +n)} worst case performance for core operations. The module provides +non-mutating insert, delete, and search operations, with support for +convenient nested tree operations.") + (license license:gpl3+))) + (define-public guile-simple-zmq (let ((commit "1f3b7c0b9b249c6fde8e8a632b252d8a1b794424") (revision "1")) -- cgit v1.2.3 From 1ca54999db34b0197e6c7fa3f0a852fc0d193e70 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 26 Aug 2018 19:29:25 +0200 Subject: gnu: Add Lepton-EDA. * gnu/packages/engineering.scm (lepton-eda): New variable. --- gnu/packages/engineering.scm | 70 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f11ce71f5a..3b433a1bfe 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -59,6 +59,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gperf) + #:use-module (gnu packages groff) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages image) @@ -76,6 +77,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages swig) #:use-module (gnu packages tcl) + #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages tex) #:use-module (gnu packages wxwidgets) @@ -224,6 +226,74 @@ tool to forward annotation from your schematic to layout using PCB; some minor utilities.") (license license:gpl2+))) +(define-public lepton-eda + ;; This is a fork of gEDA/gaf started in late 2016. One of its goal is to + ;; keep and to extend Guile support. + (package + (inherit geda-gaf) + (name "lepton-eda") + (version "1.9.5-20180820") + (home-page "https://github.com/lepton-eda/lepton-eda") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (sha256 + (base32 + "1ayaccvw18zh4g7a4x5jf6yxkphi5xafb0hpc732g59qkgwfcmlr")) + (file-name (git-file-name name version)))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("gettext" ,gnu-gettext) + ("texinfo" ,texinfo) + ("groff" ,groff) + ("which" ,which) + ,@(package-native-inputs geda-gaf))) + ;; For now it's Guile 2.0, not 2.2. + (arguments + (substitute-keyword-arguments (package-arguments geda-gaf) + ((#:configure-flags flags ''()) + ;; When running "make", the POT files are built with the build time as + ;; their "POT-Creation-Date". Later on, "make" notices that .pot + ;; files were updated and goes on to run "msgmerge"; as a result, the + ;; non-deterministic POT-Creation-Date finds its way into .po files, + ;; and then in .gmo files. To avoid that, simply make sure 'msgmerge' + ;; never runs. See . + `(cons "ac_cv_path_MSGMERGE=true" ,flags)) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'bootstrap 'prepare + (lambda _ + ;; Some of the scripts there are invoked by autogen.sh. + (for-each patch-shebang (find-files "build-tools")) + + ;; Make sure 'msgmerge' can modify the PO files. + (for-each (lambda (po) + (chmod po #o666)) + (find-files "." "\\.po$")) + + ;; This would normally be created by invoking 'git', but it + ;; doesn't work here. + (call-with-output-file "version.h" + (lambda (port) + (format port "#define PACKAGE_DATE_VERSION \"~a\"~%" + ,(string-drop version + (+ 1 (string-index version #\-)))) + (format port "#define PACKAGE_DOTTED_VERSION \"~a\"~%" + ,(string-take version + (string-index version #\-))) + (format port "#define PACKAGE_GIT_COMMIT \"cabbag3\"~%"))) + #t)))))) + (description + "Lepton EDA ia an @dfn{electronic design automation} (EDA) tool set +forked from gEDA/gaf in late 2016. EDA tools are used for electrical circuit +design, schematic capture, simulation, prototyping, and production. Lepton +EDA includes tools for schematic capture, attribute management, bill of +materials (BOM) generation, netlisting into over 20 netlist formats, analog +and digital simulation, and printed circuit board (PCB) layout, and many other +features."))) + (define-public pcb (package (name "pcb") -- cgit v1.2.3 From 2aeee872a60841962ad7df7a6377ed1bc54d8260 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 27 Aug 2018 10:06:46 +0200 Subject: gnu: weston: Update to 5.0.0. * gnu/packages/freedesktop.scm (weston): Update to 5.0.0. --- 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 c8758f7a52..41d1300fc7 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -495,7 +495,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (define-public weston (package (name "weston") - (version "4.0.0") + (version "5.0.0") (source (origin (method url-fetch) (uri (string-append @@ -503,7 +503,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") "weston-" version ".tar.xz")) (sha256 (base32 - "0n2big8xw6g6n46zm1jyf00dv9r4d84visdz5b8vxpw3xzkhmz50")))) + "1bsc9ry566mpk6fdwkqpvwq2j7m79d9cvh7d3lgf6igsphik98hm")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From c0fdc5a53d8cc9df27a571834afee0467c2a04ca Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 27 Aug 2018 10:14:21 +0200 Subject: gnu: wayland: Update to 1.16.0. * gnu/packages/freedesktop.scm (wayland): Update to 1.16.0. --- 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 c8758f7a52..5352ea221b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -437,14 +437,14 @@ Python.") (define-public wayland (package (name "wayland") - (version "1.15.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (string-append "https://wayland.freedesktop.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "1c5fnys8hi71cnzjv5k7j0r8gx80p0yyqlrpmn06mmarhnxvwgzb")))) + "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f)) -- cgit v1.2.3 From 4715f92ef0b9650cc4075c69f17aa51e84da3f21 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 27 Aug 2018 14:46:26 +0200 Subject: Update email for Pierre Neidhardt. * .mailmap: Add name and email for Pierre Neidhardt. * gnu/packages/c.scm, gnu/packages/code.scm, gnu/packages/compression.scm, gnu/packages/disk.scm, gnu/packages/emacs.scm, gnu/packages/freedesktop.scm, gnu/packages/golang.scm, gnu/packages/image.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/password-utils.scm, gnu/packages/perl-check.scm, gnu/packages/perl.scm, gnu/packages/textutils.scm, gnu/packages/video.scm, gnu/packages/xdisorg.scm: Update email for Pierre Neidhardt. --- .mailmap | 1 + gnu/packages/c.scm | 2 +- gnu/packages/code.scm | 2 +- gnu/packages/compression.scm | 2 +- gnu/packages/disk.scm | 2 +- gnu/packages/emacs.scm | 2 +- gnu/packages/freedesktop.scm | 2 +- gnu/packages/golang.scm | 2 +- gnu/packages/image.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/password-utils.scm | 2 +- gnu/packages/perl-check.scm | 2 +- gnu/packages/perl.scm | 2 +- gnu/packages/textutils.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- 17 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.mailmap b/.mailmap index 6188162c62..620f055638 100644 --- a/.mailmap +++ b/.mailmap @@ -56,6 +56,7 @@ Nils Gillmann Nils Gillmann Nils Gillmann Nils Gillmann +Pierre Neidhardt Pierre-Antoine Rouby Pjotr Prins Pjotr Prins diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index d82db532aa..e6df1d23c7 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016, 2018 Ludovic Courtès ;;; Copyright © 2016, 2017 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index ee7447b024..be178a5f99 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2018 Fis Trivial -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014 Mark H Weaver diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 8104b9d55c..666c9bfc3e 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Rutger Helling ;;; Copyright © 2018 Joshua Sierles, Nextjournal -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index f1b3f265fe..c7103c565a 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2018 Vasile Dumitrascu ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018 Rutger Helling -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 92d02df49c..5150705963 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2017, 2018 Maxim Cournoyer ;;; Copyright © 2018 Sohom Bhattacharjee ;;; Copyright © 2018 Mathieu Lirzin -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Jack Hill ;;; Copyright © 2018 Pierre-Antoine Rouby diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 41d1300fc7..626d883648 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 20b203aa6f..b4a088a051 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2018 Christopher Baines ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018 Pierre-Antoine Rouby -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index e50802d24f..81d22ed42d 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Fis Trivial -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index af2dcf8eaf..edffcfce96 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 nee ;;; Copyright © 2018 Stefan Reichör -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 95cdd5c513..943bcecb86 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2018 Theodoros Foradis ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Oleg Pykhalov -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index a63fd9bb36..e09bbea5cc 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2018 Konrad Hinsen ;;; Copyright © 2018 Thomas Sigurdsen ;;; Copyright © 2018 Arun Isaac -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Amirouche Boubekki ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index a2900c34c0..16010b441f 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Oleg Pykhalov -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 9f62608860..a2d368306a 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Christopher Allan Webber ;;; Copyright © 2018 Oleg Pykhalov -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 355683df8a..ce34423713 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 01e41b1914..6825cd7d2d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2018 Roel Janssen ;;; Copyright © 2018 Marius Bakke -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2018 Arun Isaac diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 169cc720f5..7c326eb8d0 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2017 Mike Gerwitz ;;; Copyright © 2018 Thomas Sigurdsen ;;; Copyright © 2018 Rutger Helling -;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From d7c82e8e030c777750aec790ef7255cf5afcf3af Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:05:11 +0200 Subject: gnu: python-numpy: Update to 1.15.1. * gnu/packages/python.scm (python-numpy): Update to 1.15.1. [native-inputs]: Replace PYTHON-NOSE with PYTHON-PYTEST. [arguments]: Set PATH before running tests. Use INVOKE. --- gnu/packages/python.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 244faa273a..a761fcfc22 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2807,7 +2807,7 @@ between language specification and implementation aspects.") (define-public python-numpy (package (name "python-numpy") - (version "1.14.5") + (version "1.15.1") (source (origin (method url-fetch) @@ -2816,14 +2816,14 @@ between language specification and implementation aspects.") version "/numpy-" version ".tar.gz")) (sha256 (base32 - "0admjpkih63lm19zbbilq8ck4f6ny5kqi03dk3m6b2mnixsh4jhv")))) + "1yp75fkqk7abq3mrbqdf0pdmr2phkr2mnng0dbqqvvrmv7jwq71w")))) (build-system python-build-system) (inputs `(("openblas" ,openblas) ("lapack" ,lapack))) (native-inputs `(("python-cython" ,python-cython) - ("python-nose" ,python-nose) + ("python-pytest" ,python-pytest) ("gfortran" ,gfortran))) (arguments `(#:phases @@ -2868,9 +2868,12 @@ include_dirs = ~a/include (lambda* (#:key outputs inputs #:allow-other-keys) ;; Make installed package available for running the tests (add-installed-pythonpath inputs outputs) + ;; Make sure "f2py" etc is found. + (setenv "PATH" (string-append (assoc-ref outputs "out") "/bin" + ":" (getenv "PATH"))) (with-directory-excursion "/tmp" - (zero? (system* "python" "-c" - "import numpy; numpy.test(verbose=2)")))))))) + (invoke "python" "-c" + "import numpy; numpy.test(verbose=2)"))))))) (home-page "http://www.numpy.org/") (synopsis "Fundamental package for scientific computing with Python") (description "NumPy is the fundamental package for scientific computing -- cgit v1.2.3 From a30cbd5dfb57681bf381ead54263def2d0236536 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 27 Aug 2018 16:06:51 +0200 Subject: gnu: cuirass: Update to 8d40c49. * gnu/packages/ci.scm (cuirass): Update to 8d40c49. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 599fd8cbbc..e26983da3b 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -185,8 +185,8 @@ their dependencies.") (license l:gpl3+)))) (define-public cuirass - (let ((commit "4db99f647b3677086a2007763726d05a59b0cdcb") - (revision "18")) + (let ((commit "8d40c49170971ad7bbf8b97336934dbb3d949fc1") + (revision "19")) (package (name "cuirass") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -198,7 +198,7 @@ their dependencies.") (file-name (string-append name "-" version)) (sha256 (base32 - "1lg3w0xjg6b806y8gfxj2dq1g0djm5pyk886j8g7n5n9ljlhjzxj")))) + "0xxcapf9ag3zx6131v128vhin5m2j3w2gjbjbpdwr0qkaysh0gvf")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit v1.2.3 From e30fc54637c3e47a1e0ab30a5b5f9f35f4c70071 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:28:06 +0200 Subject: gnu: python-dateutil: Update to 2.7.3. * gnu/packages/time.scm (python-dateutil): Update to 2.7.3. [native-inputs]: Add PYTHON-SETUPTOOLS-SCM. [license]: Add ASL2.0. --- gnu/packages/time.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 13eded4179..e9bb6969e3 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -141,15 +141,17 @@ Pendulum instances.") (define-public python-dateutil (package (name "python-dateutil") - (version "2.6.1") + (version "2.7.3") (source (origin (method url-fetch) (uri (pypi-uri "python-dateutil" version)) (sha256 (base32 - "1jkahssf0ir5ssxc3ydbp8cpv77limn8d4s77szb2nrgl2r3h749")))) + "1f7h54lg0w2ckch7592xpjkh8dg87k2br256h0iw49zn6bg02w72")))) (build-system python-build-system) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) (propagated-inputs `(("python-six" ,python-six))) (home-page "https://dateutil.readthedocs.io/en/stable/") @@ -157,7 +159,10 @@ Pendulum instances.") (description "The dateutil module provides powerful extensions to the standard datetime module, available in Python 2.3+.") - (license bsd-3))) + ;; The license was changed from the three-clause BSD license to a dual + ;; Apache 2.0/BSD-3 variant at 2017-12-01. Some code is only available as + ;; BSD-3 still; but all new code is dual licensed (the user can choose). + (license (list bsd-3 asl2.0)))) (define-public python2-dateutil (package-with-python2 python-dateutil)) -- cgit v1.2.3 From 74f3fdbdb3738e191b8723df9132f5d33d9dd11e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:30:02 +0200 Subject: gnu: python-pygobject: Update to 3.28.3. * gnu/packages/glib.scm (python-pygobject): Update to 3.28.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 2687ece081..12ecb8ba65 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -598,7 +598,7 @@ useful for C++.") (define-public python-pygobject (package (name "python-pygobject") - (version "3.28.2") + (version "3.28.3") (source (origin (method url-fetch) @@ -607,7 +607,7 @@ useful for C++.") "/pygobject-" version ".tar.xz")) (sha256 (base32 - "1jpjws4v17wv99lbhks0g0152w0f70mnwpdn8ibzzfgw2kykli5c")))) + "1c6h3brzlyvzbpdsammnd957azmp6cbzqrd65r400vnh2l8f5lrx")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From b49e1e81db2234ea408b903d1cdf9c93434e237c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:33:48 +0200 Subject: gnu: python-pycairo: Update to 1.17.1. * gnu/packages/gtk.scm (python-pycairo): Update to 1.17.1. --- 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 caa9e38a9e..1cf99f8db1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1173,7 +1173,7 @@ printing and other features typical of a source code editor.") (define-public python-pycairo (package (name "python-pycairo") - (version "1.16.3") + (version "1.17.1") (source (origin (method url-fetch) @@ -1181,7 +1181,7 @@ printing and other features typical of a source code editor.") version "/pycairo-" version ".tar.gz")) (sha256 (base32 - "1xq1bwhyi5imca5kvd28szh2rdzi8g0kaspwaqgsbczqskjj3csv")))) + "165n0g7gp2a0qi8558snvfans17x83jv2lv7bx4vr1rxjbn3a2hg")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 397334d9777592176608184adc5e59d2494719ea Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 16:49:05 +0200 Subject: gnu: python-pillow: Update to 5.2.0. * gnu/packages/patches/python-pillow-fix-failing-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/python.scm (python-pillow): Update to 5.2.0. [source](patches, patch-flags): Remove. [native-inputs]: Replace PYTHON-NOSE with PYTHON-PYTEST. [arguments]: Adjust custom check phase accordingly. --- gnu/local.mk | 1 - .../patches/python-pillow-fix-failing-tests.patch | Bin 112373 -> 0 bytes gnu/packages/python.scm | 13 +++++-------- 3 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 gnu/packages/patches/python-pillow-fix-failing-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0a593fac2c..0c74914a16 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1074,7 +1074,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-networkx2-reproducible-build.patch \ - %D%/packages/patches/python-pillow-fix-failing-tests.patch \ %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ %D%/packages/patches/python-scikit-learn-fix-test-non-determinism.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ diff --git a/gnu/packages/patches/python-pillow-fix-failing-tests.patch b/gnu/packages/patches/python-pillow-fix-failing-tests.patch deleted file mode 100644 index 2575d6f612..0000000000 Binary files a/gnu/packages/patches/python-pillow-fix-failing-tests.patch and /dev/null differ diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a761fcfc22..6730dc3f1b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3930,19 +3930,17 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "4.3.0") + (version "5.2.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) (sha256 (base32 - "09xmn7rl6840sli2iz1k3fgxfgmri2nqz6vkinmb9mgg8ifp2z59")) - (patch-flags '("-p1" "--binary")) - (patches (search-patches "python-pillow-fix-failing-tests.patch")))) + "1ary9mj2ddllq3lkxgn6aac7qxqiwbcg2pacrl94py58ql9x9czq")))) (build-system python-build-system) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-pytest" ,python-pytest))) (inputs `(("freetype" ,freetype) ("lcms" ,lcms) @@ -3963,9 +3961,8 @@ the OleFileIO module from PIL, the Python Image Library.") ;; Make installed package available for running the ;; tests (add-installed-pythonpath inputs outputs) - (and (zero? (system* "python" "selftest.py" - "--installed")) - (zero? (system* "python" "test-installed.py")))))) + (invoke "python" "selftest.py" "--installed") + (invoke "python" "-m" "pytest" "-vv")))) (delete 'check)))) (home-page "https://pypi.python.org/pypi/Pillow") (synopsis "Fork of the Python Imaging Library") -- cgit v1.2.3 From 4053585e3f4d85a8c51ca2152e63f700d42bc5a5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 17:13:07 +0200 Subject: gnu: python-beautifulsoup4: Update to 4.6.3. * gnu/packages/python.scm (python-beautifulsoup4): Update to 4.6.3. --- 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 6730dc3f1b..56dd71cb5f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4902,14 +4902,14 @@ libxml2 and libxslt.") (define-public python-beautifulsoup4 (package (name "python-beautifulsoup4") - (version "4.5.3") + (version "4.6.3") (source (origin (method url-fetch) (uri (pypi-uri "beautifulsoup4" version)) (sha256 (base32 - "0glaw1vyxnbp03fni7h5496n6iib0n5iim4gax1n0ngscs9s075j")))) + "041dhalzjciw6qyzzq7a2k4h1yvyk76xigp35hv5ibnn448ydy4h")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From b651a5ab35414da54887780d03ea786ad4c894f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 18:28:29 +0200 Subject: gnu: python-pandas: Update to 0.23.4. * gnu/packages/python.scm (python-pandas): Update to 0.23.4. [arguments]: Disable "--strict-data-files" pytest option. Delete one more test. Adjust pytest invocation to be more verbose and skip very slow tests. --- gnu/packages/python.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 56dd71cb5f..673c3cdfe4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1153,13 +1153,13 @@ human-friendly syntax.") (define-public python-pandas (package (name "python-pandas") - (version "0.23.1") + (version "0.23.4") (source (origin (method url-fetch) (uri (pypi-uri "pandas" version)) (sha256 - (base32 "142nvwb01r2wv42y2cz40bx33hd8ffh6s6gynapg859fmzr2mdah")))) + (base32 "1x54pd7hr3y7qahx6b5bf2wzj54xvl8r3s1h4pl254pnmi3wl92v")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) @@ -1174,18 +1174,23 @@ human-friendly syntax.") (getcwd) "/build/" (car (scandir "build" (cut string-prefix? "lib." <>)))))) + ;; Disable the "strict data files" option which causes + ;; the build to error out if required data files are not + ;; available (as is the case with PyPI archives). + (substitute* "setup.cfg" + (("addopts = --strict-data-files") "addopts = ")) (with-directory-excursion build-directory ;; Delete tests that require "moto" which is not yet in Guix. (for-each delete-file '("pandas/tests/io/conftest.py" "pandas/tests/io/json/test_compression.py" + "pandas/tests/io/parser/test_network.py" "pandas/tests/io/test_excel.py" "pandas/tests/io/test_parquet.py")) - (invoke "pytest" "-v" "pandas" "-k" - (string-append - "not network and not disabled" - ;; XXX: Due to the deleted tests above. - " and not test_read_s3_jsonl"))))))))) + (invoke "pytest" "-vv" "pandas" "--skip-slow" + "--skip-network" "-k" + ;; XXX: Due to the deleted tests above. + "not test_read_s3_jsonl")))))))) (propagated-inputs `(("python-numpy" ,python-numpy) ("python-pytz" ,python-pytz) -- cgit v1.2.3 From cbc8a92011d3a439b25201039941aac803870ec2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 19:48:55 +0200 Subject: gnu: cairo: Fix undefined behaviour. This fixes which showed up in Guix as an infinite loop during cairocffi tests. * gnu/packages/patches/cairo-setjmp-wrapper.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gtk.scm (cairo)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/gtk.scm | 3 +- gnu/packages/patches/cairo-setjmp-wrapper.patch | 78 +++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/cairo-setjmp-wrapper.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0c74914a16..c62e6ea50e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -595,6 +595,7 @@ dist_patch_DATA = \ %D%/packages/patches/boost-fix-icu-build.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/cairo-CVE-2016-9082.patch \ + %D%/packages/patches/cairo-setjmp-wrapper.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-use-packaged-feedparser.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1cf99f8db1..3322860d83 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -120,7 +120,8 @@ tools have full access to view and control running applications.") (sha256 (base32 "05mzyxkvsfc1annjw2dja8vka01ampp9pp93lg09j8hba06g144c")) - (patches (search-patches "cairo-CVE-2016-9082.patch")))) + (patches (search-patches "cairo-CVE-2016-9082.patch" + "cairo-setjmp-wrapper.patch")))) (build-system gnu-build-system) (propagated-inputs `(("fontconfig" ,fontconfig) diff --git a/gnu/packages/patches/cairo-setjmp-wrapper.patch b/gnu/packages/patches/cairo-setjmp-wrapper.patch new file mode 100644 index 0000000000..bffac6e041 --- /dev/null +++ b/gnu/packages/patches/cairo-setjmp-wrapper.patch @@ -0,0 +1,78 @@ +Revert faulty commit to avoid undefined behaviour: +https://bugs.freedesktop.org/show_bug.cgi?id=104325 + +Taken from this upstream commit: +https://cgit.freedesktop.org/cairo/commit/?h=1.14&id=2acc4382c54bd8239361ceed14423412a343d311 + +diff --git a/src/cairo-bentley-ottmann-rectangular.c b/src/cairo-bentley-ottmann-rectangular.c +index cb2e30c..5541bdc 100644 +--- a/src/cairo-bentley-ottmann-rectangular.c ++++ b/src/cairo-bentley-ottmann-rectangular.c +@@ -593,12 +593,6 @@ sweep_line_insert (sweep_line_t *sweep, rectangle_t *rectangle) + pqueue_push (sweep, rectangle); + } + +-static int +-sweep_line_setjmp (sweep_line_t *sweep_line) +-{ +- return setjmp (sweep_line->unwind); +-} +- + static cairo_status_t + _cairo_bentley_ottmann_tessellate_rectangular (rectangle_t **rectangles, + int num_rectangles, +@@ -615,7 +609,7 @@ _cairo_bentley_ottmann_tessellate_rectangular (rectangle_t **rectangles, + rectangles, num_rectangles, + fill_rule, + do_traps, container); +- if ((status = sweep_line_setjmp (&sweep_line))) ++ if ((status = setjmp (sweep_line.unwind))) + return status; + + rectangle = rectangle_pop_start (&sweep_line); +diff --git a/src/cairo-png.c b/src/cairo-png.c +index e64b14a..068617d 100644 +--- a/src/cairo-png.c ++++ b/src/cairo-png.c +@@ -158,14 +158,6 @@ png_simple_warning_callback (png_structp png, + */ + } + +-static int +-png_setjmp (png_struct *png) +-{ +-#ifdef PNG_SETJMP_SUPPORTED +- return setjmp (png_jmpbuf (png)); +-#endif +- return 0; +-} + + /* Starting with libpng-1.2.30, we must explicitly specify an output_flush_fn. + * Otherwise, we will segfault if we are writing to a stream. */ +@@ -237,8 +229,10 @@ write_png (cairo_surface_t *surface, + goto BAIL4; + } + +- if (png_setjmp (png)) ++#ifdef PNG_SETJMP_SUPPORTED ++ if (setjmp (png_jmpbuf (png))) + goto BAIL4; ++#endif + + png_set_write_fn (png, closure, write_func, png_simple_output_flush_fn); + +@@ -577,11 +571,12 @@ read_png (struct png_read_closure_t *png_closure) + png_set_read_fn (png, png_closure, stream_read_func); + + status = CAIRO_STATUS_SUCCESS; +- +- if (png_setjmp (png)) { ++#ifdef PNG_SETJMP_SUPPORTED ++ if (setjmp (png_jmpbuf (png))) { + surface = _cairo_surface_create_in_error (status); + goto BAIL; + } ++#endif + + png_read_info (png, info); + -- cgit v1.2.3 From eb637c64fe059ba9c3c0456f4cb5dc55124e1e49 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 20:31:06 +0200 Subject: gnu: poppler: Propagate Glib. * gnu/packages/pdf.scm (poppler)[inputs]: Move GLIB ... [propagated-inputs]: ... here. New field. --- gnu/packages/pdf.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 0feffec541..e89dc29b9a 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -104,8 +104,12 @@ ;; GLib. But of course, that Cairo must not depend on Poppler. ("cairo" ,(package (inherit cairo) (inputs (alist-delete "poppler" - (package-inputs cairo))))) - ("glib" ,glib))) + (package-inputs cairo))))))) + (propagated-inputs + ;; As per poppler-cairo and poppler-glib.pc. + ;; XXX: Ideally we'd propagate Cairo too, but that would require a + ;; different solution to the circular dependency mentioned above. + `(("glib" ,glib))) (native-inputs `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ; glib-mkenums, etc. -- cgit v1.2.3 From 1abe0554a4a19966b029f09afb7545209f8faca6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 20:06:46 +0200 Subject: gnu: poppler: Update to 0.68.0. * gnu/packages/pdf.scm (poppler): Update to 0.68.0. [inputs]: Change LIBJPEG to LIBJPEG-TURBO. --- gnu/packages/pdf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index e89dc29b9a..a28005a024 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -80,20 +80,20 @@ (define-public poppler (package (name "poppler") - (version "0.67.0") + (version "0.68.0") (source (origin (method url-fetch) (uri (string-append "https://poppler.freedesktop.org/poppler-" version ".tar.xz")) (sha256 (base32 - "1yb6agmcxf0ixqm65d4aknl0hgmswf94x0k59ic0qqav1wd4yjm3")))) + "0n0f7mv24lzv9p3dlzakpdhqg7ygcvl6l40grcz95xldzgq083gr")))) (build-system cmake-build-system) ;; FIXME: ;; use libcurl: no (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) - ("libjpeg" ,libjpeg) + ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) ("lcms" ,lcms) -- cgit v1.2.3 From a1d3874293fb210250cbd9b39e1b49b71b1c06b0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 20:37:10 +0200 Subject: gnu: python-xcffib: Update to 0.6.0. * gnu/packages/python.scm (python-xcffib): Update to 0.6.0. --- 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 673c3cdfe4..fc22ebfb2b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4032,14 +4032,14 @@ a front-end for C compilers or analysis tools.") (define-public python-xcffib (package (name "python-xcffib") - (version "0.5.1") + (version "0.6.0") (source (origin (method url-fetch) (uri (pypi-uri "xcffib" version)) (sha256 (base32 - "09gbnmr5vn58mm8xi3fmd7fz6743cks6c46dphnxzwax6zsxmy60")))) + "04k91yxyb3pgc5lvxmivh8w71yjrap2g57yk3s73x4rm4nvjq51n")))) (build-system python-build-system) (inputs `(("libxcb" ,libxcb))) -- cgit v1.2.3 From 57dac1ee935edfab91e9b182c1f7c9ddae794656 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 20:15:08 +0200 Subject: gnu: python-cairocffi: Update to 0.9.0. * gnu/packages/python.scm (python-cairocffi): Update to 0.9.0. [source](uri): Use PYPI-URI. [native-inputs]: Add PYTHON-PYTEST-COV and PYTHON-PYTEST-RUNNER. [arguments]: Remove #:tests? and outdated comment. --- gnu/packages/python.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fc22ebfb2b..15f6d33121 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4078,17 +4078,14 @@ support for Python 3 and PyPy. It is based on cffi.") (define-public python-cairocffi (package (name "python-cairocffi") - (version "0.8.0") + (version "0.9.0") (source (origin (method url-fetch) - ;; The archive on pypi is missing the 'utils' directory! - (uri (string-append "https://github.com/Kozea/cairocffi/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (pypi-uri "cairocffi" version)) (sha256 (base32 - "1rk2dvy3fxrga6bvvxc2fi5lbaynm5h4a0w0aaxyn3bc77rszjg9")) + "0dq3k4zhqd8cwsf3nyjqvjqm8wkvrjn1wjf44rl3v0h8kqx6qf0m")) (patches (search-patches "python-cairocffi-dlopen-path.patch")))) (build-system python-build-system) (outputs '("out" "doc")) @@ -4101,14 +4098,14 @@ support for Python 3 and PyPy. It is based on cffi.") (native-inputs `(("pkg-config" ,pkg-config) ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-runner" ,python-pytest-runner) ("python-sphinx" ,python-sphinx) ("python-docutils" ,python-docutils))) (propagated-inputs `(("python-xcffib" ,python-xcffib))) ; used at run time (arguments - `(;; FIXME: Tests cannot find 'libcairo.so.2'. - #:tests? #t - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From 6635a3cc7f92a0c2b389761ecc599f5922186cf9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 27 Aug 2018 15:12:04 -0400 Subject: gnu: python-pygit2: Update to 0.26.4. * gnu/packages/python.scm (python-pygit2, python2-pygit2): Update to 0.26.4. [source]: Remove 'python-pygit2-disable-network-tests.patch'. * gnu/packages/patches/python-pygit2-disable-network-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../python-pygit2-disable-network-tests.patch | 43 ---------------------- gnu/packages/python.scm | 6 +-- 3 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 gnu/packages/patches/python-pygit2-disable-network-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index b1bd1c089c..d0e84c5972 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1087,7 +1087,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-paste-remove-website-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ - %D%/packages/patches/python-pygit2-disable-network-tests.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ diff --git a/gnu/packages/patches/python-pygit2-disable-network-tests.patch b/gnu/packages/patches/python-pygit2-disable-network-tests.patch deleted file mode 100644 index 5578e4c375..0000000000 --- a/gnu/packages/patches/python-pygit2-disable-network-tests.patch +++ /dev/null @@ -1,43 +0,0 @@ -Disable tests trying to look up remote servers. - -diff --git a/test/test_credentials.py b/test/test_credentials.py ---- a/test/test_credentials.py -+++ b/test/test_credentials.py -@@ -68,6 +68,7 @@ class CredentialCreateTest(utils.NoRepoTestCase): - self.assertEqual((username, None, None, None), cred.credential_tuple) - - -+@unittest.skipIf(True, "network tests are not supported in Guix") - class CredentialCallback(utils.RepoTestCase): - def test_callback(self): - class MyCallbacks(pygit2.RemoteCallbacks): -@@ -92,6 +93,7 @@ class CredentialCallback(utils.RepoTestCase): - remote = self.repo.create_remote("github", url) - self.assertRaises(TypeError, lambda: remote.fetch(callbacks=MyCallbacks())) - -+@unittest.skipIf(True, "network tests are not supported in Guix") - class CallableCredentialTest(utils.RepoTestCase): - - def test_user_pass(self): -diff --git a/test/test_repository.py b/test/test_repository.py ---- a/test/test_repository.py -+++ b/test/test_repository.py -@@ -573,6 +573,7 @@ class CloneRepositoryTest(utils.NoRepoTestCase): - self.assertTrue('refs/remotes/custom_remote/master' in repo.listall_references()) - self.assertIsNotNone(repo.remotes["custom_remote"]) - -+ @unittest.skipIf(True, "network tests are not supported in Guix") - def test_clone_with_credentials(self): - repo = clone_repository( - "https://bitbucket.org/libgit2/testgitrepository.git", -diff --git a/test/test_submodule.py b/test/test_submodule.py ---- a/test/test_submodule.py -+++ b/test/test_submodule.py -@@ -42,6 +42,7 @@ SUBM_PATH = 'submodule' - SUBM_URL = 'https://github.com/libgit2/pygit2' - SUBM_HEAD_SHA = '819cbff552e46ac4b8d10925cc422a30aa04e78e' - -+@unittest.skipIf(True, "network tests are not supported in Guix") - class SubmoduleTest(utils.SubmoduleRepoTestCase): - - def test_lookup_submodule(self): diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3c46102da1..6ab6763a96 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3265,16 +3265,14 @@ association studies (GWAS) on extremely large data sets.") (define-public python-pygit2 (package (name "python-pygit2") - (version "0.26.0") + (version "0.26.4") (source (origin (method url-fetch) (uri (pypi-uri "pygit2" version)) (sha256 (base32 - "1cbc488ra3kg7r3qky17ms0szi3cda2d96qfkv1l9djsy9hnvw57")) - (patches - (search-patches "python-pygit2-disable-network-tests.patch")))) + "145k3fsd21274swia7mcc7n3kzlbd47xmg55mxsjdb5d9b7fr858")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six) -- cgit v1.2.3 From f2d2dc70fcc65703562ee09aaab13372f09f267c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 27 Aug 2018 16:57:37 -0400 Subject: gnu: libexif: Update home-page URL. * gnu/packages/photo.scm (libexif)[home-page]: Update URL. --- gnu/packages/photo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 5b5ec89fc2..3fd3d0854b 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -109,7 +109,7 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).") (base32 "06nlsibr3ylfwp28w8f5466l6drgrnydgxrm4jmxzrmk5svaxk8n")))) (build-system gnu-build-system) - (home-page "http://libexif.sourceforge.net/") + (home-page "https://libexif.github.io/") (synopsis "Read and manipulate EXIF data in digital photographs") (description "The libexif C library allows applications to read, edit, and save EXIF -- cgit v1.2.3 From 0de33cb364a75c15d3ffad84f980e629d8753d60 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 27 Aug 2018 16:59:06 -0400 Subject: gnu: feh: Enable EXIF support. * gnu/packages/image-viewers.scm (feh)[arguments]: Enable EXIF support. (inputs): Add libexif. --- gnu/packages/image-viewers.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 3410880a67..87546045a6 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -74,12 +74,14 @@ '(#:phases (modify-phases %standard-phases (delete 'configure)) #:test-target "test" #:make-flags - (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))))) + (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out")) + "exif=1"))) (native-inputs `(("perl" ,perl) ("perl-test-command" ,perl-test-command))) (inputs `(("imlib2" ,imlib2) ("curl" ,curl) + ("libexif" ,libexif) ("libpng" ,libpng) ("libxt" ,libxt) ("libx11" ,libx11) -- cgit v1.2.3 From f2d0a2cf5c905abf816bef5d69364d28af5144ed Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 27 Aug 2018 22:17:12 +0200 Subject: self: Shrink the module search path of the 'guix' command. Previously we'd have lots of useless entries on the search paths, such as libtasn1, libidn2, zlib, gmp, etc. because they are propagated by gnutls. * guix/self.scm (guix-command)[source-directories, object-directories]: New variables. Use them in the body of "guix-command". Filter their items with 'file-exists?'. --- guix/self.scm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/guix/self.scm b/guix/self.scm index 5ad644b1df..90649db17f 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -367,22 +367,26 @@ DOMAIN, a gettext domain." guile (guile-version (effective-version))) "Return the 'guix' command such that it adds MODULES and DEPENDENCIES in its load path." + (define source-directories + (map (lambda (package) + (file-append package "/share/guile/site/" + guile-version)) + dependencies)) + + (define object-directories + (map (lambda (package) + (file-append package "/lib/guile/" + guile-version "/site-ccache")) + dependencies)) + (program-file "guix-command" #~(begin (set! %load-path - (append '#$(map (lambda (package) - (file-append package - "/share/guile/site/" - guile-version)) - dependencies) + (append (filter file-exists? '#$source-directories) %load-path)) (set! %load-compiled-path - (append '#$(map (lambda (package) - (file-append package "/lib/guile/" - guile-version - "/site-ccache")) - dependencies) + (append (filter file-exists? '#$object-directories) %load-compiled-path)) (set! %load-path (cons #$modules %load-path)) -- cgit v1.2.3 From a0a2c2f16ac8220b41af0d484d9e48f37a329fd0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 27 Aug 2018 23:05:27 +0200 Subject: pull: Use (git) and (guix git) unconditionally. The autoload hack was added a year ago, before 0.14.0, i.e., before any release would depend on Guile-Git. Both 0.14.0 and 0.15.0 required Guile-Git, and 'guix pull' now automatically pulls it in, so this hack is no longer necessary. * guix/scripts/pull.scm: Use (git) and (guix git). Remove top-level call to 'module-autoload!'. (ensure-guile-git!): Remove. (guix-pull): Remove call to 'ensure-guile-git!'. --- guix/scripts/pull.scm | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 433502b5de..ee68c21a4c 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -33,6 +33,8 @@ #:autoload (guix inferior) (open-inferior) #:use-module (guix scripts build) #:autoload (guix self) (whole-package) + #:use-module (guix git) + #:use-module (git) #:use-module (gnu packages) #:autoload (gnu packages ssh) (guile-ssh) #:autoload (gnu packages tls) (gnutls) @@ -55,37 +57,6 @@ #:use-module (ice-9 vlist) #:export (guix-pull)) -(module-autoload! (resolve-module '(guix scripts pull)) - '(git) '(git-error? set-tls-certificate-locations!) - '(guix git) '(latest-repository-commit)) - -(define (ensure-guile-git!) - ;; Previously Guile-Git was not a prerequisite. Thus, someone running 'guix - ;; pull' on an old installation may be lacking Guile-Git. To address this, - ;; we autoload things that depend on Guile-Git and check in the entry point - ;; whether Guile-Git is available. - ;; - ;; TODO: Remove this hack when Guile-Git is widespread or enforced. - - (unless (false-if-exception (resolve-interface '(git))) - (leave (G_ "Guile-Git is missing but it is now required by 'guix pull'. -Install it by running: - - guix package -i ~a - export GUILE_LOAD_PATH=$HOME/.guix-profile/share/guile/site/~a:$GUILE_LOAD_PATH - export GUILE_LOAD_COMPILED_PATH=$HOME/.guix-profile/lib/guile/~a/site-ccache:$GUILE_LOAD_COMPILED_PATH -\n") - (match (effective-version) - ("2.0" "guile2.0-git") - (_ "guile-git")) - (effective-version) - (effective-version))) - - ;; XXX: For unclear reasons this is needed for - ;; 'set-tls-certificate-locations!'. - (module-use! (resolve-module '(guix scripts pull)) - (resolve-interface '(git)))) - (define %repository-url (or (getenv "GUIX_PULL_URL") "https://git.savannah.gnu.org/git/guix.git")) @@ -467,8 +438,6 @@ and ALIST2 differ, display HEADING upfront." (url (assoc-ref opts 'repository-url)) (ref (assoc-ref opts 'ref)) (cache (string-append (cache-directory) "/pull"))) - (ensure-guile-git!) - (cond ((assoc-ref opts 'query) (process-query opts)) ((assoc-ref opts 'dry-run?) -- cgit v1.2.3 From 3c3c3d1d92a6eca36cb79fb4edd4fd874ed6b842 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 00:51:24 +0200 Subject: gnu: emacs-async: Download using git. The MELPA tarball hash changed. Prevent this problem in the future by downloading a git checkout. * gnu/packages/emacs.scm (emacs-async)[home-page]: Update to actual. [source]: Use GIT-FETCH. --- gnu/packages/emacs.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5150705963..8665356f5c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1179,16 +1179,18 @@ rather than the contents of files.") (define-public emacs-async (package (name "emacs-async") + (home-page "https://github.com/jwiegley/emacs-async") (version "1.9.3") (source (origin - (method url-fetch) - (uri (string-append "https://stable.melpa.org/packages/async-" - version ".tar")) + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0xvi50y96y2qh81qkhj8p6ar1xnfasg58qvlsvgvvmdf4g8srlij")))) + "1zsnb6dy8p6y68xgidv3dfxaga4biramfw8fq7wac0sc50vc98vq")))) (build-system emacs-build-system) - (home-page "https://elpa.gnu.org/packages/async.html") (synopsis "Asynchronous processing in Emacs") (description "This package provides the ability to call asynchronous functions and -- cgit v1.2.3 From eb87b634a7723111bdbc84f1971fe64bc96a8963 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 01:19:02 +0200 Subject: gnu: slang: Update to 2.3.2. * gnu/packages/slang.scm (slang): Update to 2.3.2. --- gnu/packages/slang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/slang.scm b/gnu/packages/slang.scm index f9956d0113..24eb5fa137 100644 --- a/gnu/packages/slang.scm +++ b/gnu/packages/slang.scm @@ -37,14 +37,14 @@ (define-public slang (package (name "slang") - (version "2.3.1a") + (version "2.3.2") (source (origin (method url-fetch) (uri (string-append "http://www.jedsoft.org/releases/slang/slang-" version ".tar.bz2")) (sha256 (base32 - "0dlcy0hn0j6cj9qj5x6hpb0axifnvzzmv5jqq0wq14fygw0c7w2l")) + "06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 2987b2e0d2dba6569799452353890ce5e967898d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 22:34:16 +0200 Subject: gnu: seabios: Update source URI. * gnu/packages/firmware.scm (seabios)[source](uri): Download from seabios.org. --- gnu/packages/firmware.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 176eef5137..0b5a82e9e5 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -188,7 +188,7 @@ by the b43-open driver of Linux-libre.") (version "1.11.0") (source (origin (method url-fetch) - (uri (string-append "https://code.coreboot.org/p/seabios/downloads/get/" + (uri (string-append "https://www.seabios.org/downloads/" "seabios-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From 526ce419303ac511be8d51b41471022bed472e6b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 00:18:34 +0200 Subject: gnu: GRUB: Check for errors from efibootmgr. * gnu/packages/patches/grub-check-error-efibootmgr.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/bootloaders.scm (grub)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 3 +- .../patches/grub-check-error-efibootmgr.patch | 176 +++++++++++++++++++++ 3 files changed, 179 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/grub-check-error-efibootmgr.patch diff --git a/gnu/local.mk b/gnu/local.mk index d0e84c5972..a2e538570b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -769,6 +769,7 @@ dist_patch_DATA = \ %D%/packages/patches/grep-timing-sensitive-test.patch \ %D%/packages/patches/groff-source-date-epoch.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ + %D%/packages/patches/grub-check-error-efibootmgr.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 \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 727789a96e..e9abf399ab 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -85,7 +85,8 @@ (uri (string-append "mirror://gnu/grub/grub-" version ".tar.xz")) (sha256 (base32 - "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1")))) + "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1")) + (patches (search-patches "grub-check-error-efibootmgr.patch")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/grub-check-error-efibootmgr.patch b/gnu/packages/patches/grub-check-error-efibootmgr.patch new file mode 100644 index 0000000000..b2fd160c9a --- /dev/null +++ b/gnu/packages/patches/grub-check-error-efibootmgr.patch @@ -0,0 +1,176 @@ +Without this patch, GRUB may proceed to wipe all firmware boot entries +and report a successful installation, even if efibootmgr hit an error. + +Origin URL: +https://git.sv.gnu.org/cgit/grub.git/commit/?id=6400613ad0b463abc93362086a491cd2a5e99b0d + +From 6400613ad0b463abc93362086a491cd2a5e99b0d Mon Sep 17 00:00:00 2001 +From: Steve McIntyre +Date: Wed, 31 Jan 2018 21:49:36 +0000 +Subject: Make grub-install check for errors from efibootmgr + +Code is currently ignoring errors from efibootmgr, giving users +clearly bogus output like: + + Setting up grub-efi-amd64 (2.02~beta3-4) ... + Installing for x86_64-efi platform. + Could not delete variable: No space left on device + Could not prepare Boot variable: No space left on device + Installation finished. No error reported. + +and then potentially unbootable systems. If efibootmgr fails, grub-install +should know that and report it! + +We've been using similar patch in Debian now for some time, with no ill effects. + +diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c +index a3fcfca..ca448bc 100644 +--- a/grub-core/osdep/unix/platform.c ++++ b/grub-core/osdep/unix/platform.c +@@ -78,19 +78,20 @@ get_ofpathname (const char *dev) + dev); + } + +-static void ++static int + grub_install_remove_efi_entries_by_distributor (const char *efi_distributor) + { + int fd; + pid_t pid = grub_util_exec_pipe ((const char * []){ "efibootmgr", NULL }, &fd); + char *line = NULL; + size_t len = 0; ++ int rc; + + if (!pid) + { + grub_util_warn (_("Unable to open stream from %s: %s"), + "efibootmgr", strerror (errno)); +- return; ++ return errno; + } + + FILE *fp = fdopen (fd, "r"); +@@ -98,7 +99,7 @@ grub_install_remove_efi_entries_by_distributor (const char *efi_distributor) + { + grub_util_warn (_("Unable to open stream from %s: %s"), + "efibootmgr", strerror (errno)); +- return; ++ return errno; + } + + line = xmalloc (80); +@@ -119,23 +120,25 @@ grub_install_remove_efi_entries_by_distributor (const char *efi_distributor) + bootnum = line + sizeof ("Boot") - 1; + bootnum[4] = '\0'; + if (!verbosity) +- grub_util_exec ((const char * []){ "efibootmgr", "-q", ++ rc = grub_util_exec ((const char * []){ "efibootmgr", "-q", + "-b", bootnum, "-B", NULL }); + else +- grub_util_exec ((const char * []){ "efibootmgr", ++ rc = grub_util_exec ((const char * []){ "efibootmgr", + "-b", bootnum, "-B", NULL }); + } + + free (line); ++ return rc; + } + +-void ++int + grub_install_register_efi (grub_device_t efidir_grub_dev, + const char *efifile_path, + const char *efi_distributor) + { + const char * efidir_disk; + int efidir_part; ++ int ret; + efidir_disk = grub_util_biosdisk_get_osdev (efidir_grub_dev->disk); + efidir_part = efidir_grub_dev->disk->partition ? efidir_grub_dev->disk->partition->number + 1 : 1; + +@@ -151,23 +154,26 @@ grub_install_register_efi (grub_device_t efidir_grub_dev, + grub_util_exec ((const char * []){ "modprobe", "-q", "efivars", NULL }); + #endif + /* Delete old entries from the same distributor. */ +- grub_install_remove_efi_entries_by_distributor (efi_distributor); ++ ret = grub_install_remove_efi_entries_by_distributor (efi_distributor); ++ if (ret) ++ return ret; + + char *efidir_part_str = xasprintf ("%d", efidir_part); + + if (!verbosity) +- grub_util_exec ((const char * []){ "efibootmgr", "-q", ++ ret = grub_util_exec ((const char * []){ "efibootmgr", "-q", + "-c", "-d", efidir_disk, + "-p", efidir_part_str, "-w", + "-L", efi_distributor, "-l", + efifile_path, NULL }); + else +- grub_util_exec ((const char * []){ "efibootmgr", ++ ret = grub_util_exec ((const char * []){ "efibootmgr", + "-c", "-d", efidir_disk, + "-p", efidir_part_str, "-w", + "-L", efi_distributor, "-l", + efifile_path, NULL }); + free (efidir_part_str); ++ return ret; + } + + void +diff --git a/include/grub/util/install.h b/include/grub/util/install.h +index 5910b0c..0dba8b6 100644 +--- a/include/grub/util/install.h ++++ b/include/grub/util/install.h +@@ -210,7 +210,7 @@ grub_install_create_envblk_file (const char *name); + const char * + grub_install_get_default_x86_platform (void); + +-void ++int + grub_install_register_efi (grub_device_t efidir_grub_dev, + const char *efifile_path, + const char *efi_distributor); +diff --git a/util/grub-install.c b/util/grub-install.c +index 5e4cdfd..690f180 100644 +--- a/util/grub-install.c ++++ b/util/grub-install.c +@@ -1848,9 +1848,13 @@ main (int argc, char *argv[]) + if (!removable && update_nvram) + { + /* Try to make this image bootable using the EFI Boot Manager, if available. */ +- grub_install_register_efi (efidir_grub_dev, +- "\\System\\Library\\CoreServices", +- efi_distributor); ++ int ret; ++ ret = grub_install_register_efi (efidir_grub_dev, ++ "\\System\\Library\\CoreServices", ++ efi_distributor); ++ if (ret) ++ grub_util_error (_("efibootmgr failed to register the boot entry: %s"), ++ strerror (ret)); + } + + grub_device_close (ins_dev); +@@ -1871,6 +1875,7 @@ main (int argc, char *argv[]) + { + char * efifile_path; + char * part; ++ int ret; + + /* Try to make this image bootable using the EFI Boot Manager, if available. */ + if (!efi_distributor || efi_distributor[0] == '\0') +@@ -1887,8 +1892,11 @@ main (int argc, char *argv[]) + efidir_grub_dev->disk->name, + (part ? ",": ""), (part ? : "")); + grub_free (part); +- grub_install_register_efi (efidir_grub_dev, +- efifile_path, efi_distributor); ++ ret = grub_install_register_efi (efidir_grub_dev, ++ efifile_path, efi_distributor); ++ if (ret) ++ grub_util_error (_("efibootmgr failed to register the boot entry: %s"), ++ strerror (ret)); + } + break; + -- cgit v1.2.3 From 8f1022d0a85a1f42a156b2319513baf0e0d2e827 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 27 Aug 2018 21:38:23 +0200 Subject: gnu: vala: Update to 0.40.9. * gnu/packages/gnome.scm (vala): Update to 0.40.9. --- 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 9e72c7ae39..659f5dd5d4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2035,7 +2035,7 @@ passwords in the GNOME keyring.") (define-public vala (package (name "vala") - (version "0.40.7") + (version "0.40.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2043,7 +2043,7 @@ passwords in the GNOME keyring.") name "-" version ".tar.xz")) (sha256 (base32 - "1v0ak68lrnbb5lyd48j6sxa35vfrii86zmhxdhkdb85k1bv65rmy")))) + "0yvaijkpahzz26sa37cyzbj75a9vbcbgvxbqzzb7hbcvfy009zy7")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From d9362003b6cbbc77d2cab838aa06514aef6ac4f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 00:39:11 +0200 Subject: gnu: GRUB: Adjust to recent binutils changes. * gnu/packages/patches/grub-binutils-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/bootloaders.scm (grub)[source](patches): Add it. --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 3 +- gnu/packages/patches/grub-binutils-compat.patch | 53 +++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/grub-binutils-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index c19d992874..e88709a13c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -771,6 +771,7 @@ dist_patch_DATA = \ %D%/packages/patches/grep-timing-sensitive-test.patch \ %D%/packages/patches/groff-source-date-epoch.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ + %D%/packages/patches/grub-binutils-compat.patch \ %D%/packages/patches/grub-check-error-efibootmgr.patch \ %D%/packages/patches/gsl-test-i686.patch \ %D%/packages/patches/gspell-dash-test.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e9abf399ab..c99d5d5895 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -86,7 +86,8 @@ (sha256 (base32 "03vvdfhdmf16121v7xs8is2krwnv15wpkhkf16a4yf8nsfc3f2w1")) - (patches (search-patches "grub-check-error-efibootmgr.patch")))) + (patches (search-patches "grub-check-error-efibootmgr.patch" + "grub-binutils-compat.patch")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/grub-binutils-compat.patch b/gnu/packages/patches/grub-binutils-compat.patch new file mode 100644 index 0000000000..2107869314 --- /dev/null +++ b/gnu/packages/patches/grub-binutils-compat.patch @@ -0,0 +1,53 @@ +Fix a relocation issue that shows up with recent binutils. + +Patch taken from upstream: +https://git.sv.gnu.org/cgit/grub.git/commit/?id=842c390469e2c2e10b5aa36700324cd3bde25875 + +diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c +index e49d0b6..18facf4 100644 +--- a/grub-core/efiemu/i386/loadcore64.c ++++ b/grub-core/efiemu/i386/loadcore64.c +@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs, + break; + + case R_X86_64_PC32: ++ case R_X86_64_PLT32: + err = grub_efiemu_write_value (addr, + *addr32 + rel->r_addend + + sym.off +diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c +index 4406906..3a73e6e 100644 +--- a/grub-core/kern/x86_64/dl.c ++++ b/grub-core/kern/x86_64/dl.c +@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr, + break; + + case R_X86_64_PC32: ++ case R_X86_64_PLT32: + { + grub_int64_t value; + value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value - +diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c +index a2bb054..39d7efb 100644 +--- a/util/grub-mkimagexx.c ++++ b/util/grub-mkimagexx.c +@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections, + break; + + case R_X86_64_PC32: ++ case R_X86_64_PLT32: + { + grub_uint32_t *t32 = (grub_uint32_t *) target; + *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32) +diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c +index 9179285..a79271f 100644 +--- a/util/grub-module-verifier.c ++++ b/util/grub-module-verifier.c +@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = { + -1 + }, (int[]){ + R_X86_64_PC32, ++ R_X86_64_PLT32, + -1 + } + }, -- cgit v1.2.3 From 5dfd80e1c5c9803a281804801592d191cf9148ae Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Sun, 22 Jul 2018 16:23:53 -0700 Subject: services: tor: Add a system test. * gnu/services/networking.scm (tor-configuration->torrc): Set PidFile to /var/run/tor/tor.pid in the base torrc configuration. (tor-shepherd-service) : Call make-forkexec-constructor/container with a new #:pid-file argument to tell Shepherd where to find the PID file. Add a a new to its existing #:mappings argument to share /var/run/tor with the the container. (tor-hidden-services-activation): Update docstring. Create /var/run/tor and set its permissions so only the tor user can access it. * gnu/tests/networking.scm (%test-tor, %tor-os): New variables. (run-tor-test): New procedure. --- gnu/services/networking.scm | 22 +++++++++++++++--- gnu/tests/networking.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 4 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index d5d0cf9d1d..66772e48b7 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -612,6 +613,7 @@ demand."))) ### These lines were generated from your system configuration: User tor DataDirectory /var/lib/tor +PidFile /var/run/tor/tor.pid Log notice syslog\n" port) (for-each (match-lambda @@ -639,7 +641,7 @@ HiddenServicePort ~a ~a~%" #t)))))))) (define (tor-shepherd-service config) - "Return a running TOR." + "Return a running Tor." (match config (($ tor) (let ((torrc (tor-configuration->torrc config))) @@ -665,12 +667,17 @@ HiddenServicePort ~a ~a~%" (writable? #t)) (file-system-mapping (source "/dev/log") ;for syslog - (target source))))) + (target source)) + (file-system-mapping + (source "/var/run/tor") + (target source) + (writable? #t))) + #:pid-file "/var/run/tor/tor.pid")) (stop #~(make-kill-destructor)) (documentation "Run the Tor anonymous network overlay.")))))))) (define (tor-hidden-service-activation config) - "Return the activation gexp for SERVICES, a list of hidden services." + "Set up directories for Tor and its hidden services, if any." #~(begin (use-modules (guix build utils)) @@ -686,6 +693,15 @@ HiddenServicePort ~a ~a~%" ;; The daemon bails out if we give wider permissions. (chmod directory #o700))) + ;; Allow Tor to write its PID file. + (mkdir-p "/var/run/tor") + (chown "/var/run/tor" (passwd:uid %user) (passwd:gid %user)) + ;; Set the group permissions to rw so that if the system administrator + ;; has specified UnixSocksGroupWritable=1 in their torrc file, members + ;; of the "tor" group will be able to use the SOCKS socket. + (chmod "/var/run/tor" #o750) + + ;; Allow Tor to access the hidden services' directories. (mkdir-p "/var/lib/tor") (chown "/var/lib/tor" (passwd:uid %user) (passwd:gid %user)) (chmod "/var/lib/tor" #o700) diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index 323679e7fc..5e54edc462 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -30,7 +30,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages networking) #:use-module (gnu services shepherd) - #:export (%test-inetd %test-openvswitch %test-dhcpd)) + #:export (%test-inetd %test-openvswitch %test-dhcpd %test-tor)) (define %inetd-os ;; Operating system with 2 inetd services. @@ -339,3 +339,57 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (name "dhcpd") (description "Test a running DHCP daemon configuration.") (value (run-dhcpd-test)))) + + +;;; +;;; Services related to Tor +;;; + +(define %tor-os + (simple-operating-system + (tor-service))) + +(define (run-tor-test) + (define os + (marionette-operating-system %tor-os + #:imported-modules '((gnu services herd)) + #:requirements '(tor))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (ice-9 popen) + (ice-9 rdelim) + (srfi srfi-64)) + + (define marionette + (make-marionette (list #$(virtual-machine os)))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "tor") + + (test-assert "tor is alive" + (marionette-eval + '(begin + (use-modules (gnu services herd) + (srfi srfi-1)) + (live-service-running + (find (lambda (live) + (memq 'tor + (live-service-provision live))) + (current-services)))) + marionette)) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "tor-test" test)) + +(define %test-tor + (system-test + (name "tor") + (description "Test a running Tor daemon configuration.") + (value (run-tor-test)))) -- cgit v1.2.3 From d973915e4842b8b1bfc2266ed42d3b8c2ca77e93 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Wed, 25 Jul 2018 02:51:41 -0700 Subject: services: tor: Rename activation procedure. * gnu/services/networking.scm: Rename the procedure tor-hidden-service-activation to tor-activation. --- gnu/services/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 66772e48b7..b7f2bfe7b3 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -676,7 +676,7 @@ HiddenServicePort ~a ~a~%" (stop #~(make-kill-destructor)) (documentation "Run the Tor anonymous network overlay.")))))))) -(define (tor-hidden-service-activation config) +(define (tor-activation config) "Set up directories for Tor and its hidden services, if any." #~(begin (use-modules (guix build utils)) @@ -721,7 +721,7 @@ HiddenServicePort ~a ~a~%" (service-extension account-service-type (const %tor-accounts)) (service-extension activation-service-type - tor-hidden-service-activation))) + tor-activation))) ;; This can be extended with hidden services. (compose concatenate) -- cgit v1.2.3 From 4dd53a83b5292d4e90ca221d6bcf03350ed8dc45 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Mon, 30 Jul 2018 22:47:43 -0700 Subject: marionette: Add support for QEMU's "quit" command. * gnu/build/marionette.scm (marionette-control): Don't wait for the monitor prompt when the command was "quit". --- gnu/build/marionette.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index bb018fc9c1..61284b8980 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -222,7 +222,8 @@ pcsys_monitor\")." (($ _ _ monitor) (display command monitor) (newline monitor) - (wait-for-monitor-prompt monitor)))) + ;; The "quit" command terminates QEMU immediately, with no output. + (unless (string=? command "quit") (wait-for-monitor-prompt monitor))))) (define* (marionette-screen-text marionette #:key -- cgit v1.2.3 From cb29343940dfffe8863c0a6b1e2b3494c7836b53 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Mon, 30 Jul 2018 22:50:16 -0700 Subject: marionette: Add wait-for-unix-socket. * gnu/build/marionette.scm (wait-for-unix-socket): New variable. --- gnu/build/marionette.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index 61284b8980..f94eab5cc0 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2018 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ marionette-eval wait-for-file wait-for-tcp-port + wait-for-unix-socket marionette-control marionette-screen-text wait-for-screen-text @@ -214,6 +216,29 @@ MARIONETTE. Raise an error on failure." ('failure (error "nobody's listening on port" port)))) +(define* (wait-for-unix-socket file-name marionette + #:key (timeout 20)) + "Wait for up to TIMEOUT seconds for FILE-NAME, a Unix domain socket, to +accept connections in MARIONETTE. Raise an error on failure." + (match (marionette-eval + `(begin + (let ((sock (socket PF_UNIX SOCK_STREAM 0))) + (let loop ((i 0)) + (catch 'system-error + (lambda () + (connect sock AF_UNIX ,file-name) + 'success) + (lambda args + (if (< i ,timeout) + (begin + (sleep 1) + (loop (+ 1 i))) + 'failure)))))) + marionette) + ('success #t) + ('failure + (error "nobody's listening on unix domain socket" file-name)))) + (define (marionette-control command marionette) "Run COMMAND in the QEMU monitor of MARIONETTE. COMMAND is a string such as \"sendkey ctrl-alt-f1\" or \"screendump foo.ppm\" (info \"(qemu-doc) -- cgit v1.2.3 From b0f951e4f04766892933e3b60d1b24ab3a8589c2 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Mon, 30 Jul 2018 22:53:47 -0700 Subject: tests: tor: Add more test cases. * gnu/tests/networking.scm (%tor-os/unix-socks-socket): New variable. (run-tor-test) : New variables. <"tor is alive">: Move common code from this test case... : ...into this new procedure. <"tor is listening", "tor is alive, even when using a SOCKS socket"> <"tor is listening, even when using a SOCKS socket">: New test cases. --- gnu/tests/networking.scm | 59 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index 5e54edc462..7ca71f0c2c 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2018 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -349,12 +350,29 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (simple-operating-system (tor-service))) +(define %tor-os/unix-socks-socket + (simple-operating-system + (service tor-service-type + (tor-configuration + (config-file + (plain-file "test-torrc" + "\ +SocksPort unix:/var/run/tor/socks-sock +UnixSocksGroupWritable 1 +") + ))))) + (define (run-tor-test) (define os (marionette-operating-system %tor-os #:imported-modules '((gnu services herd)) #:requirements '(tor))) + (define os/unix-socks-socket + (marionette-operating-system %tor-os/unix-socks-socket + #:imported-modules '((gnu services herd)) + #:requirements '(tor))) + (define test (with-imported-modules '((gnu build marionette)) #~(begin @@ -366,12 +384,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (define marionette (make-marionette (list #$(virtual-machine os)))) - (mkdir #$output) - (chdir #$output) - - (test-begin "tor") - - (test-assert "tor is alive" + (define (tor-is-alive? marionette) (marionette-eval '(begin (use-modules (gnu services herd) @@ -383,6 +396,40 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (current-services)))) marionette)) + (mkdir #$output) + (chdir #$output) + + (test-begin "tor") + + ;; Test the usual Tor service. + + (test-assert "tor is alive" + (tor-is-alive? marionette)) + + (test-assert "tor is listening" + (let ((default-port 9050)) + (wait-for-tcp-port default-port marionette))) + + ;; Don't run two VMs at once. + (marionette-control "quit" marionette) + + ;; Test the Tor service using a SOCKS socket. + + (let* ((socket-directory "/tmp/more-sockets") + (_ (mkdir socket-directory)) + (marionette/unix-socks-socket + (make-marionette + (list #$(virtual-machine os/unix-socks-socket)) + ;; We can't use the same socket directory as the first + ;; marionette. + #:socket-directory socket-directory))) + (test-assert "tor is alive, even when using a SOCKS socket" + (tor-is-alive? marionette/unix-socks-socket)) + + (test-assert "tor is listening, even when using a SOCKS socket" + (wait-for-unix-socket "/var/run/tor/socks-sock" + marionette/unix-socks-socket))) + (test-end) (exit (= (test-runner-fail-count (test-runner-current)) 0))))) -- cgit v1.2.3 From 3bcb305b98e02f6c9d98e7325813fc00f18f0e6c Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Tue, 31 Jul 2018 01:13:48 -0700 Subject: services: tor: Make it easier to use UNIX sockets. * doc/guix.texi (Networking Services): Document it, and mention that tor-service is deprecated. * gnu/services/networking.scm () : New field. (tor-configuration->torrc): When socks-socket-type is 'unix, set SocksPort to UNIX domain socket /var/run/tor/socks-sock and set UnixSocksGroupWritable to 1. * gnu/tests/networking.scm (%tor-os/unix-socks-socket): Instead of using a custom config file, just set socks-socket-type to 'unix. --- doc/guix.texi | 55 +++++++++++++++++++++++++++++++++++++++------ gnu/services/networking.scm | 10 +++++++-- gnu/tests/networking.scm | 8 +------ 3 files changed, 57 insertions(+), 16 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index d2d278df47..3a3368b78f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11450,16 +11450,57 @@ detailed discussion of each configuration field. @end deftp @cindex Tor -@deffn {Scheme Procedure} tor-service [@var{config-file}] [#:tor @var{tor}] -Return a service to run the @uref{https://torproject.org, Tor} anonymous -networking daemon. +@defvr {Scheme Variable} tor-service-type +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. + +@end defvr -The daemon runs as the @code{tor} unprivileged user. It is passed -@var{config-file}, a file-like object, with an additional @code{User tor} line -and lines for hidden services added via @code{tor-hidden-service}. Run -@command{man tor} for information about the configuration file. +@deffn {Scheme Procedure} tor-service [@var{config-file}] [#:tor @var{tor}] +This procedure is deprecated and will be removed in a future release. Return +a service of the @code{tor-service-type} type. @var{config-file} and +@var{tor} have the same meaning as in @code{}. @end deffn +@deftp {Data Type} tor-configuration +@table @asis +@item @code{tor} (default: @code{tor}) +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. + +@item @code{config-file} (default: @code{(plain-file "empty" "")}) +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. + +@item @code{hidden-services} (default: @code{'()}) +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. + +@item @code{socks-socket-type} (default: @code{'tcp}) +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. + +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. +@end table +@end deftp + @cindex hidden service @deffn {Scheme Procedure} tor-hidden-service @var{name} @var{mapping} Define a new Tor @dfn{hidden service} called @var{name} and implementing diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index b7f2bfe7b3..b6b5ee3fec 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -577,7 +577,9 @@ demand."))) (config-file tor-configuration-config-file (default (plain-file "empty" ""))) (hidden-services tor-configuration-hidden-services - (default '()))) + (default '())) + (socks-socket-type tor-configuration-socks-socket-type ; 'tcp or 'unix + (default 'tcp))) (define %tor-accounts ;; User account and groups for Tor. @@ -599,7 +601,7 @@ demand."))) (define (tor-configuration->torrc config) "Return a 'torrc' file for CONFIG." (match config - (($ tor config-file services) + (($ tor config-file services socks-socket-type) (computed-file "torrc" (with-imported-modules '((guix build utils)) @@ -615,6 +617,10 @@ User tor DataDirectory /var/lib/tor PidFile /var/run/tor/tor.pid Log notice syslog\n" port) + (when (eq? 'unix '#$socks-socket-type) + (display "\ +SocksPort unix:/var/run/tor/socks-sock +UnixSocksGroupWritable 1\n" port)) (for-each (match-lambda ((service (ports hosts) ...) diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index 7ca71f0c2c..381c5caf14 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -354,13 +354,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (simple-operating-system (service tor-service-type (tor-configuration - (config-file - (plain-file "test-torrc" - "\ -SocksPort unix:/var/run/tor/socks-sock -UnixSocksGroupWritable 1 -") - ))))) + (socks-socket-type 'unix))))) (define (run-tor-test) (define os -- cgit v1.2.3 From 8b1f8f64c80c37167cfa10aab357e0993293ac3c Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Mon, 27 Aug 2018 18:30:01 +0300 Subject: gnu: openmw: Update to 0.44.0. * gnu/packages/game-development.scm (openmw): Update to 0.44.0. --- gnu/packages/game-development.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 8d66317ce7..86f2877f82 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1037,23 +1037,18 @@ of use.") (license license:expat))) (define-public openmw - ;; XXX The current version does not support qt 5.11, but the upcoming - ;; version (0.44) will do. - (let ((commit "5bc073603e8c7887e015a0ef41b4cefd6e688aaf") - (revision "1")) (package (name "openmw") - (version (git-version "0.43" revision commit)) + (version "0.44.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/OpenMW/openmw.git") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (method url-fetch) + (uri + (string-append "https://github.com/OpenMW/openmw/archive/" + name "-" version ".tar.gz")) (sha256 (base32 - "1sp4n3f1syvv0iz7n72wh226fyc0jh98cg8bvs574jvvqx6qn851")))) + "03fgm2f2r7y0aqlgp038pdlnllgvm3jimrp968p4nhz1sffvjzcy")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target @@ -1080,7 +1075,7 @@ the 2002 open-world RPG Morrowind. The engine comes with its own editor, called OpenMW-CS which allows the user to edit or create their own original games.") (home-page "https://openmw.org") - (license license:gpl3)))) + (license license:gpl3))) (define-public godot (package -- cgit v1.2.3 From 40f7ebac66913a531854cc18f9b417624508d654 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sun, 26 Aug 2018 14:27:33 +0300 Subject: gnu: Add emacs-build-farm. * gnu/packages/emacs.scm (emacs-build-farm): New variable. --- gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8665356f5c..6d34f626af 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1722,6 +1722,32 @@ management tasks from Emacs. To begin with, run @code{M-x guix-about} or @code{M-x guix-help} command.") (license license:gpl3+))) +(define-public emacs-build-farm + (package + (name "emacs-build-farm") + (version "0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/alezost-emacs/build-farm") + (commit "fa7fa54901416fc5c216a5014394cbd73a61efc6"))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1zw3pivma6cv9j7k7qm02jd6wnxmsc1v2mjcssd50im99zzrqflh")))) + (build-system emacs-build-system) + (propagated-inputs + `(("bui" ,emacs-bui) + ("magit-popup" ,emacs-magit-popup))) + (home-page "https://gitlab.com/alezost-emacs/build-farm") + (synopsis "Emacs interface for Hydra and Cuirass build farms") + (description + "This Emacs package provides an interface for Hydra and +Cuirass (build farms used by Nix and Guix). It allows you to look at +various data related to the build farm projects, jobsets, builds and +evaluations. The entry point is @code{M-x build-farm} command.") + (license license:gpl3+))) + (define-public emacs-d-mode (package (name "emacs-d-mode") -- cgit v1.2.3 From d2434b6966b06893a4d2b15d0620b05e921fd182 Mon Sep 17 00:00:00 2001 From: Ison111 Date: Tue, 28 Aug 2018 12:19:40 +0200 Subject: gnu: Add SpaceFM. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lxde.scm (spacefm): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/lxde.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 9a0d8e957d..19938fa93c 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -5,6 +5,8 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Ison111 +;;; Copyright © 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,17 +26,21 @@ (define-module (gnu packages lxde) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) #:use-module (gnu packages docbook) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages image-viewers) #:use-module (gnu packages linux) + #:use-module (gnu packages lsof) #:use-module (gnu packages openbox) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages text-editors) + #:use-module (gnu packages video) #:use-module (gnu packages wm) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -230,6 +236,48 @@ with freedesktop.org standard.") (home-page "https://lxde.org") (license license:gpl2+))) +(define-public spacefm + ;; SpaceFM is based on PCManFM. + (package + (name "spacefm") + (version "1.0.6") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/IgnorantGuru/spacefm/archive/" + version ".tar.gz")) + (sha256 + (base32 + "1jg7xfyr7kihjnalxp8wxyb9qjk8hqf5l36rp3s0lvkpmpyakppy")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (native-inputs `(("pkg-config" ,pkg-config) + ("intltool" ,intltool))) + (inputs `(("bash" ,bash) + ("gtk+" ,gtk+) + ("eudev" ,eudev) + ("desktop-file-utils" ,desktop-file-utils) + ("shared-mime-info" ,shared-mime-info) + ("ffmpegthumbnailer" ,ffmpegthumbnailer) + ("jmtpfs" ,jmtpfs) + ("lsof" ,lsof) + ("udisks" ,udisks))) + (arguments + `(#: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 "http://ignorantguru.github.io/spacefm/") + (synopsis "Multi-panel tabbed file manager") + (description "SpaceFM is a graphical, multi-panel, tabbed file manager +based on PCManFM with built-in virtual file system, udev-based device manager, +customizable menu system, and Bash integration.") + + ;; The combination is GPLv3+ but src/exo is under LGPLv3+. + (license license:gpl3+))) + (define-public lxmenu-data (package (name "lxmenu-data") -- cgit v1.2.3 From 1ae29e3f5a1f13b4ddfedd066b2e55556db031ce Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 28 Aug 2018 12:25:06 +0200 Subject: gnu: dico: Update to 2.6. * gnu/packages/dico.scm (dico): Update to 2.6. [inputs]: Switch to GUILE-2.2. --- gnu/packages/dico.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/dico.scm b/gnu/packages/dico.scm index b374a9b996..a85987d9b1 100644 --- a/gnu/packages/dico.scm +++ b/gnu/packages/dico.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Ludovic Courtès +;;; Copyright © 2015, 2016, 2018 Ludovic Courtès ;;; Copyright © 2016, 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -37,14 +37,14 @@ (define-public dico (package (name "dico") - (version "2.5") + (version "2.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/dico/dico-" version ".tar.xz")) (sha256 (base32 - "0szm3z4xvq0pjj8kxl4paq63byamf281kzn1la0cdm5ngavypxxq")))) + "0zmi041gv5nd5fmyzgdrgrsy2pvjaq9p8dvvhxwi842hiyng5b7i")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--with-guile-site-dir=" %output @@ -62,7 +62,7 @@ `(("m4" ,m4) ;used at run time ("pcre" ,pcre) ("python" ,python-2) - ("guile" ,guile-2.0) + ("guile" ,guile-2.2) ("gsasl" ,gsasl) ("groff" ,groff) ("readline" ,readline) -- cgit v1.2.3 From 6772ed1e07d6b8ce557199d91aaa1442c77186c7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 28 Aug 2018 12:33:50 +0200 Subject: services: openssh: Add 'log-level' field. * gnu/services/ssh.scm ()[log-level]: New field. (openssh-config-file): Honor it. * doc/guix.texi (Networking Services): Document it. --- doc/guix.texi | 6 ++++++ gnu/services/ssh.scm | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3a3368b78f..cd0e74a2d7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11782,6 +11782,12 @@ Additional authorized keys can be specified @i{via} Note that this does @emph{not} interfere with the use of @file{~/.ssh/authorized_keys}. + +@item @code{log-level} (default: @code{'info}) +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. + @end table @end deftp diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index dd96ad6aec..056602248f 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Julien Lepiller ;;; Copyright © 2017 Clément Lassieur @@ -319,6 +319,10 @@ The other options should be self-descriptive." (accepted-environment openssh-configuration-accepted-environment (default '())) + ;; symbol + (log-level openssh-configuration-log-level + (default 'info)) + ;; list of user-name/file-like tuples (authorized-keys openssh-authorized-keys (default '())) @@ -451,6 +455,10 @@ of user-name/file-like tuples." (format port "PrintLastLog ~a\n" #$(if (openssh-configuration-print-last-log? config) "yes" "no")) + (format port "LogLevel ~a\n" + #$(string-upcase + (symbol->string + (openssh-configuration-log-level config)))) ;; Add '/etc/authorized_keys.d/%u', which we populate. (format port "AuthorizedKeysFile \ -- cgit v1.2.3 From 8a5a1eff422c5e3bca785f3967d444d0eafcf9c3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 27 Aug 2018 15:13:01 -0400 Subject: gnu: dropbear: Fix CVE-2018-15599. * gnu/packages/patches/dropbear-CVE-2018-15599.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/ssh.scm (dropbear)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/patches/dropbear-CVE-2018-15599.patch | 240 +++++++++++++++++++++ gnu/packages/ssh.scm | 1 + 3 files changed, 242 insertions(+) create mode 100644 gnu/packages/patches/dropbear-CVE-2018-15599.patch diff --git a/gnu/local.mk b/gnu/local.mk index a2e538570b..7b980b2f20 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -651,6 +651,7 @@ dist_patch_DATA = \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/doxygen-gcc-ice.patch \ %D%/packages/patches/doxygen-test.patch \ + %D%/packages/patches/dropbear-CVE-2018-15599.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elogind-glibc-2.27.patch \ diff --git a/gnu/packages/patches/dropbear-CVE-2018-15599.patch b/gnu/packages/patches/dropbear-CVE-2018-15599.patch new file mode 100644 index 0000000000..a474552cd2 --- /dev/null +++ b/gnu/packages/patches/dropbear-CVE-2018-15599.patch @@ -0,0 +1,240 @@ +Fix CVE-2018-15599: + +http://lists.ucc.gu.uwa.edu.au/pipermail/dropbear/2018q3/002108.html +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-15599 + +Patch copied from upstream source repository: + +https://github.com/mkj/dropbear/commit/52adbb34c32d3e2e1bcdb941e20a6f81138b8248 + +From 52adbb34c32d3e2e1bcdb941e20a6f81138b8248 Mon Sep 17 00:00:00 2001 +From: Matt Johnston +Date: Thu, 23 Aug 2018 23:43:12 +0800 +Subject: [PATCH] Wait to fail invalid usernames + +--- + auth.h | 6 +++--- + svr-auth.c | 19 +++++-------------- + svr-authpam.c | 26 ++++++++++++++++++++++---- + svr-authpasswd.c | 27 ++++++++++++++------------- + svr-authpubkey.c | 11 ++++++++++- + 5 files changed, 54 insertions(+), 35 deletions(-) + +diff --git a/auth.h b/auth.h +index da498f5b..98f54683 100644 +--- a/auth.h ++++ b/auth.h +@@ -37,9 +37,9 @@ void recv_msg_userauth_request(void); + void send_msg_userauth_failure(int partial, int incrfail); + void send_msg_userauth_success(void); + void send_msg_userauth_banner(const buffer *msg); +-void svr_auth_password(void); +-void svr_auth_pubkey(void); +-void svr_auth_pam(void); ++void svr_auth_password(int valid_user); ++void svr_auth_pubkey(int valid_user); ++void svr_auth_pam(int valid_user); + + #if DROPBEAR_SVR_PUBKEY_OPTIONS_BUILT + int svr_pubkey_allows_agentfwd(void); +diff --git a/svr-auth.c b/svr-auth.c +index c19c0901..edde86bc 100644 +--- a/svr-auth.c ++++ b/svr-auth.c +@@ -149,10 +149,8 @@ void recv_msg_userauth_request() { + if (methodlen == AUTH_METHOD_PASSWORD_LEN && + strncmp(methodname, AUTH_METHOD_PASSWORD, + AUTH_METHOD_PASSWORD_LEN) == 0) { +- if (valid_user) { +- svr_auth_password(); +- goto out; +- } ++ svr_auth_password(valid_user); ++ goto out; + } + } + #endif +@@ -164,10 +162,8 @@ void recv_msg_userauth_request() { + if (methodlen == AUTH_METHOD_PASSWORD_LEN && + strncmp(methodname, AUTH_METHOD_PASSWORD, + AUTH_METHOD_PASSWORD_LEN) == 0) { +- if (valid_user) { +- svr_auth_pam(); +- goto out; +- } ++ svr_auth_pam(valid_user); ++ goto out; + } + } + #endif +@@ -177,12 +173,7 @@ void recv_msg_userauth_request() { + if (methodlen == AUTH_METHOD_PUBKEY_LEN && + strncmp(methodname, AUTH_METHOD_PUBKEY, + AUTH_METHOD_PUBKEY_LEN) == 0) { +- if (valid_user) { +- svr_auth_pubkey(); +- } else { +- /* pubkey has no failure delay */ +- send_msg_userauth_failure(0, 0); +- } ++ svr_auth_pubkey(valid_user); + goto out; + } + #endif +diff --git a/svr-authpam.c b/svr-authpam.c +index 05e4f3e5..d201bc96 100644 +--- a/svr-authpam.c ++++ b/svr-authpam.c +@@ -178,13 +178,14 @@ pamConvFunc(int num_msg, + * Keyboard interactive would be a lot nicer, but since PAM is synchronous, it + * gets very messy trying to send the interactive challenges, and read the + * interactive responses, over the network. */ +-void svr_auth_pam() { ++void svr_auth_pam(int valid_user) { + + struct UserDataS userData = {NULL, NULL}; + struct pam_conv pamConv = { + pamConvFunc, + &userData /* submitted to pamvConvFunc as appdata_ptr */ + }; ++ const char* printable_user = NULL; + + pam_handle_t* pamHandlep = NULL; + +@@ -204,12 +205,23 @@ void svr_auth_pam() { + + password = buf_getstring(ses.payload, &passwordlen); + ++ /* We run the PAM conversation regardless of whether the username is valid ++ in case the conversation function has an inherent delay. ++ Use ses.authstate.username rather than ses.authstate.pw_name. ++ After PAM succeeds we then check the valid_user flag too */ ++ + /* used to pass data to the PAM conversation function - don't bother with + * strdup() etc since these are touched only by our own conversation + * function (above) which takes care of it */ +- userData.user = ses.authstate.pw_name; ++ userData.user = ses.authstate.username; + userData.passwd = password; + ++ if (ses.authstate.pw_name) { ++ printable_user = ses.authstate.pw_name; ++ } else { ++ printable_user = ""; ++ } ++ + /* Init pam */ + if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { + dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s", +@@ -242,7 +254,7 @@ void svr_auth_pam() { + rc, pam_strerror(pamHandlep, rc)); + dropbear_log(LOG_WARNING, + "Bad PAM password attempt for '%s' from %s", +- ses.authstate.pw_name, ++ printable_user, + svr_ses.addrstring); + send_msg_userauth_failure(0, 1); + goto cleanup; +@@ -253,12 +265,18 @@ void svr_auth_pam() { + rc, pam_strerror(pamHandlep, rc)); + dropbear_log(LOG_WARNING, + "Bad PAM password attempt for '%s' from %s", +- ses.authstate.pw_name, ++ printable_user, + svr_ses.addrstring); + send_msg_userauth_failure(0, 1); + goto cleanup; + } + ++ if (!valid_user) { ++ /* PAM auth succeeded but the username isn't allowed in for another reason ++ (checkusername() failed) */ ++ send_msg_userauth_failure(0, 1); ++ } ++ + /* successful authentication */ + dropbear_log(LOG_NOTICE, "PAM password auth succeeded for '%s' from %s", + ses.authstate.pw_name, +diff --git a/svr-authpasswd.c b/svr-authpasswd.c +index bdee2aa1..69c7d8af 100644 +--- a/svr-authpasswd.c ++++ b/svr-authpasswd.c +@@ -48,22 +48,14 @@ static int constant_time_strcmp(const char* a, const char* b) { + + /* Process a password auth request, sending success or failure messages as + * appropriate */ +-void svr_auth_password() { ++void svr_auth_password(int valid_user) { + + char * passwdcrypt = NULL; /* the crypt from /etc/passwd or /etc/shadow */ + char * testcrypt = NULL; /* crypt generated from the user's password sent */ +- char * password; ++ char * password = NULL; + unsigned int passwordlen; +- + unsigned int changepw; + +- passwdcrypt = ses.authstate.pw_passwd; +- +-#ifdef DEBUG_HACKCRYPT +- /* debugging crypt for non-root testing with shadows */ +- passwdcrypt = DEBUG_HACKCRYPT; +-#endif +- + /* check if client wants to change password */ + changepw = buf_getbool(ses.payload); + if (changepw) { +@@ -73,12 +65,21 @@ void svr_auth_password() { + } + + password = buf_getstring(ses.payload, &passwordlen); +- +- /* the first bytes of passwdcrypt are the salt */ +- testcrypt = crypt(password, passwdcrypt); ++ if (valid_user) { ++ /* the first bytes of passwdcrypt are the salt */ ++ passwdcrypt = ses.authstate.pw_passwd; ++ testcrypt = crypt(password, passwdcrypt); ++ } + m_burn(password, passwordlen); + m_free(password); + ++ /* After we have got the payload contents we can exit if the username ++ is invalid. Invalid users have already been logged. */ ++ if (!valid_user) { ++ send_msg_userauth_failure(0, 1); ++ return; ++ } ++ + if (testcrypt == NULL) { + /* crypt() with an invalid salt like "!!" */ + dropbear_log(LOG_WARNING, "User account '%s' is locked", +diff --git a/svr-authpubkey.c b/svr-authpubkey.c +index aa6087c9..ff481c87 100644 +--- a/svr-authpubkey.c ++++ b/svr-authpubkey.c +@@ -79,7 +79,7 @@ static int checkfileperm(char * filename); + + /* process a pubkey auth request, sending success or failure message as + * appropriate */ +-void svr_auth_pubkey() { ++void svr_auth_pubkey(int valid_user) { + + unsigned char testkey; /* whether we're just checking if a key is usable */ + char* algo = NULL; /* pubkey algo */ +@@ -102,6 +102,15 @@ void svr_auth_pubkey() { + keybloblen = buf_getint(ses.payload); + keyblob = buf_getptr(ses.payload, keybloblen); + ++ if (!valid_user) { ++ /* Return failure once we have read the contents of the packet ++ required to validate a public key. ++ Avoids blind user enumeration though it isn't possible to prevent ++ testing for user existence if the public key is known */ ++ send_msg_userauth_failure(0, 0); ++ goto out; ++ } ++ + /* check if the key is valid */ + if (checkpubkey(algo, algolen, keyblob, keybloblen) == DROPBEAR_FAILURE) { + send_msg_userauth_failure(0, 0); diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index a58ebff481..03c4e3cc0b 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -440,6 +440,7 @@ TCP, not the SSH protocol.") (uri (string-append "https://matt.ucc.asn.au/" name "/releases/" name "-" version ".tar.bz2")) + (patches (search-patches "dropbear-CVE-2018-15599.patch")) (sha256 (base32 "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj")))) -- cgit v1.2.3 From 84fbb4b223cb46472d444ea9aae060789fce5d24 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 27 Aug 2018 23:24:47 -0700 Subject: gnu: electron-cash: Update to 3.3.1. * gnu/packages/finance.scm (electron-cash): Update to 3.3.1. Signed-off-by: Leo Famulari --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 2cbd4854ec..7aeaffcc5d 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -335,7 +335,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (package (inherit electrum) (name "electron-cash") - (version "3.3") + (version "3.3.1") (source (origin (method url-fetch) @@ -346,7 +346,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") ".tar.gz")) (sha256 (base32 - "1x487hyacdm1qhik1mhfimr4jwcwz7sgsbkh11awrb6j19sxdxym")) + "1jdy89rfdwc2jadx3rqj5yvynpcn90cx6482ax9f1cj9gfxp9j2b")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 967de7c5b0100e49acf2ea1fd85bf8503b9d2057 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Jul 2018 12:36:45 +0300 Subject: gnu: Add ephoto. * gnu/packages/enlightenment.scm (ephoto): New variable. --- gnu/packages/enlightenment.scm | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index cff5ab14a9..15ec492793 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -421,3 +421,50 @@ and in creating applications based on the Enlightenment Foundation Library suite "Simple PDF viewer based on the Enlightenment Foundation Libraries.") (home-page "https://github.com/kaihu/lekha") (license license:gpl3+))) + +(define-public ephoto + (package + (name "ephoto") + (version "1.5") + (source + (origin + (method url-fetch) + (uri (list (string-append "http://www.smhouston.us/stuff/ephoto-" + version ".tar.xz") + (string-append "https://download.enlightenment.org/rel/" + "apps/ephoto/ephoto-" version ".tar.xz"))) + (sha256 + (base32 + "04kli43sfsy6s660g13pjc0kjmgdcmq8m4qh02vvpcwv60mf9mgz")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-home-directory + ;; FATAL: Cannot create run dir '/homeless-shelter/.run' - errno=2 + (lambda _ (setenv "HOME" "/tmp") #t))))) + (native-inputs + `(("check" ,check) + ("pkg-config" ,pkg-config))) + (inputs + `(("efl" ,efl))) + (home-page "http://smhouston.us/ephoto/") + (synopsis "EFL image viewer/editor/manipulator/slideshow creator") + (description "Ephoto is an image viewer and editor written using the +@dfn{Enlightenment Foundation Libraries} (EFL). It focuses on simplicity and ease +of use, while taking advantage of the speed and small footprint the EFL provide. + +Ephoto’s features include: +@enumerate +@item Browsing the filesystem and displaying images in an easy to use grid view. +@item Browsing images in a single image view format. +@item Viewing images in a slideshow. +@item Editing your image with features such as cropping, auto enhance, +blurring, sharpening, brightness/contrast/gamma adjustments, hue/saturation/value +adjustments, and color level adjustment. +@item Applying artistic filters to your image such as black and white and old photo. +@item Drag And Drop along with file operations to easy maintain your photo directories. +@end enumerate\n") + (license (list + license:bsd-2 ; Ephoto's thumbnailing code + license:bsd-3)))) -- cgit v1.2.3 From dc8675afa76a996c7d1d55edba1dcb17d044a9a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Jul 2018 12:42:05 +0300 Subject: gnu: Add urlscan. * gnu/packages/mail.scm (urlscan): New variable. --- gnu/packages/mail.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index d1c1c096e5..fc8436452a 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2596,3 +2596,29 @@ processes mailboxes based on the results. It can be used to delete, copy, move, flag, etc. messages residing in mailboxes at the same or different mail servers. The 4rev1 and 4 versions of IMAP are supported.") (license license:expat))) + +(define-public urlscan + (package + (name "urlscan") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "urlscan" version)) + (sha256 + (base32 + "133f28bisr4xj0nihpwpil8dyadss62mp8qgqdyzd676hg9xjfyc")))) + (build-system python-build-system) + (propagated-inputs + `(("python-urwid" ,python-urwid))) + (home-page "https://github.com/firecat53/urlscan") + (synopsis "View/select the URLs in an email message or file") + (description + "Urlscan is a small program that is designed to integrate with the +@code{mutt} mailreader to allow you to easily launch a Web browser for URLs +contained in email messages. It parses an email message or file and scans it +for URLs and email addresses. It then displays the URLs and their context +within the message, and allows you to choose one or more URLs to send to your +Web browser. Alternatively, it send a list of all URLs to stdout. It is a +replacement for the @code{urlview} program.") + (license gpl2))) -- cgit v1.2.3 From f96ed06805db934ff735e80596f1373dc1c2b5a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 26 Aug 2018 18:42:23 +0200 Subject: gnu: snappy: Optimise. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/compression.scm (snappy)[source]: Build with ‘-O2’. * gnu/package/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/compression.scm | 17 +++++----- .../snappy-add-O2-flag-in-CmakeLists.txt.patch | 36 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7b980b2f20..73d43547d8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1140,6 +1140,7 @@ dist_patch_DATA = \ %D%/packages/patches/slim-sigusr1.patch \ %D%/packages/patches/slim-reset.patch \ %D%/packages/patches/slim-login.patch \ + %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \ %D%/packages/patches/sooperlooper-build-with-wx-30.patch \ %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch \ %D%/packages/patches/soundtouch-CVE-2018-1000223.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 666c9bfc3e..4619f385bb 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1154,14 +1154,15 @@ algorithm within the Numpy framework.") (package (name "snappy") (version "1.1.7") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/google/snappy/archive/" - version ".tar.gz")) - (file-name (string-append "snappy-" version ".tar.gz")) - (sha256 - (base32 - "1m7rcdqzkys5lspj8jcsaah8w33zh28s771bw0ga2lgzfgl05yix")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/google/snappy/archive/" + version ".tar.gz")) + (file-name (string-append "snappy-" version ".tar.gz")) + (sha256 + (base32 "1m7rcdqzkys5lspj8jcsaah8w33zh28s771bw0ga2lgzfgl05yix")) + (patches (search-patches "snappy-add-O2-flag-in-CmakeLists.txt.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) diff --git a/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch b/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch new file mode 100644 index 0000000000..561763dabe --- /dev/null +++ b/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch @@ -0,0 +1,36 @@ +From: Tobias Geerinckx-Rice +Date: Sun, 26 Aug 2018 17:24:42 +0200 +Subject: [PATCH] snappy: Add O2 flag in CmakeLists.txt. + +Use ‘-O2’ optimisation when building with CMake, as is already done when +using the Makefile. This patch was copied verbatim from the Snappy +mailing list[0]. + +[0]: + +From 903c72fb29b2db07b4abc38a5feb83d88f739d80 Mon Sep 17 00:00:00 2001 +From: huangwenjun +Date: Fri, 10 Aug 2018 17:17:35 +0800 +Subject: [PATCH] Add O2 optimize flag in CmakeLists.txt. + +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62ecd09..29e0cdc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,9 @@ set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + ++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") ++ + # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make + # it prominent in the GUI. + option(BUILD_SHARED_LIBS "Build shared libraries(DLLs)." OFF) +-- +2.1.0 + -- cgit v1.2.3 From 4fca5a44f6eda4a0f623a9f61a96df0c2655ef38 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Aug 2018 13:37:09 +0200 Subject: gnu: libntlm: Update to 1.5. * gnu/packages/gsasl.scm (libntlm): Update to 1.5. [source]: Use HTTPS. --- gnu/packages/gsasl.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm index 9dcebe9832..127b476ef3 100644 --- a/gnu/packages/gsasl.scm +++ b/gnu/packages/gsasl.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012 Andreas Enge ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Eric Bavier +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,14 +34,14 @@ (define-public libntlm (package (name "libntlm") - (version "1.4") + (version "1.5") (source (origin (method url-fetch) - (uri (string-append "http://www.nongnu.org/libntlm/releases/" + (uri (string-append "https://www.nongnu.org/libntlm/releases/" "libntlm-" version ".tar.gz")) (sha256 (base32 - "129532iiip2cjr5h03bgz184v64v27sfm1r70v3ms4yk65gdf5c4")))) + "1gcvv7f9rggpxay81qv6kw5hr6gd4qiyzkbwhzz02fx9jvv9kmsk")))) (build-system gnu-build-system) (synopsis "Library that implements NTLM authentication") (description -- cgit v1.2.3 From 7bbdd943e77b68d64bcdfa1693e293e31676cfc3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Aug 2018 19:53:55 +0200 Subject: gnu: claws-mail: Update to 3.17.1. * gnu/packages/mail.scm (claws-mail): Update to 3.17.1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fc8436452a..1f7e971d60 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1011,7 +1011,7 @@ compresses it.") (define-public claws-mail (package (name "claws-mail") - (version "3.17.0") + (version "3.17.1") (source (origin (method url-fetch) (uri (string-append @@ -1019,7 +1019,7 @@ compresses it.") ".tar.xz")) (sha256 (base32 - "119y6q9p8zwm2xqlbkgqd119a529kjqlyldmb4h940z6c2qyjhqm")))) + "1wknxbwyzm5xjh3cqmddcxmvp1rkp301qga5n5rgfi7vcd0myyvm")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("bogofilter" ,bogofilter) -- cgit v1.2.3 From e29bb27d88355ee37c2c90f6c090f53e7f2966e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Aug 2018 17:25:22 +0200 Subject: gnu: r-pracma: Update to 2.1.5. * gnu/packages/maths.scm (r-pracma): Update to 2.1.5. --- 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 3d571e8cc9..ad33ccbcc6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2049,12 +2049,12 @@ programming problems.") (define-public r-pracma (package (name "r-pracma") - (version "2.1.4") + (version "2.1.5") (source (origin (method url-fetch) (uri (cran-uri "pracma" version)) (sha256 - (base32 "1ygm81i7mqvh229dp9935djjyb120p3bqvaf4k572sa4q63fzjhc")))) + (base32 "18cv7c2gvagbmggfbsy2xk9bpn47izd0qrmqnc3q7afvj6pr6nf9")))) (build-system r-build-system) (propagated-inputs `(("r-quadprog" ,r-quadprog))) -- cgit v1.2.3 From f882d7c7c5c3f0c0cf7b26ba51fc0c80d1704fba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Aug 2018 15:15:29 +0200 Subject: gnu: python-apipkg: Update home page. * gnu/packages/python.scm (python-apipkg)[home-page]: Update. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6ab6763a96..33bbc28edf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7378,7 +7378,7 @@ applications.") (description "With apipkg you can control the exported namespace of a Python package and greatly reduce the number of imports for your users. It is a small pure Python module that works on virtually all Python versions.") - (home-page "https://bitbucket.org/hpk42/apipkg") + (home-page "https://github.com/pytest-dev/apipkg") (license license:expat))) (define-public python2-apipkg -- cgit v1.2.3 From 2c3d30ef51a427f8abfb3632073843dcd8c4eac5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Aug 2018 13:46:03 +0200 Subject: gnu: r-plotrix: Update to 3.7-3. * gnu/packages/statistics.scm (r-plotrix): Update to 3.7-3. --- 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 5367554d82..56dfa0d15f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2455,13 +2455,13 @@ disk (or a connection).") (define-public r-plotrix (package (name "r-plotrix") - (version "3.7-2") + (version "3.7-3") (source (origin (method url-fetch) (uri (cran-uri "plotrix" version)) (sha256 (base32 - "0hx3xv94gzlyy7ny5k4mzs7w1798h1zka175m5bkzc524493cm88")))) + "18702y1gbyis56mh219z5ww0nrkh6qx7bgqv3khyn80g2giwk7cf")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/plotrix") (synopsis "Various plotting functions") -- cgit v1.2.3 From acf18cb19097e85ee5917b60aa32e3d69e752899 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 24 Aug 2018 02:59:02 +0200 Subject: gnu: capstone: Use HTTPS home page. * gnu/packages/engineering.scm (capstone)[home-page]: Use HTTPS. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3b433a1bfe..d53b25cff9 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1101,7 +1101,7 @@ language, ADMS transforms Verilog-AMS code into other target languages.") (setenv "LDFLAGS" (string-append "-Wl,-rpath=" (assoc-ref outputs "out") "/lib")) #t))))) - (home-page "http://www.capstone-engine.org") + (home-page "https://www.capstone-engine.org") (synopsis "Lightweight multi-platform, multi-architecture disassembly framework") (description "Capstone is a lightweight multi-platform, multi-architecture disassembly -- cgit v1.2.3 From 59b55def00361b1dbe2e979c2d0d4517d861c60c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Aug 2018 13:10:58 +0200 Subject: gnu: Add r-infotheo. * gnu/packages/cran.scm (r-infotheo): New variable. --- gnu/packages/cran.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index eb6bf9c38b..76f0359312 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4944,3 +4944,22 @@ developers to generate user interfaces easy to maintain.") models. The methods employed are applicable to virtually any predictive model and make comparisons between different methodologies straightforward.") (license license:gpl2+))) + +(define-public r-infotheo + (package + (name "r-infotheo") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "infotheo" version)) + (sha256 + (base32 + "18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv")))) + (build-system r-build-system) + (home-page "http://homepage.meyerp.com/software") + (synopsis "Information-theoretic measures") + (description + "This package implements various measures of information theory based on +several entropy estimators.") + (license license:gpl3+))) -- cgit v1.2.3 From 9587544b447db9a4952b8c368c5600f8ac439ff9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 17 Aug 2018 16:55:43 +0200 Subject: gnu: Add ghc 8.4.3. * gnu/packages/haskell.scm (ghc-8): Rename this... (ghc-8.0): ...to this. (ghc): Point at ghc-8.0. (ghc-8): New variable for GHC 8.4.3. Co-authored-by: Timothy Samplet --- gnu/packages/haskell.scm | 129 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 127 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7d7d85f951..a07bb049a2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -34,6 +34,7 @@ (define-module (gnu packages haskell) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -322,7 +323,7 @@ top of CLISP.") interactive environment for the functional language Haskell.") (license license:bsd-3))) -(define-public ghc-8 +(define-public ghc-8.0 (package (name "ghc") (version "8.0.2") @@ -434,7 +435,131 @@ interactive environment for the functional language Haskell.") interactive environment for the functional language Haskell.") (license license:bsd-3))) -(define-public ghc ghc-8) +(define-public ghc-8 + (package (inherit ghc-8.0) + (name "ghc") + (version "8.4.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.haskell.org/ghc/dist/" + version "/" name "-" version "-src.tar.xz")) + (sha256 + (base32 "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf")))) + (inputs + `(("gmp" ,gmp) + ("ncurses" ,ncurses) + ("libffi" ,libffi) + ("target-binutils" ,binutils) + ("target-gcc" ,gcc) + ("target-ld-wrapper" ,(make-ld-wrapper "ld-wrapper" + #:binutils binutils)))) + (native-inputs + `(("perl" ,perl) + ("python" ,python) ; for tests + ("ghostscript" ,ghostscript) ; for tests + ;; GHC 8.4.3 is built with GHC 8. + ("ghc-bootstrap" ,ghc-8.0) + ("ghc-testsuite" + ,(origin + (method url-fetch) + (uri (string-append + "https://www.haskell.org/ghc/dist/" + version "/" name "-" version "-testsuite.tar.xz")) + (sha256 + (base32 + "1z55b1z0m3plqd2d1ks6w5wvx7igm7zsk3i4v7cms003z0as0hzz")))))) + (arguments + `(#:test-target "test" + ;; We get a smaller number of test failures by disabling parallel test + ;; 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. + #:build #f + + #:configure-flags + (list + (string-append "--with-gmp-libraries=" + (assoc-ref %build-inputs "gmp") "/lib") + (string-append "--with-gmp-includes=" + (assoc-ref %build-inputs "gmp") "/include") + "--with-system-libffi" + (string-append "--with-ffi-libraries=" + (assoc-ref %build-inputs "libffi") "/lib") + (string-append "--with-ffi-includes=" + (assoc-ref %build-inputs "libffi") "/include") + (string-append "--with-curses-libraries=" + (assoc-ref %build-inputs "ncurses") "/lib") + (string-append "--with-curses-includes=" + (assoc-ref %build-inputs "ncurses") "/include")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-testsuite + (lambda* (#:key inputs #:allow-other-keys) + (invoke "tar" "xvf" + (assoc-ref inputs "ghc-testsuite") + "--strip-components=1") + #t)) + (add-after 'unpack-testsuite 'fix-shell-wrappers + (lambda _ + (substitute* '("driver/ghci/ghc.mk" + "utils/mkdirhier/ghc.mk" + "rules/shell-wrapper.mk") + (("echo '#!/bin/sh'") + (format #f "echo '#!~a'" (which "sh")))) + #t)) + ;; This is necessary because the configure system no longer uses + ;; “AC_PATH_” but “AC_CHECK_”, setting the variables to just the + ;; 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"))) + (setenv "CC" (string-append gcc "/bin/gcc")) + (setenv "CXX" (string-append gcc "/bin/g++")) + (setenv "LD" (string-append ld-wrapper "/bin/ld")) + (setenv "NM" (string-append binutils "/bin/nm")) + (setenv "RANLIB" (string-append binutils "/bin/ranlib")) + (setenv "STRIP" (string-append binutils "/bin/strip")) + ;; The 'ar' command does not follow the same pattern. + (setenv "fp_prog_ar" (string-append binutils "/bin/ar")) + #t))) + (add-before 'build 'fix-references + (lambda _ + (substitute* '("testsuite/timeout/Makefile" + "testsuite/timeout/timeout.py" + "testsuite/timeout/timeout.hs" + "testsuite/tests/programs/life_space_leak/life.test" + ;; libraries + "libraries/process/System/Process/Posix.hs" + "libraries/process/tests/process001.hs" + "libraries/process/tests/process002.hs" + "libraries/unix/cbits/execvpe.c") + (("/bin/sh") (which "sh")) + (("/bin/ls") (which "ls")) + (("/bin/rm") "rm")) + #t)) + (add-before 'build 'fix-environment + (lambda _ + (unsetenv "GHC_PACKAGE_PATH") + (setenv "CONFIG_SHELL" (which "bash")) + #t))))) + (native-search-paths (list (search-path-specification + (variable "GHC_PACKAGE_PATH") + (files (list + (string-append "lib/ghc-" version))) + (file-pattern ".*\\.conf\\.d$") + (file-type 'directory)))))) + +(define-public ghc ghc-8.0) (define-public ghc-hostname (package -- cgit v1.2.3 From 9e17757ff5d8d5159bda789cf4b3e28105b40adf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 29 Aug 2018 16:58:54 +0200 Subject: Revert "gnu: snappy: Optimise." This causes too many rebuilds for the master branch. This reverts commit f96ed06805db934ff735e80596f1373dc1c2b5a8. --- gnu/local.mk | 1 - gnu/packages/compression.scm | 17 +++++----- .../snappy-add-O2-flag-in-CmakeLists.txt.patch | 36 ---------------------- 3 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch diff --git a/gnu/local.mk b/gnu/local.mk index 73d43547d8..7b980b2f20 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1140,7 +1140,6 @@ dist_patch_DATA = \ %D%/packages/patches/slim-sigusr1.patch \ %D%/packages/patches/slim-reset.patch \ %D%/packages/patches/slim-login.patch \ - %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \ %D%/packages/patches/sooperlooper-build-with-wx-30.patch \ %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch \ %D%/packages/patches/soundtouch-CVE-2018-1000223.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 4619f385bb..666c9bfc3e 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1154,15 +1154,14 @@ algorithm within the Numpy framework.") (package (name "snappy") (version "1.1.7") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/google/snappy/archive/" - version ".tar.gz")) - (file-name (string-append "snappy-" version ".tar.gz")) - (sha256 - (base32 "1m7rcdqzkys5lspj8jcsaah8w33zh28s771bw0ga2lgzfgl05yix")) - (patches (search-patches "snappy-add-O2-flag-in-CmakeLists.txt.patch")))) + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/google/snappy/archive/" + version ".tar.gz")) + (file-name (string-append "snappy-" version ".tar.gz")) + (sha256 + (base32 + "1m7rcdqzkys5lspj8jcsaah8w33zh28s771bw0ga2lgzfgl05yix")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) diff --git a/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch b/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch deleted file mode 100644 index 561763dabe..0000000000 --- a/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Sun, 26 Aug 2018 17:24:42 +0200 -Subject: [PATCH] snappy: Add O2 flag in CmakeLists.txt. - -Use ‘-O2’ optimisation when building with CMake, as is already done when -using the Makefile. This patch was copied verbatim from the Snappy -mailing list[0]. - -[0]: - -From 903c72fb29b2db07b4abc38a5feb83d88f739d80 Mon Sep 17 00:00:00 2001 -From: huangwenjun -Date: Fri, 10 Aug 2018 17:17:35 +0800 -Subject: [PATCH] Add O2 optimize flag in CmakeLists.txt. - ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 62ecd09..29e0cdc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,9 @@ set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - -+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") -+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") -+ - # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make - # it prominent in the GUI. - option(BUILD_SHARED_LIBS "Build shared libraries(DLLs)." OFF) --- -2.1.0 - -- cgit v1.2.3 From 8892cac329d3d99391ca38d9498507409cb68b36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Aug 2018 17:04:13 +0200 Subject: gnu: Add python-llvmlite. * gnu/packages/llvm.scm (python-llvmlite): New variable. --- gnu/packages/llvm.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index add7f1b40c..cd710bcb79 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016 Dennis Mungai -;;; Copyright © 2016 Ricardo Wurmus +;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -30,6 +30,7 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages gcc) #:use-module (gnu packages bootstrap) ;glibc-dynamic-linker @@ -380,3 +381,53 @@ code analysis tools.") (patches (list (search-patch "llvm-for-extempore.patch"))))) ;; Extempore refuses to build on architectures other than x86_64 (supported-systems '("x86_64-linux")))) + +(define-public python-llvmlite + (package + (name "python-llvmlite") + (version "0.24.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "llvmlite" version)) + (sha256 + (base32 + "01zwjlc3c5mhrwmv4b73zgbskwqps9ly0nrh54bbj1f1l72f839j")))) + (build-system python-build-system) + (inputs + `(("llvm" + ,(package + (inherit llvm) + (source (origin + (inherit (package-source llvm)) + (patches + (list + (origin + (method url-fetch) + (uri (string-append "https://raw.githubusercontent.com/numba/" + "llvmlite/v" version "/conda-recipes/" + "D47188-svml.patch")) + (sha256 + (base32 + "0mrj24jvkv3hjcmyg98zmvmyl1znlh2j63rdr69f6g7s96d2pfv1"))) + (origin + (method url-fetch) + (uri (string-append "https://raw.githubusercontent.com/numba/" + "llvmlite/v" version "/conda-recipes/" + "twine_cfg_undefined_behavior.patch")) + (sha256 + (base32 + "07h71n2m1mn9zcfgw04zglffknplb233zqbcd6pckq0wygkrxflp"))) + (origin + (method url-fetch) + (uri (string-append "https://raw.githubusercontent.com/numba/" + "llvmlite/v" version "/conda-recipes/" + "0001-Transforms-Add-missing-header-for-InstructionCombini.patch")) + (sha256 + (base32 + "1pp0z9696l6j4dwz7ypjrm4vvkj0d3mlf1g8zmiyk08akw5lz0cb"))))))))))) + (home-page "http://llvmlite.pydata.org") + (synopsis "Wrapper around basic LLVM functionality") + (description + "This package provides a Python binding to LLVM for use in Numba.") + (license license:bsd-3))) -- cgit v1.2.3 From d8b8eb3ff5453676ffd5251f17424dad5e9966e8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 20 Aug 2018 20:00:17 +0200 Subject: gnu: Add python-numba. * gnu/packages/python.scm (python-numba): New variable. --- gnu/packages/python.scm | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 33bbc28edf..7575ab1859 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -99,6 +99,7 @@ #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages machine-learning) #:use-module (gnu packages man) #:use-module (gnu packages maths) @@ -13895,3 +13896,86 @@ Let's Encrypt.") development that supports command line argument parsing, command string validation testing and application logic.") (license license:expat))) + +;; Make sure to upgrade python-llvmlite in (gnu packages llvm) together with +;; python-numba. They have a very unflexible relationship. +(define-public python-numba + (package + (name "python-numba") + (version "0.39.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "numba" version)) + (sha256 + (base32 + "1bibvkwga1v8293i9ivl469d8bzgabn3vgr2ig7c1i68v8frsx07")))) + (build-system python-build-system) + (arguments + `(#:modules ((guix build utils) + (guix build python-build-system) + (ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-proprietary-features + (lambda _ + (setenv "NUMBA_DISABLE_HSA" "1") + (setenv "NUMBA_DISABLE_CUDA" "1") + #t)) + (add-after 'unpack 'remove-failing-tests + (lambda _ + ;; FIXME: these tests fail for unknown reasons: + ;; test_non_writable_pycache, test_non_creatable_pycache, and + ;; test_frozen (all in numba.tests.test_dispatcher.TestCache). + (substitute* "numba/tests/test_dispatcher.py" + (("def test(_non_writable_pycache)" _ m) + (string-append "def guix_skip" m)) + (("def test(_non_creatable_pycache)" _ m) + (string-append "def guix_skip" m)) + (("def test(_frozen)" _ m) + (string-append "def guix_skip" m))) + + ;; These tests fail because we don't run the tests from the build + ;; directory: test_setup_py_distutils, test_setup_py_setuptools + ;; They ar in numba.tests.test_pycc.TestDistutilsSupport. + (substitute* "numba/tests/test_pycc.py" + (("def test(_setup_py_distutils|_setup_py_setuptools)" _ m) + (string-append "def guix_skip" m))) + #t)) + (replace 'check + (lambda _ + (let ((cwd (getcwd))) + (setenv "PYTHONPATH" + (string-append cwd "/build/" + (find (cut string-prefix? "lib" <>) + (scandir (string-append cwd "/build"))) + ":" + (getenv "PYTHONPATH"))) + ;; Something is wrong with the PYTHONPATH when running the + ;; tests from the build directory, as it complains about not being + ;; able to import certain modules. + (with-directory-excursion "/tmp" + (invoke "python3" "-m" "numba.runtests" "-v" "-m"))) + #t))))) + (propagated-inputs + `(("python-llvmlite" ,python-llvmlite) + ("python-numpy" ,python-numpy) + ("python-singledispatch" ,python-singledispatch))) + ;; Needed for tests. + (inputs + `(("python-jinja2" ,python-jinja2) + ("python-pygments" ,python-pygments))) + (home-page "https://numba.pydata.org") + (synopsis "Compile Python code using LLVM") + (description "Numba gives you the power to speed up your applications with +high performance functions written directly in Python. With a few +annotations, array-oriented and math-heavy Python code can be just-in-time +compiled to native machine instructions, similar in performance to C, C++ and +Fortran, without having to switch languages or Python interpreters. + +Numba works by generating optimized machine code using the LLVM compiler +infrastructure at import time, runtime, or statically (using the included pycc +tool).") + (license license:bsd-3))) -- cgit v1.2.3 From 22b770ce0003b7d6fe98299292f8f5c0569f0712 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 20 Aug 2018 20:00:18 +0200 Subject: gnu: Add python-anndata. * gnu/packages/python.scm (python-anndata): New variable. --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7575ab1859..f59e24d5ff 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13979,3 +13979,29 @@ Numba works by generating optimized machine code using the LLVM compiler infrastructure at import time, runtime, or statically (using the included pycc tool).") (license license:bsd-3))) + +(define-public python-anndata + (package + (name "python-anndata") + (version "0.6.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "anndata" version)) + (sha256 + (base32 + "1fh461xyyc7pcrjfgd013bdc2alf53r46ss3gfw3431mbb1gappi")))) + (build-system python-build-system) + (propagated-inputs + `(("python-h5py" ,python-h5py) + ("python-natsort" ,python-natsort) + ("python-pandas" ,python-pandas) + ("python-scipy" ,python-scipy))) + (home-page "https://github.com/theislab/anndata") + (synopsis "Annotated data for data analysis pipelines") + (description "Anndata is a package for simple (functional) high-level APIs +for data analysis pipelines. In this context, it provides an efficient, +scalable way of keeping track of data together with learned annotations and +reduces the code overhead typically encountered when using a mostly +object-oriented library such as @code{scikit-learn}.") + (license license:bsd-3))) -- cgit v1.2.3 From c7fe888b424faec05a0d55e8b9321d6852ffb1f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 29 Aug 2018 17:05:46 +0200 Subject: gnu: Add python-scanpy. * gnu/packages/bioinformatics.scm (python-scanpy): 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 cb3c4bc1fd..3c300e48e9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13458,3 +13458,39 @@ conversions, region filtering, FASTA sequence extraction and more.") spliced (back-spliced) sequencing reads, indicative of circular RNA (circRNA) in RNA-seq data.") (license license:gpl3)))) + +(define-public python-scanpy + (package + (name "python-scanpy") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "scanpy" version)) + (sha256 + (base32 + "1ak7bxms5a0yvf65prppq2g38clkv7c7jnjbnfpkh3xxv7q512jz")))) + (build-system python-build-system) + (propagated-inputs + `(("python-anndata" ,python-anndata) + ("python-igraph" ,python-igraph) + ("python-numba" ,python-numba) + ("python-joblib" ,python-joblib) + ("python-natsort" ,python-natsort) + ("python-networkx" ,python-networkx) + ("python-statsmodels" ,python-statsmodels) + ("python-scikit-learn" ,python-scikit-learn) + ("python-matplotlib" ,python-matplotlib) + ("python-pandas" ,python-pandas) + ("python-scipy" ,python-scipy) + ("python-seaborn" ,python-seaborn) + ("python-h5py" ,python-h5py) + ("python-tables" ,python-tables))) + (home-page "http://github.com/theislab/scanpy") + (synopsis "Single-Cell Analysis in Python.") + (description "Scanpy is a scalable toolkit for analyzing single-cell gene +expression data. It includes preprocessing, visualization, clustering, +pseudotime and trajectory inference and differential expression testing. The +Python-based implementation efficiently deals with datasets of more than one +million cells.") + (license license:bsd-3))) -- cgit v1.2.3 From ac94ccb9b43186264e1cb3aa0c337b1e13772cca Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 12 Aug 2018 20:26:34 +0200 Subject: gnu: Add python-pyudev. * gnu/packages/admin.scm (python-pyudev): New variable. --- gnu/packages/admin.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c9230c3295..b372cd0079 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2750,3 +2750,42 @@ support forum. It runs with the @code{/exec} command in most IRC clients.") (description "@code{pscircle} visualizes Linux processes in the form of a radial tree.") (license license:gpl2+))) + +(define-public python-pyudev + (package + (name "python-pyudev") + (version "0.21.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyudev" version)) + (sha256 + (base32 + "0arz0dqp75sszsmgm6vhg92n1lsx91ihddx3m944f4ah0487ljq9")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ; Tests require /sys + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-ctypes-udev + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((eudev (assoc-ref inputs "eudev"))) + (substitute* "src/pyudev/core.py" + (("'udev'") + (string-append "'" eudev "/lib/libudev.so'"))) + (substitute* "src/pyudev/_ctypeslib/utils.py" + ;; Use absolute paths instead of keys. + (("= find_library") "= ")) + #t)))))) + (inputs + `(("eudev" ,eudev))) + (native-inputs + `(("python-docutils" ,python-docutils) + ("python-hypothesis" ,python-hypothesis) + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-sphinx" ,python-sphinx))) + (home-page "http://pyudev.readthedocs.org/") + (synopsis "Python udev binding") + (description "This package provides @code{udev} bindings for Python.") + (license license:lgpl2.1))) -- cgit v1.2.3 From 15c56e82735380c73894e704643cfbcee45a1c45 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 15 Aug 2018 19:46:08 +0200 Subject: gnu: Add solaar. * gnu/packages/admin.scm (solaar): New variable. --- gnu/packages/admin.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index b372cd0079..3d58780b95 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2789,3 +2789,42 @@ support forum. It runs with the @code{/exec} command in most IRC clients.") (synopsis "Python udev binding") (description "This package provides @code{udev} bindings for Python.") (license license:lgpl2.1))) + +(define-public solaar + (package + (name "solaar") + (version "0.9.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pwr/Solaar.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "085mfa13dap3wqik1dqlad0d7kff4rv7j4ljh99c7l8nhczkqgwm")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-prefix-detection + (lambda _ + (substitute* "setup.py" + (("'--prefix' in sys\\.argv") + "len([x.startswith('--prefix=') for x in sys.argv]) > 0")) + #t)) + (replace 'build + (lambda _ + (invoke "python" "setup.py" "build"))) + (add-before 'check 'setenv-PATH + (lambda _ + (setenv "PYTHONPATH" (string-append "lib:" (getenv "PYTHONPATH"))) + #t))))) + (propagated-inputs + `(("python-pygobject" ,python-pygobject) + ("python-pyudev" ,python-pyudev))) + (home-page "https://smxi.org/docs/inxi.htm") + (synopsis "Linux devices manager for the Logitech Unifying Receiver") + (description "This package provides tools to manage clients of the +Logitech Unifying Receiver.") + (license license:gpl2))) -- cgit v1.2.3 From 9e21f2170ec36f04097cee6ee76ba14c888cc81c Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 28 Aug 2018 22:32:44 +0200 Subject: gnu: Add r-abcoptim. gnu/packages/cran.scm (r-abcoptim): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 76f0359312..016d1b1e41 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4963,3 +4963,28 @@ and make comparisons between different methodologies straightforward.") "This package implements various measures of information theory based on several entropy estimators.") (license license:gpl3+))) + +(define-public r-abcoptim + (package + (name "r-abcoptim") + (version "0.15.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "ABCoptim" version)) + (sha256 + (base32 "1ih0xk88qhsmpvnxf56041wx5sk8as2f4f2gdnpnwdym9mbr9n4b")))) + (properties `((upstream-name . "ABCoptim"))) + (build-system r-build-system) + (propagated-inputs `(("r-rcpp" ,r-rcpp))) + (home-page "https://github.com/gvegayon/ABCoptim/") + (synopsis "Optimization of Artificial Bee Colony algorithm") + (description + "Artificial Bee Colony (ABC) is one of the most recently defined algorithms by Dervis +Karaboga in 2005, motivated by the intelligent behavior of honey bees. It is as +simple as Particle Swarm Optimization (PSO) and Differential Evolution (DE) +algorithms, and uses only common control parameters such as colony size and +maximum cycle number. The @code{r-abcoptim} implements the Artificial bee +colony optimization algorithm @url{http://mf.erciyes.edu.tr/abc/pub/tr06_2005.pdf}. + This version is a work-in-progress and is written in R code.") + (license license:expat))) -- cgit v1.2.3 From 4f9355c3606ecbe83dce78e6d01fa974d912bd4a Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 28 Aug 2018 22:26:13 +0200 Subject: gnu: Add gffcompare. gnu/packages/bioinformatics.scm (gffcompare): New variable. Signed-off-by: Leo Famulari --- gnu/packages/bioinformatics.scm | 64 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3c300e48e9..22a00894c2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Gábor Boskovits +;;; Copyright © 2018 Mădălin Ionel Patrașcu ;;; ;;; This file is part of GNU Guix. ;;; @@ -13494,3 +13495,66 @@ pseudotime and trajectory inference and differential expression testing. The Python-based implementation efficiently deals with datasets of more than one million cells.") (license license:bsd-3))) + +(define-public gffcompare + (let ((commit "be56ef4349ea3966c12c6397f85e49e047361c41") + (revision "1")) + (package + (name "gffcompare") + (version (git-version "0.10.15" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gpertea/gffcompare/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cp5qpxdhw4mxpya5dld8wi3jk00zyklm6rcri426wydinrnfmkg")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no check target + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'copy-gclib-source + (lambda* (#:key inputs #:allow-other-keys) + (mkdir "../gclib") + (copy-recursively + (assoc-ref inputs "gclib-source") "../gclib") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (install-file "gffcompare" bin) + #t)))))) + (native-inputs + `(("gclib-source" ; see 'README.md' of gffcompare + ,(let ((commit "54917d0849c1e83cfb057b5f712e5cb6a35d948f") + (revision "1") + (name "gclib") + (version (git-version "0.10.3" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gpertea/gclib/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0b51lc0b8syrv7186fd7n8f15rwnf264qgfmm2palrwks1px24mr"))))))) + (home-page "https://github.com/gpertea/gffcompare/") + (synopsis "Tool for comparing or classifing transcripts of RNA-Seq") + (description + "@code{gffcompare} is a tool that can: +@enumerate +@item compare and evaluate the accuracy of RNA-Seq transcript assemblers +(Cufflinks, Stringtie); +@item collapse (merge) duplicate transcripts from multiple GTF/GFF3 files (e.g. +resulted from assembly of different samples); +@item classify transcripts from one or multiple GTF/GFF3 files as they relate to +reference transcripts provided in a annotation file (also in GTF/GFF3 format). +@end enumerate") + (license + (list + license:expat ;license for gffcompare + license:artistic2.0))))) ;license for gclib -- cgit v1.2.3 From b4c698c8c99952fef0c9aa8c53c36631d84b5ef7 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 28 Aug 2018 14:50:39 -0700 Subject: gnu: python-trezor: Update to 0.10.2. * gnu/packages/finance.scm (python-trezor): Update to 0.10.2. [arguments]: Replace check with tests that do not require hardware device. [propagated-inputs]: Add python-click, python-libusb1, python-pyblake2 and python-typing. [native-inputs]: Add python-mock and python-pytest. Signed-off-by: Leo Famulari --- gnu/packages/finance.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 7aeaffcc5d..28bfb28f49 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -664,23 +664,38 @@ Ledger Blue/Nano S.") (define-public python-trezor (package (name "python-trezor") - (version "0.7.16") + (version "0.10.2") (source (origin (method url-fetch) (uri (pypi-uri "trezor" version)) (sha256 (base32 - "055kii56wgwadl5z911s59ya2fnsqzk3n5i19s2hb9sv2by6knvb")))) + "138k6zsqqpb46k3rcpyslm9q7yq5i6k4myvr9n425jnkadf4vfjd")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Default tests run device-specific tests which fail, only run specific tests. + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (invoke "python" "-m" "pytest" "--pyarg" "trezorlib.tests.unit_tests") + (invoke "python" "-m" "pytest" "-m" "slow_cosi" "--pyarg" "trezorlib.tests.unit_tests") + ))))) (propagated-inputs - `(("python-ecdsa" ,python-ecdsa) + `(("python-click" ,python-click) + ("python-ecdsa" ,python-ecdsa) ("python-hidapi" ,python-hidapi) + ("python-libusb1" ,python-libusb1) ("python-mnemonic" ,python-mnemonic) ("python-protobuf" ,python-protobuf) - ("python-requests" ,python-requests))) + ("python-pyblake2" ,python-pyblake2) + ("python-requests" ,python-requests) + ("python-typing" ,python-typing))) (native-inputs - `(("python-pyqt" ,python-pyqt))) ; Tests + `(("python-mock" ,python-mock) ; Tests + ("python-pyqt" ,python-pyqt) ; Tests + ("python-pytest" ,python-pytest))) ; Tests (home-page "https://github.com/trezor/python-trezor") (synopsis "Python library for communicating with TREZOR Hardware Wallet") (description "@code{trezor} is a Python library for communicating with -- cgit v1.2.3 From caf8a003b33f9ed59c8f9bf6fc2ca9929b96b63b Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Wed, 29 Aug 2018 15:52:05 -0400 Subject: gnu: emacs-racket-mode: Update to commit 92c3348. * gnu/packages/emacs.scm (emacs-racket-mode): Update to commit 92c3348. --- 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 6d34f626af..a1ce64ffaa 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -10053,7 +10053,7 @@ perform regression test for packages that provide font-lock rules.") (license license:gpl3+)))) (define-public emacs-racket-mode - (let ((commit "add0190d3c9bdad25fee57f8efd0460c9a45c2ec") + (let ((commit "92c33487f6c707880ac3f6169e7ea65ddffd1463") (revision "1")) (package (name "emacs-racket-mode") @@ -10068,7 +10068,7 @@ perform regression test for packages that provide font-lock rules.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0bf6s4nqjfacij20x9vppdnq8fq1bf53cch6p4g8xqcqri3ms4jw")))) + "19q6ym10gj2xdzzcgh3wdbq1xv8cv7nlrhv2b0bjvvdjzhiki472")))) (build-system emacs-build-system) (arguments `(#:include '("\\.el$" "\\.rkt$"))) -- cgit v1.2.3 From de5cbd4a38a33e0412f1c481fe8e01a871dc13e5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 29 Aug 2018 22:28:06 +0200 Subject: records: Adjust 'record-abi-mismatch-error' arguments. Previously, 'display-error' (as used by 'warn-about-load-error', for instance) would be called with a wrong number of arguments when a 'record-abi-mismatch-error' was caught: warning: failed to load '(gnu tests install)': Backtrace: [...] ERROR: In procedure display-error: Wrong number of arguments to # Now you get warnings and error reports as intended: warning: failed to load '(gnu tests install)': In procedure abi-check: : record ABI mismatch; recompilation needed warning: failed to load '(gnu tests ssh)': In procedure abi-check: : record ABI mismatch; recompilation needed * guix/records.scm (print-record-abi-mismatch-error): Remove. Remove top-level call to 'set-exception-printer!'. (abi-check): Use arguments as expected by 'display-error'. --- guix/records.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/guix/records.scm b/guix/records.scm index da3ecdaaf8..1f11648e2c 100644 --- a/guix/records.scm +++ b/guix/records.scm @@ -52,17 +52,6 @@ ((weird _ ...) ;weird! (syntax-violation name "invalid field specifier" #'weird))))) -(define (print-record-abi-mismatch-error port key args - default-printer) - (match args - ((rtd . _) - ;; The source file where this exception is thrown must be recompiled. - (format port "ERROR: ~a: record ABI mismatch; recompilation needed" - rtd)))) - -(set-exception-printer! 'record-abi-mismatch-error - print-record-abi-mismatch-error) - (eval-when (expand load eval) ;; The procedures below are needed both at run time and at expansion time. @@ -81,7 +70,11 @@ interface\" (ABI) for TYPE is equal to COOKIE." (with-syntax ((current-abi (current-abi-identifier type))) #`(unless (eq? current-abi #,cookie) - (throw 'record-abi-mismatch-error #,type))))) + ;; The source file where this exception is thrown must be + ;; recompiled. + (throw 'record-abi-mismatch-error 'abi-check + "~a: record ABI mismatch; recompilation needed" + '(#,type) '()))))) (define-syntax make-syntactic-constructor (syntax-rules () -- cgit v1.2.3 From d258c791441b46705f4360cf141343363d1751f2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 29 Aug 2018 22:32:05 +0200 Subject: tests: Warn about test module load failures. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by Clément Lassieur and Leo Famulari at . * gnu/tests.scm (test-modules): Pass #:warn to 'scheme-modules'. --- gnu/tests.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/tests.scm b/gnu/tests.scm index 5d4a4f8062..9e8eed7d95 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -22,6 +22,7 @@ #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix records) + #:use-module ((guix ui) #:select (warn-about-load-error)) #:use-module (gnu bootloader) #:use-module (gnu bootloader grub) #:use-module (gnu system) @@ -258,7 +259,8 @@ the system under test." (define (test-modules) "Return the list of modules that define system tests." (scheme-modules (dirname (search-path %load-path "guix.scm")) - "gnu/tests")) + "gnu/tests" + #:warn warn-about-load-error)) (define (fold-system-tests proc seed) "Invoke PROC on each system test, passing it the test and the previous -- cgit v1.2.3 From 4db7a9dc663c5b26e45ec35538bf68ff87acdf7b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 29 Aug 2018 23:29:03 +0200 Subject: linux-modules: Raise an error when a kernel module cannot be found. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously we'd get an unhelpful backtrace like this: In gnu/build/linux-modules.scm: 184:47 4 (recursive-module-dependencies _ #:lookup-module _) 98:14 3 (module-dependencies _) 85:18 2 (modinfo-section-contents _) In ice-9/ports.scm: 439:11 1 (call-with-input-file #f # ?) In unknown file: 0 (open-file #f "r" #:encoding #f #:guess-encoding #f) ERROR: In procedure open-file: Wrong type (expecting string): #f builder for `/gnu/store/…-linux-modules.drv' failed with exit code 1 * gnu/build/linux-modules.scm (find-module-file): When MODULE cannot be found, raise an error instead of returning #f. This is more useful to the user. --- gnu/build/linux-modules.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index ae141b6f54..2d81175041 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -136,7 +136,7 @@ and normalizing it." (define (find-module-file directory module) "Lookup module NAME under DIRECTORY, and return its absolute file name. NAME can be a file name with or without '.ko', or it can be a module name. -Return #f if it could not be found. +Raise an error if it could not be found. Module names can differ from file names in interesting ways; for instance, module names usually (always?) use underscores as the inter-word separator, @@ -162,7 +162,7 @@ whereas file names often, but not always, use hyphens. Examples: ((file) file) (() - #f) + (error "kernel module not found" module directory)) ((_ ...) (error "several modules by that name" module directory)))) -- cgit v1.2.3 From 8490a8346b5c8207f5798be55bea1de865b0bd42 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 13 Jul 2018 11:49:13 +0300 Subject: services: Add ddclient service. * gnu/services/dns.scm (ddclient-configuration, ddclient-service-type): New variables. (uglify-field-name, serialize-field, serialize-boolean, serialize-integer, serialize-string, serialize-list, serialize-extra-options, ddclient-activation, ddclient-shepherd-service, generate-ddclient-documentation): New procedures. * doc/guix.texi (DNS Services): Document it. --- doc/guix.texi | 108 +++++++++++++++++++++++++++++++++ gnu/services/dns.scm | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 275 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index cd0e74a2d7..97631d52e4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17263,6 +17263,114 @@ When false, disable negative caching. @end table @end deftp +@subsubheading ddclient Service + +@cindex ddclient +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}. + +The following example show instantiates the service with its default +configuration: + +@example +(service ddclient-service-type) +@end example + +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. + +@c %start of fragment + +Available @code{ddclient-configuration} fields are: + +@deftypevr {@code{ddclient-configuration} parameter} package ddclient +The ddclient package. + +@end deftypevr + +@deftypevr {@code{ddclient-configuration} parameter} integer daemon +The period after which ddclient will retry to check IP and domain name. + +Defaults to @samp{300}. + +@end deftypevr + +@deftypevr {@code{ddclient-configuration} parameter} boolean syslog +Use syslog for the output. + +Defaults to @samp{#t}. + +@end deftypevr + +@deftypevr {@code{ddclient-configuration} parameter} string mail +Mail to user. + +Defaults to @samp{"root"}. + +@end deftypevr + +@deftypevr {@code{ddclient-configuration} parameter} string mail-failure +Mail failed update to user. + +Defaults to @samp{"root"}. + +@end deftypevr + +@deftypevr {@code{ddclient-configuration} parameter} string pid +The ddclient PID file. + +Defaults to @samp{"/var/run/ddclient/ddclient.pid"}. + +@end deftypevr + +@deftypevr {@code{ddclient-configuration} parameter} boolean ssl +Enable SSL support. + +Defaults to @samp{#t}. + +@end deftypevr + +@deftypevr {@code{ddclient-configuration} parameter} string user +Specifies the user name or ID that is used when running ddclient +program. + +Defaults to @samp{"ddclient"}. + +@end deftypevr + +@deftypevr {@code{ddclient-configuration} parameter} string group +Group of the user who will run the ddclient program. + +Defaults to @samp{"ddclient"}. + +@end deftypevr + +@deftypevr {@code{ddclient-configuration} parameter} string secret-file +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. + +Defaults to @samp{"/etc/ddclient/secrets.conf"}. + +@end deftypevr + +@deftypevr {@code{ddclient-configuration} parameter} list extra-options +Extra options will be appended to @file{ddclient.conf} file. + +Defaults to @samp{()}. + +@end deftypevr + + +@c %end of fragment + + @node VPN Services @subsubsection VPN Services @cindex VPN (virtual private network) diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 2c57a36b84..16bd039f59 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Julien Lepiller +;;; Copyright © 2018 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,7 +46,10 @@ zone-entry dnsmasq-service-type - dnsmasq-configuration)) + dnsmasq-configuration + + ddclient-service-type + ddclient-configuration)) ;;; ;;; Knot DNS. @@ -670,3 +674,165 @@ (compose list dnsmasq-shepherd-service)))) (default-value (dnsmasq-configuration)) (description "Run the dnsmasq DNS server."))) + + +;;; +;;; ddclient +;;; + +(define (uglify-field-name field-name) + (string-delete #\? (symbol->string field-name))) + +(define (serialize-field field-name val) + (format #t "~a=~a\n" (uglify-field-name field-name) val)) + +(define (serialize-boolean field-name val) + (serialize-field field-name (if val "yes" "no"))) + +(define (serialize-integer field-name val) + (serialize-field field-name (number->string val))) + +(define (serialize-string field-name val) + (if (and (string? val) (string=? val "")) + "" + (serialize-field field-name val))) + +(define (serialize-list field-name val) + (if (null? val) "" (serialize-field field-name (string-join val)))) + +(define (serialize-extra-options extra-options) + (string-join extra-options "\n" 'suffix)) + +(define-configuration ddclient-configuration + (ddclient + (package ddclient) + "The ddclient package.") + (daemon + (integer 300) + "The period after which ddclient will retry to check IP and domain name.") + (syslog + (boolean #t) + "Use syslog for the output.") + (mail + (string "root") + "Mail to user.") + (mail-failure + (string "root") + "Mail failed update to user.") + (pid + (string "/var/run/ddclient/ddclient.pid") + "The ddclient PID file.") + (ssl + (boolean #t) + "Enable SSL support.") + (user + (string "ddclient") + "Specifies the user name or ID that is used when running ddclient +program.") + (group + (string "ddclient") + "Group of the user who will run the ddclient program.") + (secret-file + (string "/etc/ddclient/secrets.conf") + "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.") + (extra-options + (list '()) + "Extra options will be appended to @file{ddclient.conf} file.")) + +(define (ddclient-account config) + "Return the user accounts and user groups for CONFIG." + (let ((ddclient-user (ddclient-configuration-user config)) + (ddclient-group (ddclient-configuration-group config))) + (list (user-group + (name ddclient-group) + (system? #t)) + (user-account + (name ddclient-user) + (system? #t) + (group ddclient-group) + (comment "ddclientd privilege separation user") + (home-directory (string-append "/var/run/" ddclient-user)))))) + +(define (ddclient-activation config) + "Return the activation GEXP for CONFIG." + (with-imported-modules '((guix build utils) + (ice-9 rdelim)) + #~(begin + (use-modules (guix build utils) + (ice-9 rdelim)) + (let ((ddclient-user + #$(passwd:uid (getpw (ddclient-configuration-user config)))) + (ddclient-group + #$(passwd:gid (getpw (ddclient-configuration-group config)))) + (ddclient-secret-file + #$(ddclient-configuration-secret-file config))) + ;; 'ddclient' complains about ddclient.conf file permissions, which + ;; rules out /gnu/store. Thus we copy the ddclient.conf to /etc. + (for-each (lambda (dir) + (mkdir-p dir) + (chmod dir #o700) + (chown dir ddclient-user ddclient-group)) + '("/var/cache/ddclient" "/var/run/ddclient" + "/etc/ddclient")) + (with-output-to-file "/etc/ddclient/ddclient.conf" + (lambda () + (display + (string-append + "# Generated by 'ddclient-service'.\n\n" + #$(with-output-to-string + (lambda () + (serialize-configuration config + ddclient-configuration-fields))) + (if (string-null? ddclient-secret-file) + "" + (format #f "\n\n# Appended from '~a'.\n\n~a" + ddclient-secret-file + (with-input-from-file ddclient-secret-file + read-string))))))) + (chmod "/etc/ddclient/ddclient.conf" #o600) + (chown "/etc/ddclient/ddclient.conf" + ddclient-user ddclient-group))))) + +(define (ddclient-shepherd-service config) + "Return a for ddclient with CONFIG." + (let ((ddclient (ddclient-configuration-ddclient config)) + (ddclient-pid (ddclient-configuration-pid config)) + (ddclient-user (ddclient-configuration-user config)) + (ddclient-group (ddclient-configuration-group config))) + (list (shepherd-service + (provision '(ddclient)) + (documentation "Run ddclient daemon.") + (start #~(make-forkexec-constructor + (list #$(file-append ddclient "/bin/ddclient") + "-foreground" + "-file" "/etc/ddclient/ddclient.conf") + #:pid-file #$ddclient-pid + #:environment-variables + (list "SSL_CERT_DIR=/run/current-system/profile\ +/etc/ssl/certs" + "SSL_CERT_FILE=/run/current-system/profile\ +/etc/ssl/certs/ca-certificates.crt") + #:user #$ddclient-user + #:group #$ddclient-group)) + (stop #~(make-kill-destructor)))))) + +(define ddclient-service-type + (service-type + (name 'ddclient) + (extensions + (list (service-extension account-service-type + ddclient-account) + (service-extension shepherd-root-service-type + ddclient-shepherd-service) + (service-extension activation-service-type + ddclient-activation))) + (default-value (ddclient-configuration)) + (description "Configure address updating utility for dynamic DNS services, +ddclient."))) + +(define (generate-ddclient-documentation) + (generate-documentation + `((ddclient-configuration ,ddclient-configuration-fields)) + 'ddclient-configuration)) -- cgit v1.2.3 From 16de7f15cb2e9111916542dd538286d50086f100 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 26 Aug 2018 18:42:23 +0200 Subject: gnu: snappy: Optimise. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/compression.scm (snappy)[source]: Build with ‘-O2’. * gnu/package/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/compression.scm | 17 +++++----- .../snappy-add-O2-flag-in-CmakeLists.txt.patch | 36 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch diff --git a/gnu/local.mk b/gnu/local.mk index e88709a13c..76d6f69090 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1138,6 +1138,7 @@ dist_patch_DATA = \ %D%/packages/patches/slim-sigusr1.patch \ %D%/packages/patches/slim-reset.patch \ %D%/packages/patches/slim-login.patch \ + %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \ %D%/packages/patches/sooperlooper-build-with-wx-30.patch \ %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch \ %D%/packages/patches/soundtouch-CVE-2018-1000223.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index f2ed53f036..e15f47ac3b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1187,14 +1187,15 @@ algorithm within the Numpy framework.") (package (name "snappy") (version "1.1.7") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/google/snappy/archive/" - version ".tar.gz")) - (file-name (string-append "snappy-" version ".tar.gz")) - (sha256 - (base32 - "1m7rcdqzkys5lspj8jcsaah8w33zh28s771bw0ga2lgzfgl05yix")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/google/snappy/archive/" + version ".tar.gz")) + (file-name (string-append "snappy-" version ".tar.gz")) + (sha256 + (base32 "1m7rcdqzkys5lspj8jcsaah8w33zh28s771bw0ga2lgzfgl05yix")) + (patches (search-patches "snappy-add-O2-flag-in-CmakeLists.txt.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) diff --git a/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch b/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch new file mode 100644 index 0000000000..561763dabe --- /dev/null +++ b/gnu/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch @@ -0,0 +1,36 @@ +From: Tobias Geerinckx-Rice +Date: Sun, 26 Aug 2018 17:24:42 +0200 +Subject: [PATCH] snappy: Add O2 flag in CmakeLists.txt. + +Use ‘-O2’ optimisation when building with CMake, as is already done when +using the Makefile. This patch was copied verbatim from the Snappy +mailing list[0]. + +[0]: + +From 903c72fb29b2db07b4abc38a5feb83d88f739d80 Mon Sep 17 00:00:00 2001 +From: huangwenjun +Date: Fri, 10 Aug 2018 17:17:35 +0800 +Subject: [PATCH] Add O2 optimize flag in CmakeLists.txt. + +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62ecd09..29e0cdc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,9 @@ set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + ++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") ++ + # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make + # it prominent in the GUI. + option(BUILD_SHARED_LIBS "Build shared libraries(DLLs)." OFF) +-- +2.1.0 + -- cgit v1.2.3 From 99e0fb24fb7984304f139cb02b31643216642491 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 29 Aug 2018 19:47:12 -0400 Subject: gnu: audacity: Fix GtkFileChooserDialog. * gnu/packages/audio.scm (audacity)[arguments]: Add 'wrap-program' phase to fix GtkFileChooserDialog. [inputs]: Rename "gtk" to "gtk+". --- gnu/packages/audio.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f7f831918b..5468742c81 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -324,7 +324,7 @@ engineers, musicians, soundtrack editors and composers.") (build-system gnu-build-system) (inputs `(("wxwidgets" ,wxwidgets) - ("gtk" ,gtk+) + ("gtk+" ,gtk+) ("alsa-lib" ,alsa-lib) ("jack" ,jack-1) ("expat" ,expat) @@ -410,6 +410,15 @@ engineers, musicians, soundtrack editors and composers.") (("../lib-src/portmidi/porttime/porttime.h") "porttime.h")) (substitute* "src/prefs/MidiIOPrefs.cpp" (("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h")) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/audacity") + ;; For GtkFileChooserDialog. + `("GSETTINGS_SCHEMA_DIR" = + (,(string-append (assoc-ref inputs "gtk+") + "/share/glib-2.0/schemas")))) #t))) ;; The test suite is not "well exercised" according to the developers, ;; and fails with various errors. See -- cgit v1.2.3 From 7bb7920f64a871eadd8e76687f72673ef2298746 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Aug 2018 23:15:18 +0200 Subject: gnu: duplicity: Update to 0.7.18.1. * gnu/packages/backup.scm (duplicity): Update to 0.7.18.1. [arguments]: Remove upstreamed '--ignore-mdc-error' kluge. Rename 'patch-source' phase to 'use-store-file-names'. --- gnu/packages/backup.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index b36bb74f6f..bd4a177ecd 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -67,7 +67,7 @@ (define-public duplicity (package (name "duplicity") - (version "0.7.18") + (version "0.7.18.1") (source (origin (method url-fetch) @@ -77,7 +77,7 @@ version ".tar.gz")) (sha256 (base32 - "1qlika4l1k1nx8zr657ihcy0yzr1c1cdnjlbs325l5krvc3zbc5b")))) + "17c0203y5qz9w8iyhs26l44qf6a1vp26b5ykz1ypdr2kv6g02df9")))) (build-system python-build-system) (native-inputs `(("util-linux" ,util-linux) ; setsid command, for the tests @@ -99,21 +99,12 @@ #:test-target "test" #:phases (modify-phases %standard-phases - (add-before 'build 'patch-source + (add-before 'build 'use-store-file-names (lambda* (#:key inputs #:allow-other-keys) - ;; Embed gpg store name. (substitute* "duplicity/gpginterface.py" (("self.call = 'gpg'") (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'"))) - ;; This matches up with an unreleased upstream fix, it should be - ;; removed when the package is updated. - ;; https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/revision/1308 - (substitute* "duplicity/gpg.py" - (("--no-secmem-warning'\\)") - "--no-secmem-warning') - gnupg.options.extra_args.append('--ignore-mdc-error')")) - (substitute* '("testing/functional/__init__.py" "testing/overrides/bin/lftp") (("/bin/sh") (which "sh"))) -- cgit v1.2.3 From 1f0f9514eb77632bb0c22894fbcff6ca08534b19 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Aug 2018 02:43:56 +0200 Subject: gnu: gparted: Update to 0.32.0. * gnu/packages/disk.scm (gparted): Update to 0.32.0. --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index c7103c565a..58c867d765 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -336,14 +336,14 @@ and can dramatically shorten the lifespan of the drive if left unchecked.") (define-public gparted (package (name "gparted") - (version "0.31.0") + (version "0.32.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gparted/gparted/gparted-" version "/gparted-" version ".tar.gz")) (sha256 - (base32 "1fh7rpgb4xxdhgyjsirb83zvjfc5mfngb8a1pjbv7r6r6jj4jyrv")))) + (base32 "1fjp4c8jc0kjbbih1x1vs9v40d9lncma642kflnmy0bixxnvh7df")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; tests require a network connection -- cgit v1.2.3 From a82b561fef437d2f4a041e5f4df8305963552069 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 24 Aug 2018 04:00:47 +0200 Subject: gnu: robocut: Don't use unstable tarball. * gnu/packages/printers.scm (robocut)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/printers.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm index f8890cb7f1..dff9ed3010 100644 --- a/gnu/packages/printers.scm +++ b/gnu/packages/printers.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,7 +19,7 @@ (define-module (gnu packages printers) #:use-module (guix packages) - #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages libusb) @@ -32,15 +33,15 @@ (package (name "robocut") (version "1.0.11") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/Timmmm/robocut/archive/v" - version ".tar.gz")) - (sha256 - (base32 - "0nmr1plq1f6sarxwqwy4vzbxkljlx8y4xalm7r05vx4lrdai5pad")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Timmmm/robocut.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dp9cssyik63yvkk35s51v94a873x751iqg93qzd8dpqkmz5z8gn")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 33eea5c4393329db159652609605fbb5e6c1ebf0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Aug 2018 03:23:45 +0200 Subject: gnu: perl-sub-identify: Update to 0.14. * gnu/packages/perl.scm (perl-sub-identify): Update to 0.14. --- 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 a2d368306a..4d70e019b9 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -7631,7 +7631,7 @@ renaming exports, if they try to use them.") (define-public perl-sub-identify (package (name "perl-sub-identify") - (version "0.10") + (version "0.14") (source (origin (method url-fetch) @@ -7639,7 +7639,7 @@ renaming exports, if they try to use them.") "Sub-Identify-" version ".tar.gz")) (sha256 (base32 - "087fjcg6w576w47i1slj6mjfd3gl1b0airgddmn3prn0nff6nn2m")))) + "0vxdxyfh6037xy88ic7500wydzmsxldhp95n8bld2kaihqh2g386")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Sub-Identify") (synopsis "Retrieve names of code references") -- cgit v1.2.3 From ad3306f62fc607fe553fca7c4b01f87a46499e03 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Aug 2018 02:52:47 +0200 Subject: gnu: perl-gd: Update to 2.69. * gnu/packages/gd.scm (perl-gd): Update to 2.69. --- gnu/packages/gd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 56553a6745..c374695524 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -94,7 +94,7 @@ most common applications of GD involve website development.") (define-public perl-gd (package (name "perl-gd") - (version "2.68") + (version "2.69") (source (origin (method url-fetch) @@ -102,7 +102,7 @@ most common applications of GD involve website development.") "GD-" version ".tar.gz")) (sha256 (base32 - "0p2ya641nl5cvcqgw829xgabh835qijfd6vq2ba12862946xx8va")))) + "0palmq7l42fibqxhrabnjm7di4q8kciq9323902d717x3i4jvc6x")))) (build-system perl-build-system) (inputs `(("fontconfig" ,fontconfig) -- cgit v1.2.3 From bfb994d8be24d27378d77d0d280cf01b44eaa344 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 29 Aug 2018 03:52:18 +0200 Subject: gnu: r-car: Update to 3.0-2. * gnu/packages/statistics.scm (r-car): Update to 3.0-2. --- 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 56dfa0d15f..97246dc31d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5172,14 +5172,14 @@ Companion to Applied Regression, Third Edition, Sage.") (define-public r-car (package (name "r-car") - (version "3.0-1") + (version "3.0-2") (source (origin (method url-fetch) (uri (cran-uri "car" version)) (sha256 (base32 - "0rdk7hgahs38j6yv861i31wpmsmyvksxcv8jarvvcjl60whizhb2")))) + "0l3wyc9ia0ypcbap2p39slazfpbl84mjzydqvpsywrzdiyxajnfz")))) (build-system r-build-system) (propagated-inputs `(("r-abind" ,r-abind) -- cgit v1.2.3 From 9986316618c471a9a100d1b317a342aee8d5e6df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Aug 2018 22:04:16 +0200 Subject: gnu: mujs: Update to 1.0.4. * gnu/packages/javascript.scm (mujs): Update to 1.0.4. --- gnu/packages/javascript.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 3a9e88ad08..75517caf6b 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Nicolas Goaziou ;;; @@ -26,6 +26,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages lisp) + #:use-module (gnu packages readline) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -412,7 +413,7 @@ external server.") (define-public mujs (package (name "mujs") - (version "1.0.3") + (version "1.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -421,14 +422,16 @@ external server.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "15ml3rzjl44lqdb1yxipdh8bhh0rvk2g6w6sjv667q8xywijwqv8")))) + "1ly0yybs66nk63517kg4dmdc7dbikhqqqf2r2kvccgzzvv6k0vs8")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (delete 'configure)) ; no configure + (delete 'configure)) ; no configure #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")) (string-append "CC=gcc")) - #:tests? #f)) ; no tests + #:tests? #f)) ; no tests + (inputs + `(("readline" ,readline))) (home-page "https://artifex.com/mujs/") (synopsis "JavaScript interpreter written in C") (description "MuJS is a lightweight Javascript interpreter designed for -- cgit v1.2.3 From a28604ee8152a436f9d7384057a375a0362f34af Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 30 Aug 2018 00:53:01 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.153. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.153. --- 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 9ef695c4b2..49fc84c17b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -451,8 +451,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.152" - "082aajyr363ca95pxlg9iascf5d7k2gbw9ggsbsa1hj6nhspsxw6" + (make-linux-libre "4.4.153" + "195vzkkmjiicqfzd38hgf381rlz665rl06abzf8cww0gbnzvrf72" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From fa4131f2aa7ee97885169b9d3dcbf784c9382159 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 13:58:35 -0500 Subject: netsurf-buildsystem: Upgrade to 1.7. * gnu/packages/web.scm (netsurf-buildsystem): Upgrade to 1.7. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index aea75654be..b9c2e9e1a7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2018 Raoul Jean Pierre Bonnal ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2015, 2016, 2017 Eric Bavier +;;; Copyright © 2015, 2016, 2017, 2018 Eric Bavier ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2016 Jelle Licht @@ -4275,7 +4275,7 @@ tools they trust (e.g. wget).") (define netsurf-buildsystem (package (name "netsurf-buildsystem") - (version "1.6") + (version "1.7") (source (origin (method url-fetch) @@ -4283,7 +4283,7 @@ tools they trust (e.g. wget).") "buildsystem-" version ".tar.gz")) (sha256 (base32 - "0p5k708lcq8dip9xxck6hml32bjrbyipprm22bbsvdnsc0pqm71x")))) + "1q23aaycv35ma5471l1gxib8lfq2s9kprrkaqgfc926d04rlbmhw")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) (arguments -- cgit v1.2.3 From ea9b34c2f55b7b2b44a6a2ef1abf23c787c90b10 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 13:59:35 -0500 Subject: libparserutils: Upgrade to 0.2.4. * gnu/packages/web.scm (libparserutils): Upgrade to 0.2.4. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b9c2e9e1a7..6381aec18c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4314,7 +4314,7 @@ libraries.") (define-public libparserutils (package (name "libparserutils") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) @@ -4322,7 +4322,7 @@ libraries.") name "-" version "-src.tar.gz")) (sha256 (base32 - "01gzlsabgl6x0icd8758d9jqs8rrf9574bdkjainn04w3fs3znf5")))) + "1n2794y2l0c8nv8z2pxwfnbn882987ifmxjv60zdxkhcndhswarj")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From b06bf74b4139e6718926dfdb3aff3cdda0cbd793 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:00:11 -0500 Subject: hubbub: Upgrade to 0.3.5. * gnu/packages/web.scm (hubbub): Upgrade to 0.3.5. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6381aec18c..5fe149a75d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4339,7 +4339,7 @@ C. It is developed as part of the NetSurf project.") (define-public hubbub (package (name "hubbub") - (version "0.3.4") + (version "0.3.5") (source (origin (method url-fetch) @@ -4347,7 +4347,7 @@ C. It is developed as part of the NetSurf project.") "lib" name "-" version "-src.tar.gz")) (sha256 (base32 - "1shi4hv8drn9zy8f2f6yhnz2dqnpg5jkybvqhzggfjx1q35fbxz3")) + "13yq1k96a7972x4r71i9bcsz9yiglj0yx7lj0ziq5r94w5my70ma")) (patches (search-patches "hubbub-sort-entities.patch")))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From 60e411fc94b06c11a32a3b4209e9ea5244d63aee Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:00:39 -0500 Subject: libwapcaplet: Upgrade to 0.4.1. * gnu/packages/web.scm (libwapcaplet): Upgrade to 0.4.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5fe149a75d..9d3c4439f7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4453,7 +4453,7 @@ commenting.") (define-public libwapcaplet (package (name "libwapcaplet") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) @@ -4461,7 +4461,7 @@ commenting.") name "-" version "-src.tar.gz")) (sha256 (base32 - "15yr0pl6qa6biy36qkmd949ydbjzpqiaccpx3sprh4jknabsk1vv")))) + "134pljlm8kby1yy49826f0ixnpig8iqak6xpyl3aivagnsjnxzy8")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From 2bb1752b7d74f638af6703fdb6d8f210dac75364 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:07:21 -0500 Subject: libcss: Upgrade to 0.8.0. * gnu/packages/web.scm (libcss): Upgrade to 0.8.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9d3c4439f7..f8e77aa026 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4479,7 +4479,7 @@ developed as part of the Netsurf project.") (define-public libcss (package (name "libcss") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) @@ -4487,7 +4487,7 @@ developed as part of the Netsurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "16mns3h8vj7iw8myvgnw58q84irvbjlvfkxh8mdw6fbkjvaa7cnz")))) + "0pxdqbxn6brj03nv57bsvac5n70k4scn3r5msaw0jgn2k06lk81m")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From f8311c0feed593a5777303ee2d740c87b4a3970f Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:08:07 -0500 Subject: libdom: Upgrade to 0.3.3. * gnu/packages/web.scm (libdom): Upgrade to 0.3.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f8e77aa026..05f327b166 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4507,7 +4507,7 @@ written in C. It is developed as part of the NetSurf project.") (define-public libdom (package (name "libdom") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) @@ -4515,7 +4515,7 @@ written in C. It is developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "1zb7x2qwm6p11lph6j2vcyp4a0a8i1klkqilnk5vb4qmlzzpcv7i")))) + "1919757mdl3gii2pl6kzm8b1cal0h06r5nqd2y0kny6hc5yrhsp0")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From bb38628fab4448254350664c167351f2722b4d52 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:10:28 -0500 Subject: libsvgtiny: Upgrade to 0.1.7. * gnu/packages/web.scm (libsvgtiny): Upgrade to 0.1.7. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 05f327b166..68ffd2a6a3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4543,7 +4543,7 @@ developed as part of the NetSurf project.") (define-public libsvgtiny (package (name "libsvgtiny") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) @@ -4551,7 +4551,7 @@ developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "12ppy2r7m21ykrjgbf067cgi6dn48fkj7i4b7m64xl4dc13y0ah6")))) + "10bpkmvfpydj74im3r6kqm9vnvgib6afy0alx71q5n0w5yawy39c")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From ef2198ac5bbfcc6c80e765e7c46f308a714522da Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:10:52 -0500 Subject: libnsbmp: Upgrade to 0.1.5. * gnu/packages/web.scm (libnsbmp): Upgrade to 0.1.5. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 68ffd2a6a3..4142551d60 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4574,7 +4574,7 @@ project.") (define-public libnsbmp (package (name "libnsbmp") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) @@ -4582,7 +4582,7 @@ project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "0y4a0gn4l6lq4z9183wix0mdsgalqyw24k19k8jr8sz4h3lb7jrb")))) + "0lib2m07d1i0k80m4blkwnj0g7rha4jbm5vrgd0wwbkyfa0hvk35")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit v1.2.3 From 1dc02e727b7a1c0a41c0bf33a6e582f64060af9d Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:11:18 -0500 Subject: libnsgif: Upgrade to 0.2.1. * gnu/packages/web.scm (libnsgif): Upgrade to 0.2.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 4142551d60..8ffdce79ff 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4597,7 +4597,7 @@ written in C. It is developed as part of the NetSurf project.") (define-public libnsgif (package (name "libnsgif") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) @@ -4605,7 +4605,7 @@ written in C. It is developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "1phwf0m24m6nd7096fw14hanl4f8gr9bcppi834lbik04agxk38a")))) + "0jwshypgmx16xlsbx3d8njk8a5khazlplca5mxd3rdbhrlsabbly")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit v1.2.3 From 3e1035d738ba6d65121f8094df8f0ca5a690c492 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:11:39 -0500 Subject: libnsutils: Upgrade to 0.0.5. * gnu/packages/web.scm (libnsutils): Upgrade to 0.0.5. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8ffdce79ff..938bcce6c2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4620,7 +4620,7 @@ C. It is developed as part of the NetSurf project.") (define-public libnsutils (package (name "libnsutils") - (version "0.0.3") + (version "0.0.5") (source (origin (method url-fetch) @@ -4628,7 +4628,7 @@ C. It is developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "0wrxn4rcn7xrfnkmf60jafqn3n1kicgsdpnakd821q56bmqvzf0m")))) + "09w1rixps1iiq6wirjwxmd6h87llvjzvw565rahjb3rlyhcplfqf")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit v1.2.3 From 1be70775728f1809201f287d0b3de1da31b046c6 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:12:04 -0500 Subject: libnspsl: Upgrade to 0.1.3. * gnu/packages/web.scm (libnspsl): Upgrade to 0.1.3. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 938bcce6c2..44ebf6d722 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4643,7 +4643,7 @@ developed as part of the NetSurf project.") (define-public libnspsl (package (name "libnspsl") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) @@ -4651,7 +4651,7 @@ developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "0wim5hwzwrfrvvap096whf79m2mnfivbqhqlh03ci9d89xb1w0y9")))) + "1rsk1k2a495axxgv8060s0p1phhhcxrv75252kllbkvr8id5kqld")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem))) -- cgit v1.2.3 From c558113fb9ac60b8ec9ffca6f8059518514c548c Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:12:22 -0500 Subject: nsgenbind: Upgrade to 0.6. * gnu/packages/web.scm (nsgenbind): Upgrade to 0.6. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 44ebf6d722..6fc917b6be 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4666,7 +4666,7 @@ Public Suffix List. It is developed as part of the NetSurf project.") (define-public nsgenbind (package (name "nsgenbind") - (version "0.5") + (version "0.6") (source (origin (method url-fetch) @@ -4674,7 +4674,7 @@ Public Suffix List. It is developed as part of the NetSurf project.") name "-" version "-src.tar.gz")) (sha256 (base32 - "1iwjpdaan0njlhb9ir6a2q5vpxfmkqfldkvnqszqdz50b44vd1jv")))) + "0v1cb1rz5fix9ql31nzmglj7sybya6d12b2fkaypm1avcca59xwj")))) (build-system gnu-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From f9e140a243b6d6b5d28bd0813b69604562a39653 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 29 Aug 2018 14:12:58 -0500 Subject: netsurf: Upgrade to 3.8. * gnu/packages/patches/netsurf-message-timestamp.patch: New patch. * gnu/packages/patches/netsurf-system-utf8proc.patch: Adjust to new source. * gnu/packages/web.scm (netsurf): Upgrade to 3.8. [source]: Add the new patch. --- .../patches/netsurf-message-timestamp.patch | 11 ++++++++++ gnu/packages/patches/netsurf-system-utf8proc.patch | 25 +++++++++++----------- gnu/packages/web.scm | 7 +++--- 3 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 gnu/packages/patches/netsurf-message-timestamp.patch diff --git a/gnu/packages/patches/netsurf-message-timestamp.patch b/gnu/packages/patches/netsurf-message-timestamp.patch new file mode 100644 index 0000000000..8df9dbf8f7 --- /dev/null +++ b/gnu/packages/patches/netsurf-message-timestamp.patch @@ -0,0 +1,11 @@ +--- netsurf-3.8/utils/split-messages.pl.orig 1969-12-31 18:00:00.000000000 -0600 ++++ netsurf-3.8/utils/split-messages.pl 2018-08-30 00:18:58.158367530 -0500 +@@ -238,7 +238,7 @@ + + if( $opt{gzip} ) + { +- $ofh = new IO::Compress::Gzip( $ofh, AutoClose => 1, -Level => 9 ); ++ $ofh = new IO::Compress::Gzip( $ofh, AutoClose => 1, -Level => 9, Time => 0 ); + } + + return $ofh; diff --git a/gnu/packages/patches/netsurf-system-utf8proc.patch b/gnu/packages/patches/netsurf-system-utf8proc.patch index 654d45d017..a2ee52ca05 100644 --- a/gnu/packages/patches/netsurf-system-utf8proc.patch +++ b/gnu/packages/patches/netsurf-system-utf8proc.patch @@ -17,23 +17,23 @@ Work around upstream's lack of a pkg-config file and update API. # Optional libraries with pkgconfig ---- netsurf-3.6/utils/idna.c -+++ netsurf-3.6/utils/idna.c -@@ -26,7 +26,7 @@ - #include +--- netsurf-3.8/utils/idna.c ++++ netsurf-3.8/utils/idna.c +@@ -27,7 +27,7 @@ #include #include + #include -#include +#include - #include "utils/errors.h" - #include "utils/idna.h" ---- netsurf-3.7/test/Makefile 2017-10-15 08:39:24.000000000 -0500 -+++ netsurf-3.7/test/Makefile 2017-11-05 11:14:46.219013218 -0600 -@@ -139,14 +139,14 @@ - -D_XOPEN_SOURCE=600 \ + #include "netsurf/inttypes.h" + +--- netsurf-3.8/test/Makefile ++++ netsurf-3.8/test/Makefile +@@ -142,14 +142,15 @@ -Itest -Iinclude -Icontent/handlers -Ifrontends -I. -I.. \ -Dnsgtk \ + $(SAN_FLAGS) \ - $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) \ + $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils) \ $(LIB_CFLAGS) @@ -43,7 +43,8 @@ Work around upstream's lack of a pkg-config file and update API. TESTLDFLAGS := -L$(TESTROOT) \ - $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) -lz \ -+ $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils) -lz -lutf8proc \ ++ $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils) \ ++ $(LDFLAGS) \ + $(SAN_FLAGS) \ $(LIB_LDFLAGS)\ $(COV_LDFLAGS) - diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6fc917b6be..0d27fa0054 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4694,7 +4694,7 @@ w3c webidl files and a binding configuration file.") (define-public netsurf (package (name "netsurf") - (version "3.7") + (version "3.8") (source (origin (method url-fetch) @@ -4702,10 +4702,11 @@ w3c webidl files and a binding configuration file.") "releases/source/netsurf-" version "-src.tar.gz")) (sha256 (base32 - "05kynfzzwd4fc03vbqdjpghh5xnk2yrh43w7vikak89vla30mhpg")) + "0hjm1h4m1i913y4mhkl7yqdifn8k70fwi58zdh6faypawzryc3m0")) (patches (search-patches "netsurf-system-utf8proc.patch" "netsurf-y2038-tests.patch" - "netsurf-longer-test-timeout.patch")))) + "netsurf-longer-test-timeout.patch" + "netsurf-message-timestamp.patch")))) (build-system glib-or-gtk-build-system) (native-inputs `(("netsurf-buildsystem" ,netsurf-buildsystem) -- cgit v1.2.3 From b5d1286f2d796ce6dfcf45b9eeb0cf5630c191a9 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Mon, 27 Aug 2018 14:13:25 +0300 Subject: gnu: net-snmp: Specify '--with-openssl' configuration flag. * gnu/packages/networking.scm (net-snmp)[arguments]: Add '--with-openssl' flag. --- gnu/packages/networking.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 943bcecb86..61c0ad7fba 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2013,7 +2013,9 @@ Features: (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib") - "--with-logfile=/var/log/snmpd.log") + "--with-logfile=/var/log/snmpd.log" + (string-append "--with-openssl=" + (assoc-ref %build-inputs "openssl"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-tests -- cgit v1.2.3 From a3ece51a29241c7060323cbbfc602c83200ffe4a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 20 Aug 2018 17:38:56 +0200 Subject: import: stackage: Support recursive importing. * guix/import/hackage.scm (hackage-name->package-name): Export procedure. * guix/import/stackage.scm (lts-info-packages-lts-info): Fix match expression. (stackage-recursive-import): New procedure. (stackage->guix-package): Memoize results. * guix/scripts/import/stackage.scm (show-help, %options, guix-import-stackage): Support recursive importing. * doc/guix.texi (Invoking guix import): Document option. --- doc/guix.texi | 7 +++++- guix/import/hackage.scm | 1 + guix/import/stackage.scm | 45 ++++++++++++++++++++++++--------------- guix/scripts/import/stackage.scm | 46 ++++++++++++++++++++++++++++++---------- 4 files changed, 70 insertions(+), 29 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 97631d52e4..1e17c294b6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6699,9 +6699,14 @@ Specific command-line options are: @itemx -t Do not include dependencies required only by the test suites. @item --lts-version=@var{version} -@itemx -r @var{version} +@itemx -l @var{version} @var{version} is the desired LTS release version. If omitted the latest release is used. +@item --recursive +@itemx -r +Traverse the dependency graph of the given upstream package recursively +and generate package expressions for all those packages that are not yet +in Guix. @end table The command below imports metadata for the @code{HTTP} Haskell package diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 3c00f680bf..54301de2e8 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -44,6 +44,7 @@ %hackage-updater guix-package->hackage-name + hackage-name->package-name hackage-fetch hackage-source-url hackage-cabal-url diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index ec93fbced6..afd5d997ae 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Federico Beffa +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,10 +26,12 @@ #:use-module (srfi srfi-35) #:use-module (guix import json) #:use-module (guix import hackage) + #:use-module (guix import utils) #:use-module (guix memoization) #:use-module (guix packages) #:use-module (guix upstream) #:export (stackage->guix-package + stackage-recursive-import %stackage-updater)) @@ -45,9 +48,9 @@ (_ #f))) (define (lts-info-packages lts-info) - "Retruns the alist of packages contained in LTS-INFO." + "Returns the alist of packages contained in LTS-INFO." (match lts-info - ((_ ("packages" pkg ...)) pkg) + ((("packages" pkg ...) . _) pkg) (_ '()))) (define (leave-with-message fmt . args) @@ -85,25 +88,33 @@ (define (hackage-name-version name version) (and version (string-append name "@" version))) -(define* (stackage->guix-package package-name ; upstream name - #:key - (include-test-dependencies? #t) - (lts-version "") - (packages-info - (lts-info-packages - (stackage-lts-info-fetch lts-version)))) - "Fetch Cabal file for PACKAGE-NAME from hackage.haskell.org. The retrieved +(define stackage->guix-package + (memoize + (lambda* (package-name ; upstream name + #:key + (include-test-dependencies? #t) + (lts-version "") + (packages-info + (lts-info-packages + (stackage-lts-info-fetch lts-version)))) + "Fetch Cabal file for PACKAGE-NAME from hackage.haskell.org. The retrieved vesion corresponds to the version of PACKAGE-NAME specified in the LTS-VERSION release at stackage.org. Return the `package' S-expression corresponding to that package, or #f on failure. PACKAGES-INFO is the alist with the packages included in the Stackage LTS release." - (let* ((version (lts-package-version packages-info package-name)) - (name-version (hackage-name-version package-name version))) - (if name-version - (hackage->guix-package name-version - #:include-test-dependencies? - include-test-dependencies?) - (leave-with-message "~a: Stackage package not found" package-name)))) + (let* ((version (lts-package-version packages-info package-name)) + (name-version (hackage-name-version package-name version))) + (if name-version + (hackage->guix-package name-version + #:include-test-dependencies? + include-test-dependencies?) + (leave-with-message "~a: Stackage package not found" package-name)))))) + +(define (stackage-recursive-import package-name . args) + (recursive-import package-name #f + #:repo->guix-package (lambda (name repo) + (apply stackage->guix-package (cons name args))) + #:guix-name hackage-name->package-name)) ;;; diff --git a/guix/scripts/import/stackage.scm b/guix/scripts/import/stackage.scm index e6676e93e8..b4b12581bf 100644 --- a/guix/scripts/import/stackage.scm +++ b/guix/scripts/import/stackage.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Federico Beffa +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-37) + #:use-module (srfi srfi-41) #:use-module (ice-9 match) #:use-module (ice-9 format) #:export (guix-import-stackage)) @@ -43,11 +45,13 @@ (display (G_ "Usage: guix import stackage PACKAGE-NAME Import and convert the LTS Stackage package for PACKAGE-NAME.\n")) (display (G_ " - -r VERSION, --lts-version=VERSION + -l VERSION, --lts-version=VERSION specify the LTS version to use")) (display (G_ " -h, --help display this help and exit")) (display (G_ " + -r, --recursive import packages recursively")) + (display (G_ " -t, --no-test-dependencies don't include test-only dependencies")) (display (G_ " -V, --version display version information and exit")) @@ -68,11 +72,14 @@ Import and convert the LTS Stackage package for PACKAGE-NAME.\n")) (alist-cons 'include-test-dependencies? #f (alist-delete 'include-test-dependencies? result)))) - (option '(#\r "lts-version") #t #f + (option '(#\l "lts-version") #t #f (lambda (opt name arg result) (alist-cons 'lts-version arg (alist-delete 'lts-version result)))) + (option '(#\r "recursive") #f #f + (lambda (opt name arg result) + (alist-cons 'recursive #t result))) %standard-import-options)) @@ -90,6 +97,27 @@ Import and convert the LTS Stackage package for PACKAGE-NAME.\n")) (alist-cons 'argument arg result)) %default-options)) + (define (run-importer package-name opts error-fn) + (let* ((arguments (list + package-name + #:include-test-dependencies? + (assoc-ref opts 'include-test-dependencies?) + #:lts-version (assoc-ref opts 'lts-version))) + (sexp (if (assoc-ref opts 'recursive) + ;; Recursive import + (map (match-lambda + ((and ('package ('name name) . rest) pkg) + `(define-public ,(string->symbol name) + ,pkg)) + (_ #f)) + (reverse + (stream->list + (apply stackage-recursive-import arguments)))) + ;; Single import + (apply stackage->guix-package arguments)))) + (unless sexp (error-fn)) + sexp)) + (let* ((opts (parse-options)) (args (filter-map (match-lambda (('argument . value) @@ -99,15 +127,11 @@ Import and convert the LTS Stackage package for PACKAGE-NAME.\n")) (match args ((package-name) (with-error-handling - (let ((sexp (stackage->guix-package - package-name - #:include-test-dependencies? - (assoc-ref opts 'include-test-dependencies?) - #:lts-version (assoc-ref opts 'lts-version)))) - (unless sexp - (leave (G_ "failed to download cabal file for package '~a'~%") - package-name)) - sexp))) + (run-importer package-name opts + (lambda () + (leave (G_ "failed to download cabal file \ +for package '~a'~%") + package-name))))) (() (leave (G_ "too few arguments~%"))) ((many ...) -- cgit v1.2.3 From e37f889404b9055a50ea1b47259ce4acae23167d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Aug 2018 15:02:10 +0200 Subject: import: pypi: Also guess dependencies from *.egg-info/requires.txt. * guix/import/pypi.scm (guess-requirements): Extract "requires.txt" from the egg-info directory in addition to "requirements.txt"; strip off version constraints; use call-with-temporary-directory. --- guix/import/pypi.scm | 54 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 25560bac46..51c2d5264a 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015 Cyril Roelandt ;;; Copyright © 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,7 +37,8 @@ #:use-module (guix utils) #:use-module ((guix build utils) #:select ((package-name->name+version - . hyphen-package-name->name+version))) + . hyphen-package-name->name+version) + find-files)) #:use-module (guix import utils) #:use-module ((guix download) #:prefix download:) #:use-module (guix import json) @@ -114,9 +116,9 @@ package definition." `((propagated-inputs (,'quasiquote ,package-inputs)))))) (define (guess-requirements source-url wheel-url tarball) - "Given SOURCE-URL, WHEEL-URL and a TARBALL of the package, return a list of -the required packages specified in the requirements.txt file. TARBALL will be -extracted in the current directory, and will be deleted." + "Given SOURCE-URL, WHEEL-URL and a TARBALL of the package, return a list +of the required packages specified in the requirements.txt file. TARBALL will +be extracted in a temporary directory." (define (tarball-directory url) ;; Given the URL of the package's tarball, return the name of the directory @@ -140,8 +142,8 @@ cannot determine package dependencies")) ;; file, remove everything other than the actual name of the required ;; package, and return it. (string-take s - (or (string-index s #\space) - (string-length s)))) + (or (string-index s (lambda (chr) (member chr '(#\space #\> #\= #\<)))) + (string-length s)))) (define (comment? line) ;; Return #t if the given LINE is a comment, #f otherwise. @@ -197,31 +199,37 @@ cannot determine package dependencies")) (read-wheel-metadata temp)) #f)))) - (define (guess-requirements-from-source) ;; Return the package's requirements by guessing them from the source. (let ((dirname (tarball-directory source-url))) (if (string? dirname) - (let* ((req-file (string-append dirname "/requirements.txt")) - (exit-code (system* "tar" "xf" tarball req-file))) - ;; TODO: support more formats. - (if (zero? exit-code) - (dynamic-wind - (const #t) - (lambda () - (read-requirements req-file)) - (lambda () - (delete-file req-file) - (rmdir dirname))) - (begin - (warning (G_ "'tar xf' failed with exit code ~a\n") - exit-code) - '()))) + (call-with-temporary-directory + (lambda (dir) + (let* ((pypi-name (string-take dirname (string-rindex dirname #\-))) + (req-files (list (string-append dirname "/requirements.txt") + (string-append dirname "/" pypi-name ".egg-info" + "/requires.txt"))) + (exit-codes (map (lambda (file-name) + (parameterize ((current-error-port (%make-void-port "rw+")) + (current-output-port (%make-void-port "rw+"))) + (system* "tar" "xf" tarball "-C" dir file-name))) + req-files))) + ;; Only one of these files needs to exist. + (if (any zero? exit-codes) + (match (find-files dir) + ((file . _) + (read-requirements file)) + (() + (warning (G_ "No requirements file found.\n")))) + (begin + (warning (G_ "Failed to extract requirements files\n")) + '()))))) '()))) ;; First, try to compute the requirements using the wheel, since that is the ;; most reliable option. If a wheel is not provided for this package, try - ;; getting them by reading the "requirements.txt" file from the source. Note + ;; getting them by reading either the "requirements.txt" file or the + ;; "requires.txt" from the egg-info directory from the source tarball. Note ;; that "requirements.txt" is not mandatory, so this is likely to fail. (or (guess-requirements-from-wheel) (guess-requirements-from-source))) -- cgit v1.2.3 From ac906cb7bb2ec77821ddec291db4857cc812599d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 30 Aug 2018 15:12:07 +0200 Subject: import: pypi: Support recursive importing. * guix/import/pypi.scm (guess-requirements): Use upstream names. (compute-inputs): Return the upstream dependency names as an additional value. (make-pypi-sexp): Likewise. (pypi->guix-package): Memoize it. (pypi-recursive-import): New procedure. * guix/scripts/import/pypi.scm (show-help, %options): Accept "recursive" option. (guix-import-pypi): Use pypi-recursive-import. * doc/guix.texi (Invoking guix import): Document it. --- doc/guix.texi | 8 +++ guix/import/pypi.scm | 119 ++++++++++++++++++++++++------------------- guix/scripts/import/pypi.scm | 28 ++++++++-- 3 files changed, 99 insertions(+), 56 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 1e17c294b6..8611059791 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -6442,6 +6442,14 @@ package: guix import pypi itsdangerous @end example +@table @code +@item --recursive +@itemx -r +Traverse the dependency graph of the given upstream package recursively +and generate package expressions for all those packages that are not yet +in Guix. +@end table + @item gem @cindex gem Import metadata from @uref{https://rubygems.org/, diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 51c2d5264a..87b047bdac 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -25,6 +25,7 @@ #:use-module (ice-9 match) #:use-module (ice-9 pretty-print) #:use-module (ice-9 regex) + #:use-module (ice-9 receive) #:use-module ((ice-9 rdelim) #:select (read-line)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) @@ -47,6 +48,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system python) #:export (guix-package->pypi-name + pypi-recursive-import pypi->guix-package %pypi-updater)) @@ -162,7 +164,7 @@ cannot determine package dependencies")) ((or (string-null? line) (comment? line)) (loop result)) (else - (loop (cons (python->package-name (clean-requirement line)) + (loop (cons (clean-requirement line) result)))))))))) (define (read-wheel-metadata wheel-archive) @@ -182,9 +184,7 @@ cannot determine package dependencies")) (hash-ref (list-ref run_requires 0) "requires") '()))) - (map (lambda (r) - (python->package-name (clean-requirement r))) - requirements))))) + (map clean-requirement requirements))))) (lambda () (delete-file json-file) (rmdir dirname)))))) @@ -237,16 +237,21 @@ cannot determine package dependencies")) (define (compute-inputs source-url wheel-url tarball) "Given the SOURCE-URL of an already downloaded TARBALL, return a list of -name/variable pairs describing the required inputs of this package." - (sort - (map (lambda (input) - (list input (list 'unquote (string->symbol input)))) - (remove (cut string=? "python-argparse" <>) - (guess-requirements source-url wheel-url tarball))) - (lambda args - (match args - (((a _ ...) (b _ ...)) - (string-ci) + (guess-requirements source-url wheel-url tarball)))) + (values (sort + (map (lambda (input) + (let ((guix-name (python->package-name input))) + (list guix-name (list 'unquote (string->symbol guix-name))))) + dependencies) + (lambda args + (match args + (((a _ ...) (b _ ...)) + (string-cipackage-name name)) - (version ,version) - (source (origin - (method url-fetch) + (receive (input-package-names upstream-dependency-names) + (compute-inputs source-url wheel-url temp) + (values + `(package + (name ,(python->package-name name)) + (version ,version) + (source (origin + (method url-fetch) - ;; Sometimes 'pypi-uri' doesn't quite work due to mixed - ;; cases in NAME, for instance, as is the case with - ;; "uwsgi". In that case, fall back to a full URL. - (uri (pypi-uri ,(string-downcase name) version)) - (sha256 - (base32 - ,(guix-hash-url temp))))) - (build-system python-build-system) - ,@(maybe-inputs (compute-inputs source-url wheel-url temp)) - (home-page ,home-page) - (synopsis ,synopsis) - (description ,description) - (license ,(license->symbol license))))))) + ;; Sometimes 'pypi-uri' doesn't quite work due to mixed + ;; cases in NAME, for instance, as is the case with + ;; "uwsgi". In that case, fall back to a full URL. + (uri (pypi-uri ,(string-downcase name) version)) + (sha256 + (base32 + ,(guix-hash-url temp))))) + (build-system python-build-system) + ,@(maybe-inputs input-package-names) + (home-page ,home-page) + (synopsis ,synopsis) + (description ,description) + (license ,(license->symbol license))) + upstream-dependency-names)))))) -(define (pypi->guix-package package-name) - "Fetch the metadata for PACKAGE-NAME from pypi.org, and return the +(define pypi->guix-package + (memoize + (lambda* (package-name) + "Fetch the metadata for PACKAGE-NAME from pypi.org, and return the `package' s-expression corresponding to that package, or #f on failure." - (let ((package (pypi-fetch package-name))) - (and package - (guard (c ((missing-source-error? c) - (let ((package (missing-source-error-package c))) - (leave (G_ "no source release for pypi package ~a ~a~%") - (assoc-ref* package "info" "name") - (assoc-ref* package "info" "version"))))) - (let ((name (assoc-ref* package "info" "name")) - (version (assoc-ref* package "info" "version")) - (release (assoc-ref (latest-source-release package) "url")) - (wheel (assoc-ref (latest-wheel-release package) "url")) - (synopsis (assoc-ref* package "info" "summary")) - (description (assoc-ref* package "info" "summary")) - (home-page (assoc-ref* package "info" "home_page")) - (license (string->license (assoc-ref* package "info" "license")))) - (make-pypi-sexp name version release wheel home-page synopsis - description license)))))) + (let ((package (pypi-fetch package-name))) + (and package + (guard (c ((missing-source-error? c) + (let ((package (missing-source-error-package c))) + (leave (G_ "no source release for pypi package ~a ~a~%") + (assoc-ref* package "info" "name") + (assoc-ref* package "info" "version"))))) + (let ((name (assoc-ref* package "info" "name")) + (version (assoc-ref* package "info" "version")) + (release (assoc-ref (latest-source-release package) "url")) + (wheel (assoc-ref (latest-wheel-release package) "url")) + (synopsis (assoc-ref* package "info" "summary")) + (description (assoc-ref* package "info" "summary")) + (home-page (assoc-ref* package "info" "home_page")) + (license (string->license (assoc-ref* package "info" "license")))) + (make-pypi-sexp name version release wheel home-page synopsis + description license)))))))) + +(define (pypi-recursive-import package-name) + (recursive-import package-name #f + #:repo->guix-package (lambda (name repo) + (pypi->guix-package name)) + #:guix-name python->package-name)) (define (string->license str) "Convert the string STR into a license object." diff --git a/guix/scripts/import/pypi.scm b/guix/scripts/import/pypi.scm index 59a925a3ca..7bd83818ba 100644 --- a/guix/scripts/import/pypi.scm +++ b/guix/scripts/import/pypi.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 David Thompson +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-37) + #:use-module (srfi srfi-41) #:use-module (ice-9 match) #:use-module (ice-9 format) #:export (guix-import-pypi)) @@ -43,6 +45,8 @@ Import and convert the PyPI package for PACKAGE-NAME.\n")) (display (G_ " -h, --help display this help and exit")) (display (G_ " + -r, --recursive import packages recursively")) + (display (G_ " -V, --version display version information and exit")) (newline) (show-bug-report-information)) @@ -56,6 +60,9 @@ Import and convert the PyPI package for PACKAGE-NAME.\n")) (option '(#\V "version") #f #f (lambda args (show-version-and-exit "guix import pypi"))) + (option '(#\r "recursive") #f #f + (lambda (opt name arg result) + (alist-cons 'recursive #t result))) %standard-import-options)) @@ -81,11 +88,22 @@ Import and convert the PyPI package for PACKAGE-NAME.\n")) (reverse opts)))) (match args ((package-name) - (let ((sexp (pypi->guix-package package-name))) - (unless sexp - (leave (G_ "failed to download meta-data for package '~a'~%") - package-name)) - sexp)) + (if (assoc-ref opts 'recursive) + ;; Recursive import + (map (match-lambda + ((and ('package ('name name) . rest) pkg) + `(define-public ,(string->symbol name) + ,pkg)) + (_ #f)) + (reverse + (stream->list + (pypi-recursive-import package-name)))) + ;; Single import + (let ((sexp (pypi->guix-package package-name))) + (unless sexp + (leave (G_ "failed to download meta-data for package '~a'~%") + package-name)) + sexp))) (() (leave (G_ "too few arguments~%"))) ((many ...) -- cgit v1.2.3 From 0f377aad75314df6c6296f4172801519315d81cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 20 Aug 2018 17:43:30 +0200 Subject: Update NEWS. --- NEWS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS b/NEWS index ae8a8cbca0..891eb9e57a 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ #+STARTUP: content hidestars Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +Copyright © 2016, 2017, 2018 Ricardo Wurmus Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -10,6 +11,16 @@ Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès Please send Guix bug reports to bug-guix@gnu.org. +* Changes since 0.15.0 + +** Package management + +*** ‘guix import pypi’ has a new ‘--recursive’ option +*** ‘guix import hackage’ has a new ‘--recursive’ option +*** ‘guix import stackage’ has a new ‘--recursive’ option +The short option for ‘--lts-version’ is now ‘-l’ (used to be ‘-r’). + + * Changes in 0.15.0 (since 0.14.0) ** Package management -- cgit v1.2.3 From 471884ed112e072b59ea4cf360b2827a684e700e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 29 Aug 2018 21:41:18 +0200 Subject: gnu: lilv: Propagate LV2. * gnu/packages/audio.scm (lilv)[propagated-inputs]: Add LV2. [inputs]: Remove. --- gnu/packages/audio.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5468742c81..e731569ae1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1749,11 +1749,10 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.") #t))))) ;; Required by lilv-0.pc. (propagated-inputs - `(("serd" ,serd) + `(("lv2" ,lv2) + ("serd" ,serd) ("sord" ,sord) ("sratom" ,sratom))) - (inputs - `(("lv2" ,lv2))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://drobilla.net/software/lilv/") -- cgit v1.2.3 From 99088aa7514d462374b8deac8d78015cf8d78c12 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 17:53:16 +0200 Subject: gnu: p11-kit: Update to 0.23.14. * gnu/packages/tls.scm (p11-kit): Update to 0.23.14. --- 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 28d2ea5fd5..e42b6dfc6c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -120,7 +120,7 @@ in intelligent transportation networks.") (define-public p11-kit (package (name "p11-kit") - (version "0.23.13") + (version "0.23.14") (source (origin (method url-fetch) @@ -128,7 +128,7 @@ in intelligent transportation networks.") "download/" version "/p11-kit-" version ".tar.gz")) (sha256 (base32 - "1w92k6p4bhg8p24igfb6ifc6vixr2zdjh3x6gjhsphy778z40rda")))) + "0w0dkq9388grbbn4bv2p55vy1j51f7nd9hzlc9gz4fbm4dnzmf8w")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 652940d060fba5df8e058ff6073a270758d43448 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 17:56:09 +0200 Subject: gnu: ldb: Update to 1.3.6. * gnu/packages/samba.scm (ldb): Update to 1.3.6. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 16b9470e7c..3316e665f0 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -341,14 +341,14 @@ many event types, including timers, signals, and the classic file descriptor eve (define-public ldb (package (name "ldb") - (version "1.3.3") + (version "1.3.6") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/ldb/ldb-" version ".tar.gz")) (sha256 (base32 - "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b")) + "16lkz3gyvsm9als1wyimsl573hclr72xy6454mshwjanncs33lji")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From d3c1075c144c14d884290eb3012af946a5935ca1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 17:57:37 +0200 Subject: gnu: samba: Update to 4.8.5. * gnu/packages/samba.scm (samba): Update to 4.8.5. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 3316e665f0..345655d584 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -150,14 +150,14 @@ anywhere.") (define-public samba (package (name "samba") - (version "4.8.4") + (version "4.8.5") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 (base32 - "01jlk8xlawfp3yyhi5migcd1fy7dkavbh56in444m281kqa4s17m")))) + "0mailvhjsma19k6b6zjl02z9n2hbbyfybvicjfw2hh9d4sqyd3p5")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From e50c7278782a02a01ca3eb35670d75c8cb4f7fd9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 18:01:54 +0200 Subject: gnu: rng-tools: Update to 6.4. * gnu/packages/linux.scm (rng-tools): Update to 6.4. --- 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 49fc84c17b..63b3ece8e1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3625,7 +3625,7 @@ The following service daemons are also provided: (define-public rng-tools (package (name "rng-tools") - (version "6.3.1") + (version "6.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/nhorman/rng-tools/" @@ -3633,7 +3633,7 @@ The following service daemons are also provided: (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "04p7wvcm389s21y9mq8ss6z2szxi4nfrfixzwqjkq2qciz705i4s")))) + "005krksl8iz37l5p1nx8apl1yg7q78yrsb6inby31d2g5ck8nnwa")))) (build-system gnu-build-system) (arguments `(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB. -- cgit v1.2.3 From 4c13cb36f8a4dafcc3647441e301ffdabdae9166 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 18:20:16 +0200 Subject: gnu: GnuPG: Update to 2.2.10. * gnu/packages/gnupg.scm (gnupg): Update to 2.2.10. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index d5fb12650f..067a2338d4 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -247,14 +247,14 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.2.9") + (version "2.2.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "0r11mx8nkh7ysrnshs560amha5csx8zcaggb5kxcksx1zymyly32")))) + "05f9804g72pffdxgvxjmjzkfcpjg1x221g9rwcr8fi51hrxd77br")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 883832b4804cde76239ceef1cdc7f9ed808435f3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 18:41:27 +0200 Subject: gnu: appstream-glib: Update to 0.7.12. * gnu/packages/glib.scm (appstream-glib): Update to 0.7.12. --- 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 33b77555b5..14d2a8b315 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -787,7 +787,7 @@ programming langauage. It also contains the utility (define-public appstream-glib (package (name "appstream-glib") - (version "0.7.10") + (version "0.7.12") (source (origin (method url-fetch) (uri (string-append "https://people.freedesktop.org/~hughsient/" @@ -795,7 +795,7 @@ programming langauage. It also contains the utility "appstream-glib-" version ".tar.xz")) (sha256 (base32 - "08bs0hnkvdzqv9pakv1y4c4ph77rmzjq22g760w20sv7vs63nia3")))) + "1jcb2bggcic3iczr2hn8zp8a3c2hl1xjij0aawr7kwqmzh9b3jms")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 7693f678d1de222e47af6b34ce62c41ea69934c8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Aug 2018 18:57:10 +0200 Subject: gnu: pango: Replace with 1.42.4. Fixes . * gnu/packages/gtk.scm (pango)[replacement]: New field. (pango-1.42.4): New public variable. --- gnu/packages/gtk.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8b11e3fb1f..6c43a3ab56 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -218,6 +218,7 @@ affine transformation (scale, rotation, shear, etc.).") (package (name "pango") (version "1.42.0") + (replacement pango-1.42.4) (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -253,6 +254,19 @@ used throughout the world.") (license license:lgpl2.0+) (home-page "https://developer.gnome.org/pango/"))) +(define-public pango-1.42.4 + (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")))))) + (define-public pangox-compat (package (name "pangox-compat") -- cgit v1.2.3 From aadd1d241cc9891a857dda9a5cf8389673b3c76c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 30 Aug 2018 16:53:24 +0200 Subject: gnu: Add ddcutil. * gnu/packages/hardware.scm: New file. (ddcutil): New public variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Add the new file. --- gnu/local.mk | 1 + gnu/packages/hardware.scm | 75 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 gnu/packages/hardware.scm diff --git a/gnu/local.mk b/gnu/local.mk index 7b980b2f20..3b92a7ac0e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -213,6 +213,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/guile-wm.scm \ %D%/packages/gv.scm \ %D%/packages/gxmessage.scm \ + %D%/packages/hardware.scm \ %D%/packages/haskell.scm \ %D%/packages/haskell-check.scm \ %D%/packages/haskell-crypto.scm \ diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm new file mode 100644 index 0000000000..d3a99af358 --- /dev/null +++ b/gnu/packages/hardware.scm @@ -0,0 +1,75 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; +;;; 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 hardware) + #:use-module (gnu packages compression) + #:use-module (gnu packages glib) + #:use-module (gnu packages libusb) + #:use-module (gnu packages linux) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xorg) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + +;; This is a module for packages related to physical hardware that don't (yet) +;; have a more specific home like gps.scm, security-token.scm, &c. + +(define-public ddcutil + (package + (name "ddcutil") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.ddcutil.com/tarballs/" + name "-" version ".tar.gz")) + (sha256 + (base32 "1b4bm3zhk5vnad6fxf0mn8nrlj3fngifl7nzxgxw0n56hlv7ccv0")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("eudev" ,eudev) + ("glib" ,glib) + ("libdrm" ,libdrm) ; enhanced diagnostics + ("libusb" ,libusb) ; support USB monitors + ("libx11" ,libx11) ; enhanced diagnostics + ("libxrandr" ,libxrandr) + ("zlib" ,zlib))) + (home-page "https://www.ddcutil.com/") + (synopsis "Control external monitor settings") + (description + "ddcutil can query and modify most external monitors' settings, such as +brightness, colour levels, and input sources. Generally speaking, any setting +that can be changed by pressing buttons on the monitor can be modified by +ddcutil. + +ddcutil communicates directly with monitors implementing the Monitor Control +Command Set (@dfn{MCCS}). It usually does so through the the Display Data +Channel Command Interface (@dfn{DDC/CI}) protocol on the I2C bus, but can also +communicate over USB as per the USB Monitor Control Class Specification. + +One particular use case is in colour profile management. Monitor calibration +is relative to the monitor colour settings currently in effect, e.g. red gain. +ddcutil allows colour-related settings to be saved at the time a monitor is +calibrated, and restored when the calibration is applied.") + (license (list license:bsd-3 ; FindDDCUtil.cmake + license:gpl2+)))) ; everything else -- cgit v1.2.3 From 6e8c75b88435550906e251dd4a9c2eb732f803d4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 30 Aug 2018 17:50:48 +0200 Subject: gnu: Add msr-tools. * gnu/packages/hardware.scm (msr-tools): New public variable. --- gnu/packages/hardware.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index d3a99af358..f77336e504 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -73,3 +73,52 @@ ddcutil allows colour-related settings to be saved at the time a monitor is calibrated, and restored when the calibration is applied.") (license (list license:bsd-3 ; FindDDCUtil.cmake license:gpl2+)))) ; everything else + +(define-public msr-tools + (package + (name "msr-tools") + (version "1.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://01.org/sites/default/files/downloads/" + name "/" name "-" version ".zip")) + (sha256 + (base32 "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "sbindir=" (assoc-ref %outputs "out") "/sbin")) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-before 'install 'create-output-directory + (lambda* (#:key outputs #:allow-other-keys) + ;; 'make install' assumes that sbindir exists. + (let* ((out (assoc-ref outputs "out")) + (sbin (string-append out "/sbin"))) + (mkdir-p sbin) + #t)))) + #:tests? #f)) ; no test suite + (native-inputs + `(("unzip" ,unzip))) + ;; These registers and the CPUID instruction only exist on (most) x86 chips. + (supported-systems (list "i686-linux" "x86_64-linux")) + (home-page "https://01.org/msr-tools/") + (synopsis "Read and write Model-Specific Registers (@dfn{MSR})") + (description + "The MSR Tools project provides console utilities to directly access the +Model-Specific Registers (@dfn{MSR}s) and CPU ID of Intel-compatible processors: + +@itemize +@item @command{cpuid}: show identification and feature information of any CPU +@item @command{rdmsr}: read MSRs from any CPU or all CPUs +@item @command{wrmsr}: write to MSRs on any CPU or all CPUs +@end itemize + +These tools can be used to query and modify certain low-level CPU parameters, +such as the Turbo Boost ratio and Thermal Design Power (@dfn{TDP}) limits. + +MSR addresses differ (greatly) between processors, and any such modification can +be dangerous and may void your CPU or system board's warranty.") + (license license:gpl2))) ; cpuid.c is gpl2, {rd,wr}msr.c are gpl2+ -- cgit v1.2.3 From 8294362688096145547464ceaa25edd5cc65d024 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 21 Mar 2018 00:26:15 +0100 Subject: gnu: Add pipewalker. * gnu/packages/games.scm (pipewalker): New public variable. --- gnu/packages/games.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0142fc8ed2..3c5063f69b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -793,6 +793,46 @@ role, and your gender.") (license:fsdg-compatible "https://nethack.org/common/license.html")))) +(define-public pipewalker + (package + (name "pipewalker") + (version "0.9.4") + (source + (origin + (method url-fetch) + (uri (string-append "http://downloads.sourceforge.net/pipewalker/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "1x46wgk0s55562pd96cxagxkn6wpgglq779f9b64ff1k3xzp3myn")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "--docdir=" (assoc-ref %outputs "out") + "/share/doc/" ,name "-" ,version)) + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-docdir + ;; Makefile.in ignores configure's ‘--docdir=...’ option. Fix that. + (lambda _ + (substitute* "Makefile" + (("(pkgdocdatadir = ).*" _ assignment) + (string-append assignment "$(docdir)\n"))) + #t))))) + (inputs + `(("libpng" ,libpng) + ("mesa" ,mesa) + ("sdl" ,sdl))) + (home-page "http://pipewalker.sourceforge.net/") + (synopsis "Logical tile puzzle") + (description + "PipeWalker is a simple puzzle game with many diffent themes: connect all +computers to one network server, bring water from a source to the taps, etc. +The underlying mechanism is always the same: you must turn each tile in the +grid in the right direction to combine all components into a single circuit. +Every puzzle has a complete solution, although there may be more than one.") + (license license:gpl3+))) + (define-public prboom-plus (package (name "prboom-plus") -- cgit v1.2.3 From d6d9ca1017e6fce811862409b79cdbf692f1fc8e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 24 Aug 2018 03:51:38 +0200 Subject: gnu: Don't use unstable tarballs in (packages opencl). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/opencl.scm (opencl-clhpp, clinfo, beignet, pocl) [source]: Use GIT-FETCH and GIT-FILE-NAME. (pocl)[arguments]: Remove ‘remove-headers’ phase. (make-opencl-headers)[source]: Use GIT-FILE-NAME. --- gnu/packages/opencl.scm | 96 +++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 51 deletions(-) diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 42cedd1544..d32e696438 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Fis Trivial +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,7 +58,7 @@ (uri (git-reference (url "https://github.com/KhronosGroup/OpenCL-Headers.git") (commit commit))) - (file-name (string-append name "-" commit)) + (file-name (git-file-name name version)) (sha256 (base32 "176ydpbyws5nr4av6hf8p41pkhc0rc4m4vrah9w6gp2fw2i32838")))) @@ -102,15 +103,15 @@ programming.") (package (name "opencl-clhpp") (version "2.0.10") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v" - version ".tar.gz")) - (sha256 - (base32 - "0awg6yznbz3h285kmnd47fykx2qa34a07sr4x1657yn3jmi4a9zs")) - (file-name (string-append name "-" version ".tar.gz")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/OpenCL-CLHPP.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "0h5kpg5cl8wzfnqmv6i26aig2apv06ffm9p3rh35938n9r8rladm")) + (file-name (git-file-name name version)))) (native-inputs `(("python" ,python-wrapper))) (propagated-inputs @@ -124,7 +125,7 @@ programming.") (string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "out") "/include"))) - ;; regression tests requires a lot more dependencies + ;; The regression tests require a lot more dependencies. #:tests? #f)) (build-system cmake-build-system) (home-page "http://github.khronos.org/OpenCL-CLHPP/") @@ -174,15 +175,15 @@ Loader as provided by this package.") (package (name "clinfo") (version "2.2.18.04.06") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/Oblomov/clinfo/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0v7cy01irwdgns6lzaprkmm0502pp5a24zhhffydxz1sgfjj2w7p")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Oblomov/clinfo.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0y2q0lz5yzxy970b7w7340vp4fl25vndahsyvvrywcrn51ipgplx")))) (build-system gnu-build-system) (native-inputs `(("opencl-headers" ,opencl-headers))) @@ -216,22 +217,21 @@ the system.") (package (name "beignet") (version "1.3.2") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/intel/beignet/archive/Release_v" - version - ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "18r0lq3dkd4yn6bxa45s2lrr9cjbg70nr2nn6xablvgqwzw0jb0r")) - (patches (search-patches "beignet-correct-file-names.patch")) - (modules '((guix build utils))) - (snippet - ;; There's a suspicious .isa binary file under kernels/. - ;; Remove it. - '(for-each delete-file (find-files "." "\\.isa$"))))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/intel/beignet.git") + (commit (string-append "Release_v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0lpv3lvi2vrmzb8blflrpbd3jgin76zqmz6jcv17vn9mylqdrfnd")) + (patches (search-patches "beignet-correct-file-names.patch")) + (modules '((guix build utils))) + (snippet + ;; There's a suspicious .isa binary file under kernels/. + ;; Remove it. + '(for-each delete-file (find-files "." "\\.isa$"))))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) (inputs `(("clang@3.7" ,clang-3.7) @@ -295,15 +295,15 @@ back-end for the LLVM compiler framework.") (package (name "pocl") (version "1.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/pocl/pocl/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0lrw3hlb0w53xzmrf2hvbda406l70ar4gyadflvlkj4879lx138y")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pocl/pocl.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1z3sqn20ddv1030adchpzs65qng436gc2mb99p213mkh95jkh1l5")))) (build-system cmake-build-system) (native-inputs `(("libltdl" ,libltdl) @@ -323,12 +323,6 @@ back-end for the LLVM compiler framework.") (assoc-ref %build-inputs "libc") "/lib")) #:phases (modify-phases %standard-phases - (add-after 'install 'remove-headers - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (delete-file-recursively - (string-append out "/include")) - #t))) (add-before 'check 'set-HOME (lambda _ (setenv "HOME" "/tmp") -- cgit v1.2.3 From 8a68b71d99a2cbb0b252cd18fc52e1593aa10acd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 30 Aug 2018 18:58:41 +0200 Subject: gnu: keyutils: Update to 1.5.11. * gnu/packages/crypto.scm (keyutils): Update to 1.5.11. [inputs]: Add mit-krb5. --- gnu/packages/crypto.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index ae6150b0ab..e070ef61ac 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) #:use-module (gnu packages image) + #:use-module (gnu packages kerberos) #:use-module (gnu packages libbsd) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) @@ -277,7 +278,7 @@ the wrong hands.") (define-public keyutils (package (name "keyutils") - (version "1.5.10") + (version "1.5.11") (source (origin (method url-fetch) @@ -286,9 +287,9 @@ the wrong hands.") version ".tar.bz2")) (sha256 (base32 - "1dmgjcf7mnwc6h72xkvpaqpzxw8vmlnsmzz0s27pg0giwzm3sp0i")) + "1ddig6j5xjyk6g9l2wlqc7k1cgvryxdqbsv3c9rk1p3f42448n0i")) (modules '((guix build utils))) - ;; Create relative symbolic links instead of absolute ones to /lib/* + ;; Create relative symbolic links instead of absolute ones to /lib/*. (snippet '(begin (substitute* "Makefile" (("\\$\\(LNS\\) \\$\\(LIBDIR\\)/") "$(LNS) ")) @@ -306,6 +307,8 @@ the wrong hands.") "MANDIR=/share/man" "SHAREDIR=/share/keyutils") #:test-target "test")) + (inputs + `(("mit-krb5" ,mit-krb5))) (home-page "https://people.redhat.com/dhowells/keyutils/") (synopsis "Linux key management utilities") (description -- cgit v1.2.3 From 0c048c11a492dda58cf1c8445bcfefe0199d7e0c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 30 Aug 2018 19:27:00 +0200 Subject: gnu: cmocka: Update to 1.1.2. * gnu/packages/check.scm (cmocka): Update to 1.1.2. --- gnu/packages/check.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 17a69bcd1c..f4596010ea 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -269,7 +269,7 @@ problem, and shows the differences.") (define-public cmocka (package (name "cmocka") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (string-append "https://cmocka.org/files/" @@ -277,10 +277,10 @@ problem, and shows the differences.") version ".tar.xz")) (sha256 (base32 - "1283zi9qf5613g8iadm1fxmjh4rzxqd5np2j3lcpgairf25g8bph")))) + "1p9b6ccv939wjsgapn7wx24xw278awsw9h81lm0g4zw257hx276i")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ; No test target + `(#:tests? #f)) ; no test target (home-page "https://cmocka.org/") (synopsis "Unit testing framework for C") (description "Cmocka is a unit testing framework for C with support for -- cgit v1.2.3 From be4c63f48406006ded84511cf82f10b9f5400f7c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 31 Aug 2018 07:04:17 +0200 Subject: gnu: mame: Update to 0.201. * gnu/packages/emulators.scm (mame): Update to 0.201. [arguments]: Remove unnecessary fix. --- gnu/packages/emulators.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 141423d7bf..919392c72f 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1175,7 +1175,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.200") + (version "0.201") (source (origin (method git-fetch) @@ -1185,7 +1185,7 @@ play them on systems for which they were never designed!") (file-name (git-file-name name version)) (sha256 (base32 - "0ddw8635hdm21lgpf13k1vhfywy3460rwciv93vrqmpkq2dvpmib")) + "00whiig4ld3d4fkl34q48vlf28ygvvp5g7fp0rb5n31ymhl4kajk")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. @@ -1211,17 +1211,6 @@ play them on systems for which they were never designed!") #:tests? #f ;no test in regular release #:phases (modify-phases %standard-phases - ;; Add missing include lines for "fmin" and "ceil" functions. - ;; Reported upstream. Will be fixed in 0.201. - (add-after 'unpack 'add-missing-include - (lambda _ - (substitute* "src/devices/cpu/mips/mips3.cpp" - (("#include \"ps2vu.h\"" all) - (string-append all "\n#include "))) - (substitute* "src/devices/cpu/mips/ps2vif1.cpp" - (("#include \"ps2vif1.h\"" all) - (string-append all "\n#include "))) - #t)) (delete 'configure) (add-after 'build 'build-documentation (lambda _ (invoke "make" "-C" "docs" "man" "info"))) -- cgit v1.2.3 From 0b6678cd441006d5cd65a8aa33f17458b3588a19 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 31 Aug 2018 08:24:38 +0200 Subject: gnu: retroarch: Update to 1.7.4. * gnu/packages/emulators.scm (retroarch): Update to 1.7.4. --- 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 919392c72f..8e68c676ef 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1055,7 +1055,7 @@ emulation community. It provides highly accurate emulation.") (define-public retroarch (package (name "retroarch") - (version "1.7.3") + (version "1.7.4") (source (origin (method url-fetch) @@ -1063,7 +1063,7 @@ emulation community. It provides highly accurate emulation.") version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1si78dbwbsq4i0r42q94nmlpaxdyqch113nxavdprf4vc1224356")))) + (base32 "0h6y2hpjg4b470jvn9ghwp0k3a527sbb6xhia17frlm9w9v5028w")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests -- cgit v1.2.3 From 9fc2922794ffaae48e0a7c536e530ea2e0d46cf3 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 13 Aug 2018 21:05:55 +0200 Subject: services: nginx: Get the Shepherd to respawn NGINX. * gnu/services/web.scm (nginx-shepherd-service): Change 'start' (that is, all actions that don't send a signal to the master process) to return the PID. Wait until the PID file is created and contains an integer because it might be created after the parent process exits. --- gnu/services/web.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 97976509b6..467656444e 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -599,19 +599,33 @@ of index files." (nginx file run-directory) (let* ((nginx-binary (file-append nginx "/sbin/nginx")) + (pid-file (in-vicinity run-directory "pid")) (nginx-action (lambda args #~(lambda _ (invoke #$nginx-binary "-c" #$(or file (default-nginx-config config)) - #$@args))))) + #$@args) + (match '#$args + (("-s" . _) #t) + (_ + (let loop ((duration 0)) + ;; https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864/comments/7 + (sleep duration) + (if (file-exists? #$pid-file) + (let ((pid (call-with-input-file #$pid-file read))) + ;; it could be # + (if (integer? pid) pid (loop 1))) + (loop 1))))))))) ;; TODO: Add 'reload' action. (list (shepherd-service (provision '(nginx)) (documentation "Run the nginx daemon.") (requirement '(user-processes loopback)) + (modules `((ice-9 match) + ,@%default-modules)) (start (nginx-action "-p" run-directory)) (stop (nginx-action "-s" "stop"))))))) -- cgit v1.2.3 From 0e2d6d2698c5fbb0550d103475473b9800264abe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 31 Aug 2018 16:34:34 +0200 Subject: gnu: Add python-pyqt-without-qtwebkit. * gnu/packages/qt.scm (python-pyqt-without-qtwebkit): New variable. --- gnu/packages/qt.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f6eb2831fd..7dfdade979 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1834,6 +1834,15 @@ framework. The bindings are implemented as a set of Python modules and contain over 620 classes.") (license license:gpl3))) +;; XXX: This is useful because qtwebkit does not build reliably at this time. +;; Ultimately, it would be nicer to have a more modular set of python-pyqt-* +;; packages that could be used together. +(define-public python-pyqt-without-qtwebkit + (package (inherit python-pyqt) + (name "python-pyqt-without-qtwebkit") + (inputs + (alist-delete "qtwebkit" (package-inputs python-pyqt))))) + (define-public python2-pyqt (package (inherit python-pyqt) (name "python2-pyqt") -- cgit v1.2.3 From 9ce2f07ab6c614ea0afda3bdac601bdc0ef958c9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 31 Aug 2018 16:37:00 +0200 Subject: gnu: python-matplotlib: Use python-pyqt-without-qtwebkit. * gnu/packages/python.scm (python-matplotlib)[propagated-inputs]: Replace python-pyqt with python-pyqt-without-qtwebkit. --- gnu/packages/python.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f59e24d5ff..fd1fdbf82d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3503,7 +3503,8 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. ;; object. For this reason we need to import both libraries. ;; https://pythonhosted.org/cairocffi/cffi_api.html#converting-pycairo ("python-pycairo" ,python-pycairo) - ("python-pyqt" ,python-pyqt) + ;; XXX: qtwebkit cannot be built reliably. + ("python-pyqt" ,python-pyqt-without-qtwebkit) ("python-cairocffi" ,python-cairocffi))) (inputs `(("libpng" ,libpng) -- cgit v1.2.3 From 220458b0987959d2920afa7dd8ff35f7d1f531b0 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 19 Apr 2018 09:11:05 -0500 Subject: gnu: hypre: Update to 2.14.0. * gnu/packages/maths.scm (hypre): Update to 2.14.0 --- gnu/packages/maths.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ad33ccbcc6..377e47bc58 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3517,7 +3517,7 @@ set.") (define-public hypre (package (name "hypre") - (version "2.11.0") + (version "2.14.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/LLNL/hypre/archive/" @@ -3525,7 +3525,7 @@ set.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0q69ia0jivzcr8p049dn3mg8yjpn6nwq4sw9iqac8vr63vi54l6m")) + "0v515i73bvaz378h5465b1dy9v2gf924zy2q94cpq4qqarawvkqh")) (modules '((guix build utils))) (snippet '(begin @@ -3533,7 +3533,7 @@ set.") ;; substitute the tarball creation time. (substitute* "src/utilities/HYPRE_utilities.h" (("Date Compiled: .*$") - "Date Compiled: Mar 28 2016 20:19:59 +0000\"\n")) + "Date Compiled: Apr 11 2018 16:24:59 +0000\"\n")) #t)))) (build-system gnu-build-system) (outputs '("out" ;6.1 MiB of headers and libraries -- cgit v1.2.3 From 8e1395be5c7d1a6e895fb5b1e70bebc0fef161a6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 31 Aug 2018 17:23:38 +0200 Subject: records: Adjust to test changes in 'record-abi-mismatch-error'. Fixes a test failure introduced in de5cbd4a38a33e0412f1c481fe8e01a871dc13e5. * guix/records.scm (abi-check): Refer to TYPE in an unquoted context so we get at the RTD. * tests/records.scm ("ABI checks"): Adjust 'catch' handler to changes in the 'record-abi-mismatch-error' arguments. --- guix/records.scm | 2 +- tests/records.scm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/guix/records.scm b/guix/records.scm index 1f11648e2c..98f3c8fef0 100644 --- a/guix/records.scm +++ b/guix/records.scm @@ -74,7 +74,7 @@ interface\" (ABI) for TYPE is equal to COOKIE." ;; recompiled. (throw 'record-abi-mismatch-error 'abi-check "~a: record ABI mismatch; recompilation needed" - '(#,type) '()))))) + (list #,type) '()))))) (define-syntax make-syntactic-constructor (syntax-rules () diff --git a/tests/records.scm b/tests/records.scm index 80e08a9a5f..09ada70c2d 100644 --- a/tests/records.scm +++ b/tests/records.scm @@ -313,8 +313,9 @@ (lambda () (eval '(foo? (make-me-a-record)) module) #f) - (lambda (key rtd . _) - (eq? rtd (eval ' module)))))) + (match-lambda* + ((key 'abi-check (? string? message) (rtd) . _) + (eq? rtd (eval ' module))))))) (test-equal "recutils->alist" '((("Name" . "foo") -- cgit v1.2.3 From 301aa9e76c76026628e2abc88104410e0150b409 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 31 Aug 2018 17:26:19 +0200 Subject: pack: Correctly report "unknown pack format" errors. * guix/scripts/pack.scm (guix-pack): Fix "unknown pack format" error message. --- guix/scripts/pack.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 729850839b..fb0677de28 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -748,8 +748,8 @@ Create a bundle of PACKAGE.\n")) (build-image (match (assq-ref %formats pack-format) ((? procedure? proc) proc) (#f - (leave (G_ "~a: unknown pack format") - format)))) + (leave (G_ "~a: unknown pack format~%") + pack-format)))) (localstatedir? (assoc-ref opts 'localstatedir?))) (run-with-store store (mlet* %store-monad ((profile (profile-derivation -- cgit v1.2.3 From 600f1ad8e61e65ad9a1f22d099d16c5948cb1f48 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Aug 2018 01:22:18 -0400 Subject: gnu: KDE: Update to 5.49.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/kde-frameworks.scm (attica, baloo, bluez-qt, breeze-icons, extra-cmake-modules, kactivities, kactivities-stats, kapidox, karchive, kauth, kbookmarks, kcmutils, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdbusaddons, kde-framework-integration, kdeclarative, kded, kdesignerplugin, kdesu, kdewebkit, kdnssd, kdoctools, kemoticons, kfilemetadata, kglobalaccel, kguiaddons, ki18n, kiconthemes, kidletime, kimageformats, kinit, kio, kirigami, kitemmodels, kitemview, kjobwidgets, knewstuff, knotification, knotifyconfig, kpackage, kparts, kpeople, kplotting, kpty, krunner, kservice, ksyntaxhighlighting, ktexteditor, ktextwidgets, kunitcoversion, kwallet, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, kxmlrpcclient, modemmanager-qt, networkmanager-qt, oxygen-icons, plasma-framework, prison, qqc2-desktop-style, solid, sonnet, threadweaver): Update to 5.49.0. (extra-cmake-modules)[arguments]: Remove obsolete workaround. (attica)[arguments]: Disable some new tests. Co-authored-by: Björn Höfling --- gnu/packages/kde-frameworks.scm | 296 ++++++++++++++++++++-------------------- 1 file changed, 148 insertions(+), 148 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 7dc2cf37fe..5295a356a2 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -75,7 +75,7 @@ (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -84,21 +84,13 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1ml6s3ssr5izm3vnzlg5gn2nkcbz5l5nmapvyr4ml7n0089b43a3")))) + "07pdgjyrxniacqcfvrzw8ij3kasx5pkbq38k6491qbhzfm8vi7y0")))) (build-system cmake-build-system) (native-inputs `(("qtbase" ,qtbase))) ; For tests (needs qmake) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'post-5.42.0-release-fix - ;; FIXME: Remove for > 5.42.0 - ;; ECMToolchainAndroidTest doesn't exist anymore - ;; https://cgit.kde.org/extra-cmake-modules.git/commit?id=30f31c46d8caf4 - (lambda _ - (substitute* "tests/CMakeLists.txt" - (("^add_test_macro\\(ECMToolchainAndroidTest dummy\\)") "")) - #t)) (add-after 'unpack 'fix-lib-path (lambda _ ;; Always install into /lib and not into /lib64. @@ -283,7 +275,7 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") (define-public attica (package (name "attica") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -292,8 +284,16 @@ Phonon-GStreamer is a backend based on the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "0icjsk5sbri6nwybb2301wc6ysc1h4p35rxqp0adifyksq8akyxd")))) + "1iqclahs9yzyjnkzbzr8hl9j6q8m2djdm6mix92xwrakgirnl3gn")))) (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-network-tests + (lambda _ + ;; These tests require network access. + (substitute* "autotests/CMakeLists.txt" + ((".*providertest.cpp") ""))))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs @@ -315,7 +315,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (define-public bluez-qt (package (name "bluez-qt") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -324,7 +324,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") name "-" version ".tar.xz")) (sha256 (base32 - "0pbb0nn70hbsnp9q8jvqr3s85gh4bnnh1mp8xfkia2hp4c63ws9f")))) + "0mgnq7w52ksr8b7ys2f1m3irnviy011bsaggh489fjy0xlzk5ard")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -348,7 +348,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (define-public breeze-icons (package (name "breeze-icons") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -357,7 +357,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") name "-" version ".tar.xz")) (sha256 (base32 - "0mrj0b022yfy669qqby09k4ij6aqyky23gpnjcp85df9saq0x44r")))) + "178620hhqlv6dl8qal2bmiw55s8b3p4h16q8cgkmq5q5i59nzcph")))) (build-system cmake-build-system) (arguments `(#:phases @@ -388,7 +388,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") (define-public kapidox (package (name "kapidox") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -397,7 +397,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "0izyd66p5403gl09l7irzy97mb9b14n4zyjrwap800zjlpwh41pz")))) + "09jph3hvasqx1ia0l7is9brc08nxvh9qmg8564nh5cmqaxdwj559")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; has no test target @@ -430,7 +430,7 @@ documentation.") (define-public karchive (package (name "karchive") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -439,7 +439,7 @@ documentation.") name "-" version ".tar.xz")) (sha256 (base32 - "1vq2ngdxmdl6hzjwdcrv66ban8v9s5jiqwy1mgdqv4ak14l31qbi")))) + "1p1gwqda2bsjdysp4ggwdsldbasyfl075xn3wchqyakdv2bdzmn0")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -464,7 +464,7 @@ GZip format, via a subclass of QIODevice.") (define-public kcodecs (package (name "kcodecs") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -473,7 +473,7 @@ GZip format, via a subclass of QIODevice.") name "-" version ".tar.xz")) (sha256 (base32 - "0b19z432r9dnyjknvwffhcmrg969yhydjvy4qrkrf22026f4smwc")))) + "07va63gsfjrc5ha9rdli923cwyzxpb3v8xgf1zfhw75cfkgda3nz")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -500,7 +500,7 @@ Internet).") (define-public kconfig (package (name "kconfig") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -509,7 +509,7 @@ Internet).") name "-" version ".tar.xz")) (sha256 (base32 - "08gg0d20c09j7hyxm8ydpzk2yf30c87g9ag7a9nfykrmi6cqirdq")))) + "0cb3crnlr8hr5npq3ykfxqd4yckmkykzrrizfs89ryhmznc2ngsf")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -567,7 +567,7 @@ propagate their changes to their respective configuration files.") (define-public kcoreaddons (package (name "kcoreaddons") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -576,7 +576,7 @@ propagate their changes to their respective configuration files.") name "-" version ".tar.xz")) (sha256 (base32 - "17qv7r6z72mm9a0hyx5dgk90ikhhgm41bkvnq2hjal0py2lsnrs9")))) + "00s22jvbwav20cidnp8v9fgc6pqbp4wnqkb2spv18mjhg4pv3bqj")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -607,7 +607,7 @@ many more.") (define-public kdbusaddons (package (name "kdbusaddons") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -616,7 +616,7 @@ many more.") name "-" version ".tar.xz")) (sha256 (base32 - "1613pc3r70jnzvpwm1xjdbdsmcpx28jwvcs2qq9swlywr5qr9hbd")) + "1fnmrrffp3kfwyjfzqkzlizflpyqgzbjljb51ppmdypcq8wy9ibh")) (patches (search-patches "kdbusaddons-kinit-file-name.patch")))) (build-system cmake-build-system) (native-inputs @@ -652,7 +652,7 @@ as well as an API to create KDED modules.") (define-public kdnssd (package (name "kdnssd") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -661,7 +661,7 @@ as well as an API to create KDED modules.") name "-" version ".tar.xz")) (sha256 (base32 - "1k1rz62h3mafliik5n0k98dc56b5v2v6qyqj40696mcyc2d1yvll")))) + "1n61id2x1iianshg8g6fw389mqihz4h8sj9hnng7cdg4csh72ffr")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -680,7 +680,7 @@ infrastructure.") (define-public kguiaddons (package (name "kguiaddons") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -689,7 +689,7 @@ infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "193i8b4f13dkgp88m3pk9wzi0dhx7qmsnmpizxia3457gg016wn7")))) + "1zkjd3l5pyvvilcc9lbdgqaxnpvh586yf0cndl90h3x89hy1d4xk")))) (build-system cmake-build-system) ;; TODO: Build packages for the Python bindings. Ideally this will be ;; done for all versions of python guix supports. Requires python, @@ -718,7 +718,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (define-public ki18n (package (name "ki18n") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -727,7 +727,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") name "-" version ".tar.xz")) (sha256 (base32 - "1rpriflb2a48j94zxgh63l6rzq4nlnlkvy89ns1vkdw42bnqrjx9")))) + "1i4rdrxann45zl6fkmfd1b96q52g0mpc5x19fx9h80crapkm8jjz")))) (build-system cmake-build-system) (propagated-inputs `(("gettext" ,gettext-minimal) @@ -761,7 +761,7 @@ translation scripting.") (define-public kidletime (package (name "kidletime") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -770,7 +770,7 @@ translation scripting.") name "-" version ".tar.xz")) (sha256 (base32 - "019r41r28pcrcn1kwxsll53za705jkc9n23b6sr2lplgjk05bcxh")))) + "1fd02anlmaa0hnnp5q1s9973m3asy56qppwq1va1g6ga3csv3wrv")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -792,7 +792,7 @@ or user activity.") ;; plasma-framework which is tier 3. (package (name "kirigami") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -801,7 +801,7 @@ or user activity.") "kirigami2-" version ".tar.xz")) (sha256 (base32 - "11gqn7amp0r9bgh8ldgisfc2lrkzkn5mq2a1madf24nvjbkvqnqv")))) + "1wan9h7kvjzvyzfjfjd512lxiac5prhs493xjqwxgags6kxwglaz")))) (properties `((upstream-name . "kirigami2"))) (build-system cmake-build-system) (native-inputs @@ -841,7 +841,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") (define-public kitemmodels (package (name "kitemmodels") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -850,7 +850,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") name "-" version ".tar.xz")) (sha256 (base32 - "0mcdzdqwmvf9pwirsrnjbhrgqphnfmanbl9zij4qsmin8n866mhc")))) + "1frha301540js45mrxiw034m9b2rwsa56xphkqn6cm4jmn48qdjg")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -900,7 +900,7 @@ model to observers (define-public kitemviews (package (name "kitemviews") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -909,7 +909,7 @@ model to observers name "-" version ".tar.xz")) (sha256 (base32 - "1j1q0b08f8mnfc3r2a7rplyb2nv9f0aq5a3fxskinvg70c6y248w")))) + "1aj605q2p72w4rb9i0f2xb93bn5xfjq9sl5i4h6rqflcvvy7qpdp")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -935,7 +935,7 @@ to flat and hierarchical lists.") (define-public kplotting (package (name "kplotting") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -944,7 +944,7 @@ to flat and hierarchical lists.") name "-" version ".tar.xz")) (sha256 (base32 - "109b9grshrwralyp8ilkbf1k0akaggygqh6wafqdf0ris0ps13l9")))) + "13fzqqkyxs4ja6n5yb9lc5jx4qpsmrbsiihnwrgj3lhpzhlr91n0")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -970,7 +970,7 @@ pixel units.") (define-public ksyntaxhighlighting (package (name "ksyntaxhighlighting") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -979,7 +979,7 @@ pixel units.") "syntax-highlighting-" version ".tar.xz")) (sha256 (base32 - "1iwiym50859jki4x41rfdmbd14jiq5lr2hdg46pjkyw17njdjd60")))) + "17rkgzkfiz5dv0xr67na7ikqszgwjnf2gc11b2h47qdsr7pgx95v")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1019,7 +1019,7 @@ integration with a custom editor as well as a ready-to-use (define-public kwayland (package (name "kwayland") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1028,7 +1028,7 @@ integration with a custom editor as well as a ready-to-use name "-" version ".tar.xz")) (sha256 (base32 - "0wr6ygppahxsx3dh71h2wmybv7z7iyqdv7wn80cxb0mp4zpyinh7")))) + "0d95l2i3j1xxkc15n57w4rhf3di02zna4zzn4gap9qdhfxlfbqi6")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1058,7 +1058,7 @@ represented by a QPoint or a QSize.") (define-public kwidgetsaddons (package (name "kwidgetsaddons") - (version "5.42.1") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1067,7 +1067,7 @@ represented by a QPoint or a QSize.") name "-" version ".tar.xz")) (sha256 (base32 - "0h0vfrfl5zi01fpvmd825kazzlyawz3i66qrfkymdrnvqmfzcmlg")))) + "1frgqz9njbc81pfy6gl6p0hyh1977lg31ynrx5wy7lg7fwaxwl92")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1105,7 +1105,7 @@ configuration pages, message boxes, and password requests.") (define-public kwindowsystem (package (name "kwindowsystem") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1114,7 +1114,7 @@ configuration pages, message boxes, and password requests.") name "-" version ".tar.xz")) (sha256 (base32 - "15k6x0f93qxka3mz7qfzak2ibdd88q77pz6akil8s3g41zsg2dqv")))) + "175rzwrjndhawyy4x11lbihdr1r9gwxmxjpbz4x06hlz4g50wffp")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1170,7 +1170,7 @@ lower level classes for interaction with the X Windowing System.") (define-public modemmanager-qt (package (name "modemmanager-qt") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1179,7 +1179,7 @@ lower level classes for interaction with the X Windowing System.") name "-" version ".tar.xz")) (sha256 (base32 - "0q6qzn60z55h0gyc9xwdfaq45mjpk3zrr6d4qqjjfkqsr3866sfx")))) + "1wf3v552vbr4kh2d770zn3yn0q3bqjqbfrvnf813mnld7961m7p2")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1208,7 +1208,7 @@ messages.") (define-public networkmanager-qt (package (name "networkmanager-qt") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1217,7 +1217,7 @@ messages.") name "-" version ".tar.xz")) (sha256 (base32 - "03hhvx8d52mfgbhd4gn0vhsk9k1fv1pvq24ixxdgs2mw44v884xq")))) + "16pnd52m9srcb2ml3vc3kd9k1yak5rq09yci39qp7z5jbdy7jk2z")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1247,7 +1247,7 @@ which are used in DBus communication.") (define-public oxygen-icons (package (name "oxygen-icons") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1256,7 +1256,7 @@ which are used in DBus communication.") name "5" "-" version ".tar.xz")) (sha256 (base32 - "0pnav9h0xmvbaamzpcyznjjv25slz8maszshx7sj7h07b5a23x46")))) + "0llx06sr36cd6vgkgm3jw6k4cv1cfx3r6x6lmb477wpahis0n75g")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1272,7 +1272,7 @@ which are used in DBus communication.") (define-public prison (package (name "prison") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) @@ -1280,7 +1280,7 @@ which are used in DBus communication.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0bhg2fjdwsv7mk16jh1nc3miwggz1dl9l99l2f20xvi75hn7rryg")))) + (base32 "0dppz9x6k84sl0aiyjlh3xigqgda64r8mij3bzxcdkv2wbc4ld9d")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1297,7 +1297,7 @@ provides uniform access to generation of barcodes with data.") (define-public qqc2-desktop-style (package (name "qqc2-desktop-style") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1306,7 +1306,7 @@ provides uniform access to generation of barcodes with data.") name "-" version ".tar.xz")) (sha256 (base32 - "1arlfhcshfs11pgf87jzjgln1p711zlx0v0q014740mbzb9g5wnk")))) + "1vbms7b8x1y7yh8im8dv1q3wwl3j2x4r47yqg86f28grw2r2n2zj")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1331,7 +1331,7 @@ feel.") (define-public solid (package (name "solid") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1340,7 +1340,7 @@ feel.") name "-" version ".tar.xz")) (sha256 (base32 - "10lr8paaq6vaiqn833kzcdc3kkyv8j9fdchy7h8pvi9ajjjwq0lq")))) + "1p7rdmf2f8520xc7zp7wxlcizyyjfxwq5mf95qsfpwc4dl0c43gp")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1370,7 +1370,7 @@ system.") (define-public sonnet (package (name "sonnet") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1379,7 +1379,7 @@ system.") name "-" version ".tar.xz")) (sha256 (base32 - "1r3amddmy0nm8klw0jzvb8bl1l9hkrx50d8j0zq2lbjy36h3yliw")))) + "0m5pmka1hwjsg3c3qvx087z3fjrfw0ayk7ylgjls5iwd39kkl1b3")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1407,7 +1407,7 @@ ASpell and HUNSPELL.") (define-public threadweaver (package (name "threadweaver") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1416,7 +1416,7 @@ ASpell and HUNSPELL.") name "-" version ".tar.xz")) (sha256 (base32 - "1isqlpnfxzxyz7mdm7yfrafgnx09mcndicdgdw3mi4r4misbrrbn")))) + "099bs429p71dzrqy25z61rvn48w3b73p7yag4q69jnxcpj0qcyz7")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1437,7 +1437,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." (define-public kactivities (package (name "kactivities") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1446,7 +1446,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." name "-" version ".tar.xz")) (sha256 (base32 - "0z0ac426npq99s1b8yzrqkjjjc34nbxlpw8pw388yj7fa41hw21r")))) + "117f3zrdbs0pa10wn7vy691n02m01h6x4pm8m1q3f4pjm0k4kqim")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1482,7 +1482,7 @@ with other frameworks.") (define-public kauth (package (name "kauth") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1491,7 +1491,7 @@ with other frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "04kqb2hhr9lkpkxiaqlnyk0kmk6p89z5fgp5i5g83hsi8maz7swi")))) + "0qg3zwg3kfx2snmvsw4ixr0qds7bd7992dxggvi9dcny7dm9q0n8")))) (build-system cmake-build-system) (native-inputs `(("dbus" ,dbus) @@ -1529,7 +1529,7 @@ utilities.") (define-public kcompletion (package (name "kcompletion") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1538,7 +1538,7 @@ utilities.") name "-" version ".tar.xz")) (sha256 (base32 - "0yqci2v0dk5v1mz4n3gca599a7mpihy563zc6sl8hsa30ld8li0f")))) + "16br6wnqzndk8v41im23h2ww4hypi2i1qfg6m9c49mpxflgmspbi")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1565,7 +1565,7 @@ integrated it into your application's other widgets.") (define-public kcrash (package (name "kcrash") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1574,7 +1574,7 @@ integrated it into your application's other widgets.") name "-" version ".tar.xz")) (sha256 (base32 - "049y0xdyw37y0qid3d3plj8szfys5gw98j7lhcakiini8mn5cins")))) + "0xmr9rrl0xahpnq1rw4bbar1nbr21x2bk4hhv79la6dsg9ha25b3")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1600,7 +1600,7 @@ application crashes.") (define-public kdoctools (package (name "kdoctools") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1609,7 +1609,7 @@ application crashes.") name "-" version ".tar.xz")) (sha256 (base32 - "1bby3avdllch1mji0mxzcix8q5yir5a0i6wpjs5lwckv1glh6kmz")))) + "1dmpk453s71ls0q8hgpqqd5dcr7zlimf5wykizcy2wn7p77gzsgl")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1657,7 +1657,7 @@ from DocBook files.") (define-public kfilemetadata (package (name "kfilemetadata") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1666,7 +1666,7 @@ from DocBook files.") name "-" version ".tar.xz")) (sha256 (base32 - "03wk38q3sq354ykz9dwbgykn73ldf94ryx6hxvpr66bq3a59jmwz")))) + "045k1mgn8kg0qfsr5sl1499nzhzmbcvrqc205pmq6sh4r14nvk80")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1709,7 +1709,7 @@ by applications to write metadata.") (define-public kimageformats (package (name "kimageformats") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1718,7 +1718,7 @@ by applications to write metadata.") name "-" version ".tar.xz")) (sha256 (base32 - "1k67yrmszx7azjzrg478rimbz991lghx4d6dmg22p6dknajd78a6")))) + "1q7019gbk59fwampna1ayjvw016c0q79hmldpaqh3xa9sh082wy4")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1763,7 +1763,7 @@ formats.") (define-public kjobwidgets (package (name "kjobwidgets") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1772,7 +1772,7 @@ formats.") name "-" version ".tar.xz")) (sha256 (base32 - "1m3csdl7wh18ywv5p0qpbjpixvflgjcq3yvk3vlvh0sxxlwcz8k4")))) + "04i5cvbxii7n0jr3ai1dh44miqbdkxb6an5w8s7qvkv0xmkml35g")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1791,7 +1791,7 @@ asynchronous jobs.") (define-public knotifications (package (name "knotifications") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1800,7 +1800,7 @@ asynchronous jobs.") name "-" version ".tar.xz")) (sha256 (base32 - "0awmwypmd104vhaj2v9k83niflxj26d4mbl6mzfcj75lgka6kffc")))) + "10481j2irlqhqd16xi412xbglnyjl0ndanlv9s0d3fxirs95zdd9")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -1837,7 +1837,7 @@ covers feedback and persistent events.") (define-public kpackage (package (name "kpackage") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1846,7 +1846,7 @@ covers feedback and persistent events.") name "-" version ".tar.xz")) (sha256 (base32 - "10amhh07x8d0jkyylb19cyzjs71k8dq1y8isfahqzb2kd43vijqa")))) + "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1875,7 +1875,7 @@ were traditional plugins.") (define-public kpty (package (name "kpty") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1884,7 +1884,7 @@ were traditional plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "07s16zxs03ixy7yxy9fda83yqhcgqzx42gnvwjwkyc8q05njmma6")))) + "1pnj07079l6gkz6171fcvljh0dcdy9s77p1q0l9nnkknjbr102pg")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -1912,7 +1912,7 @@ and communicating with them using a pty.") (define-public kunitconversion (package (name "kunitconversion") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1921,7 +1921,7 @@ and communicating with them using a pty.") name "-" version ".tar.xz")) (sha256 (base32 - "0219pna4l3vvhyf5acsc87n48jzdnws6kwyhaiy3hy1pzrilv32l")))) + "11jnqz218rga3f4ppf1d927c7qhh2qpghwjpsrnrxdkz5nrvnf79")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1955,7 +1955,7 @@ gallons).") (define-public baloo (package (name "baloo") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -1964,7 +1964,7 @@ gallons).") name "-" version ".tar.xz")) (sha256 (base32 - "18yknkcls1ypsp8n5l254bhlffiq4as5w1wgcjzhnf49cacys8nl")))) + "0xj12v0k58sr3snxyj4vx7dqhinrvk6qm0ikymscqgbmw9ijwxph")))) (build-system cmake-build-system) (propagated-inputs `(("kcoreaddons" ,kcoreaddons) @@ -2019,7 +2019,7 @@ maintaining an index of the contents of your files.") (define-public kactivities-stats (package (name "kactivities-stats") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2028,7 +2028,7 @@ maintaining an index of the contents of your files.") name "-" version ".tar.xz")) (sha256 (base32 - "0si70hayf4brr83jzdjdsfvp8nc1sb7vdk0q532liafhf8hw9mq8")))) + "129z2m5330j0l1nw8g3qjib60xmx54c6d2g9vnp4w8z0agnihs5f")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2049,7 +2049,7 @@ by which applications, and what documents have been linked to which activity.") (define-public kbookmarks (package (name "kbookmarks") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2058,7 +2058,7 @@ by which applications, and what documents have been linked to which activity.") name "-" version ".tar.xz")) (sha256 (base32 - "08q413mr5ib04gwnqznvm9vkkfmnh16rgf6rqdvclnci9w7ml5x2")))) + "0clmfdcc1fc98q3vbfjf8x140a6df88ixhz0mny3dpv1wcr5cz53")))) (build-system cmake-build-system) (propagated-inputs `(("kwidgetsaddons" ,kwidgetsaddons))) @@ -2092,7 +2092,7 @@ using the XBEL format.") (define-public kcmutils (package (name "kcmutils") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2101,7 +2101,7 @@ using the XBEL format.") name "-" version ".tar.xz")) (sha256 (base32 - "1q67b0m6w3xvm22kq8b0b0rib1jzf25gf6dz7h286987zfbbs5n7")))) + "0xv899p9f0hj6hd089mhn910qn66bihzpaa11ikrhbimckw8g19q")))) (build-system cmake-build-system) (propagated-inputs `(("kconfigwidgets" ,kconfigwidgets) @@ -2131,7 +2131,7 @@ KCModules can be created with the KConfigWidgets framework.") (define-public kconfigwidgets (package (name "kconfigwidgets") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2140,7 +2140,7 @@ KCModules can be created with the KConfigWidgets framework.") name "-" version ".tar.xz")) (sha256 (base32 - "191zm24q2n001b65hcnfh2639k4iqhxwdmgdw29php3n2648xq4z")))) + "1nqcrqr67m3kvq2r83x45zcdghk12bas9fp0s43s68imrhy5xikz")))) (build-system cmake-build-system) (propagated-inputs `(("kauth" ,kauth) @@ -2174,7 +2174,7 @@ their settings.") (define-public kdeclarative (package (name "kdeclarative") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2183,7 +2183,7 @@ their settings.") name "-" version ".tar.xz")) (sha256 (base32 - "1w604jy6vg2247vggz0ivl7wy2h5iapkz2z86mah3aw99f7dqa22")))) + "0kgawb8wfx4snk2ckwxj0hmpgcvq3k1zpsxqdawi4cmsy4bxzfs9")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -2237,7 +2237,7 @@ that offer bindings to some of the Frameworks.") (define-public kded (package (name "kded") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2246,7 +2246,7 @@ that offer bindings to some of the Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "0w25dl4pnvby28gz0yvij32vi9n3p8si4nm4x45j7zsi2cb70j4l")))) + "1l6hs3spbs3618jwg3n7r3hrrkqxmmd43f0km8849x4641p72zyc")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2270,7 +2270,7 @@ started on demand.") (define-public kdesignerplugin (package (name "kdesignerplugin") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2279,7 +2279,7 @@ started on demand.") name "-" version ".tar.xz")) (sha256 (base32 - "004axa1fkj954d65x7l9z8dmw04209hb368rwa4gjzb8naf13ib6")))) + "0hj4ng0i22rvw4kl0irhqhww3kvn4c0pncn38w1j5vim4gxv0xcd")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2321,7 +2321,7 @@ ini-style description files.") (define-public kdesu (package (name "kdesu") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2330,7 +2330,7 @@ ini-style description files.") name "-" version ".tar.xz")) (sha256 (base32 - "0402p1h7wifk6sppg7ca9w0zfjllbhc1j5gsxj7ypq55g94np7hx")))) + "1gwvby51qqbkrs2vjpnplxr6m6xa5ddfdjs1iygh8kpqsh8a765k")))) (build-system cmake-build-system) (propagated-inputs `(("kpty" ,kpty))) @@ -2352,7 +2352,7 @@ with su and ssh respectively.") (define-public kdewebkit (package (name "kdewebkit") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2361,7 +2361,7 @@ with su and ssh respectively.") name "-" version ".tar.xz")) (sha256 (base32 - "1csd4p996im7ygxc5rfdkzgdpngjgzyqakj12rl9rnfbsd15i8kb")))) + "05idyw94ayjh7qdia9pnjmx29r5lsch421kv8h5ivr7ixcbrgk6n")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2384,7 +2384,7 @@ engine WebKit via QtWebKit.") (define-public kemoticons (package (name "kemoticons") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2393,7 +2393,7 @@ engine WebKit via QtWebKit.") name "-" version ".tar.xz")) (sha256 (base32 - "0f6an1bwxnga41a2b35b2pdcni4p0hh76k4jvanl3g046v07f2wr")))) + "0mz9hkhnprjbrfq54mqcvj8w87h025785m1bas80brsqzvni5krn")))) (build-system cmake-build-system) (propagated-inputs `(("kservice" ,kservice))) @@ -2425,7 +2425,7 @@ emoticons coming from different providers.") (define-public kglobalaccel (package (name "kglobalaccel") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2434,7 +2434,7 @@ emoticons coming from different providers.") name "-" version ".tar.xz")) (sha256 (base32 - "0nlza73i0qd79yhwhpnvgbh2xa9lvd1n2xg25p3bvfzwidcfdxg6")))) + "1fk7wazfwr7smqiym3phm5yvw6cmiczag52y1vad8fgb3izd6zhl")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2469,7 +2469,7 @@ window does not need focus for them to be activated.") (define-public kiconthemes (package (name "kiconthemes") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2478,7 +2478,7 @@ window does not need focus for them to be activated.") name "-" version ".tar.xz")) (sha256 (base32 - "1nbxxpf8bv835xl35b17rk8s3zs110bh31078kqqh7dhvwzlxic7")))) + "1f7pk6smi2f0mm7jkrw5ymmkhd9gi8vnmppyblp1v3pvmy571c2m")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2516,7 +2516,7 @@ in applications using the KDE Frameworks.") (define-public kinit (package (name "kinit") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2525,7 +2525,7 @@ in applications using the KDE Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "05vpac41pw1n8y58l2z08vyknzv950x8dxxw66dnymm2v31w07ia")))) + "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) @@ -2563,7 +2563,7 @@ makes starting KDE applications faster and reduces memory consumption.") (define-public kio (package (name "kio") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2572,7 +2572,7 @@ makes starting KDE applications faster and reduces memory consumption.") name "-" version ".tar.xz")) (sha256 (base32 - "1526a89x11ank55dp3rfp7xd04w8x7prjg3y6i7n2q9nabwhw7gc")))) + "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k")))) (build-system cmake-build-system) (propagated-inputs `(("kbookmarks" ,kbookmarks) @@ -2655,7 +2655,7 @@ KIO enabled infrastructure.") (define-public knewstuff (package (name "knewstuff") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2664,7 +2664,7 @@ KIO enabled infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "0i2gmyp67xzf2m5wnv7v574q3gsp1yxfflv1jgl0wy57vchwn9g6")))) + "1vhcl2z9rcqg8390l1cwn3yyi1n17pn6mn8fsplp25qhzimb8bmk")))) (build-system cmake-build-system) (propagated-inputs `(("attica" ,attica) @@ -2712,7 +2712,7 @@ specification.") (define-public knotifyconfig (package (name "knotifyconfig") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2721,7 +2721,7 @@ specification.") name "-" version ".tar.xz")) (sha256 (base32 - "1h07bjj71611v6912m5ajli6qszh9w925zqbk3vih8rn6pd2s3mc")))) + "09v4aq5x98sqg2awhw0n0y0rnjkr77kbf51xij0fiykd4llp9lfa")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2754,7 +2754,7 @@ notifications which can be embedded in your application.") (define-public kparts (package (name "kparts") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2763,7 +2763,7 @@ notifications which can be embedded in your application.") name "-" version ".tar.xz")) (sha256 (base32 - "1mb5gp2ckmmrb4ym7cqvyl81wnp7cryk85gmizl7cnn69svlf40h")))) + "0zdz0byj0gsbgb007y8x37w8yf1gkw6dsp2s9bbdc4w6h9ipdj2k")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio) @@ -2807,7 +2807,7 @@ widgets with a user-interface defined in terms of actions.") (define-public kpeople (package (name "kpeople") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2816,7 +2816,7 @@ widgets with a user-interface defined in terms of actions.") name "-" version ".tar.xz")) (sha256 (base32 - "050km3rpx58acx2341si46lxc2hywa59m8rwd849c2dnsxw3w1hm")))) + "0i5pd1d2jphsvpc3dpdw28dsdal1qrnnrx3k6qx4wax3f8ph5khv")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -2850,7 +2850,7 @@ to easily extend the contacts collection.") (define-public krunner (package (name "krunner") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2859,7 +2859,7 @@ to easily extend the contacts collection.") name "-" version ".tar.xz")) (sha256 (base32 - "0xh9kss67l09am1ilsr9zyx1yhlmaq3g9x60hw0sx7h7wrl6zsw6")))) + "02l5gch9hpag1q5ixnb541g7m9lx25pbggldpa8zykp63apyca19")))) (build-system cmake-build-system) (propagated-inputs `(("plasma-framework" ,plasma-framework))) @@ -2919,7 +2919,7 @@ typed.") (define-public kservice (package (name "kservice") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2928,7 +2928,7 @@ typed.") name "-" version ".tar.xz")) (sha256 (base32 - "0z8zfpd00ndvkm1klp8l4mrcksshhyg280zgmg3gffz5rgh3gwri")))) + "1wwb6c6m8f3b16p47adkc05rrlszvvym7ckks5xp08s58pk1dm8z")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -2964,7 +2964,7 @@ types or handled by application specific code.") (define-public ktexteditor (package (name "ktexteditor") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -2973,7 +2973,7 @@ types or handled by application specific code.") name "-" version ".tar.xz")) (sha256 (base32 - "020y3j6vm15sfpiwainr3qsx9i93j15mrvq523wmbmdj1z36yrh2")))) + "14iss8svx49vav0h2kg8vhv8g5hg4ky30s7049csfwz7xhp7jmcj")))) (build-system cmake-build-system) (propagated-inputs `(("kparts" ,kparts))) @@ -3044,7 +3044,7 @@ library.") (define-public ktextwidgets (package (name "ktextwidgets") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -3053,7 +3053,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "088azbv95ycwxmxxw4l63i2l14fmn8l473pb4djh2mvz1ypfqayk")))) + "14gclshmpwmfwkp2hzlnf823pjjmknd9q0gdclsh3yy268c2rsw1")))) (build-system cmake-build-system) (propagated-inputs `(("ki18n" ,ki18n) @@ -3091,7 +3091,7 @@ It supports rich text as well as plain text.") (define-public kwallet (package (name "kwallet") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -3100,7 +3100,7 @@ It supports rich text as well as plain text.") name "-" version ".tar.xz")) (sha256 (base32 - "1kv3v7593srfn0wd7qp4rhvb30rxp7d2qmlwi0n4nc9s6v59pabn")))) + "13bmks9jb3yhp6clv25qkqkrvbhfyk9z16laxsv79jdd82lxgn1z")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) @@ -3133,7 +3133,7 @@ the passwords on KDE work spaces.") (define-public kxmlgui (package (name "kxmlgui") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -3142,7 +3142,7 @@ the passwords on KDE work spaces.") name "-" version ".tar.xz")) (sha256 (base32 - "0kfxjx8wrhkys5bydnv84nqxc2jqvv92zb2l6zpi0km5ggmia5y0")))) + "0wsgs5ya3wnc5cryi1r9i30sq8dnnhh15p02skdjlhwjfvdhxmfa")))) (build-system cmake-build-system) (propagated-inputs `(("kconfig" ,kconfig) @@ -3185,7 +3185,7 @@ descriptions for integrating actions from plugins.") (define-public kxmlrpcclient (package (name "kxmlrpcclient") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -3194,7 +3194,7 @@ descriptions for integrating actions from plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "0ciip27ilsfk9s3gslpbi06v8i6ipdbmcig2jf43z3amsxpq0ncn")))) + "0l4jnvn7s77jkvd2z44mz24mfzcw499plms79j21pjryc88drh06")))) (build-system cmake-build-system) (propagated-inputs `(("kio" ,kio))) @@ -3228,7 +3228,7 @@ setUrl, setUserAgent and call.") (define-public plasma-framework (package (name "plasma-framework") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -3237,7 +3237,7 @@ setUrl, setUserAgent and call.") name "-" version ".tar.xz")) (sha256 (base32 - "079c8h0lmbkfr3srj5m8a40b50kyrxbgmy1n66329l8js9xrvaah")))) + "1yrccbkdpnfbgn7fzpmzzxm5c7fhkv1vqygq1f96r30fia0cj5jv")))) (build-system cmake-build-system) (propagated-inputs `(("kpackage" ,kpackage) @@ -3324,7 +3324,7 @@ script engines.") (define-public kde-frameworkintegration (package (name "kde-frameworkintegration") - (version "5.42.0") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append @@ -3333,7 +3333,7 @@ script engines.") "frameworkintegration-" version ".tar.xz")) (sha256 (base32 - "17fyny3c5chv7bipr19ayfjmd1amp2nms4ba5r7mwjp97xkphry7")))) + "1ni4jrny630zf3zwmqbm8z7dqgiar58992lylfv7kspdg5crcgfx")))) (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- cgit v1.2.3 From d84a887a5f5313fda6bebc13153435b1154d24de Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Aug 2018 01:22:38 -0400 Subject: gnu: libksysguard: Update to 5.13.4. * gnu/packages/kde.scm (libksysguard): Update to 5.13.4. --- gnu/packages/kde.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 1d14e4b820..8c932f2eeb 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -418,7 +418,7 @@ used in KDE development tools Kompare and KDevelop.") (define-public libksysguard (package (name "libksysguard") - (version "5.11.5") + (version "5.13.4") (source (origin (method url-fetch) @@ -426,7 +426,7 @@ used in KDE development tools Kompare and KDevelop.") "/libksysguard-" version ".tar.xz")) (sha256 (base32 - "0f2py4zkqzpxxf3mqaij0q8ka0v3nschj17dv6rbzzmr5mjv825f")))) + "0k8q5bxk9zyv7c3nny1c399v8acqs618nw39q20pj2qdijl9ibvh")))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config))) @@ -468,7 +468,7 @@ used in KDE development tools Kompare and KDevelop.") (lambda _ ;; TODO: Fix this failing test-case (zero? (system* "ctest" "-E" "processtest"))))))) - (home-page "https://www.kde.org/info/plasma-5.11.5.php") + (home-page "https://www.kde.org/info/plasma-5.13.4.php") (synopsis "Network enabled task and system monitoring") (description "KSysGuard can obtain information on system load and manage running processes. It obtains this information by interacting -- cgit v1.2.3 From 7ce9eaf0132ab00b7adf26953eb193f152ee7f2f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Aug 2018 01:07:55 -0400 Subject: gnu: Krita: Update to 4.1.1. * gnu/packages/kde.scm (krita): Update to 4.1.1. --- gnu/packages/kde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 8c932f2eeb..0f2ede7f83 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -236,7 +236,7 @@ plugins, as well as code to create plugins, or complete applications.") (define-public krita (package (name "krita") - (version "4.0.1") + (version "4.1.1") (source (origin (method url-fetch) (uri (string-append @@ -245,7 +245,7 @@ plugins, as well as code to create plugins, or complete applications.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "0k55ybvna40dx4fqygnix7bnhjaanak3ckb108hny2k7sspy62pc")))) + "1qz9bjvnwa5gc2b0063i2p72jq6y1b6kgqdj39599acp7ws11asw")))) (build-system cmake-build-system) (arguments `(#:tests? #f -- cgit v1.2.3 From fd67d793c27f4f675708862df59336cb1133ade1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Aug 2018 01:02:59 -0400 Subject: gnu: Krita: Build with libraw 0.18. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Björn Höfling . * gnu/packages/photo.scm (libraw-0.18): New variable. * gnu/packages/kde.scm (krita)[inputs]: Use libraw-0.18. --- gnu/packages/kde.scm | 2 +- gnu/packages/photo.scm | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 0f2ede7f83..7b157853d3 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -316,7 +316,7 @@ plugins, as well as code to create plugins, or complete applications.") ("fftw" ,fftw) ("gsl" ,gsl) ("poppler-qt5" ,poppler-qt5) - ("libraw" ,libraw) + ("libraw" ,libraw-0.18) ("libtiff" ,libtiff) ("perl" ,perl) ("ilmbase" ,ilmbase) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 3fd3d0854b..7bdf04cb49 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -95,6 +95,18 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).") ;; both two licensing modes for your changes/additions." (license (list license:lgpl2.1 license:cddl1.0)))) +(define-public libraw-0.18 + (package (inherit libraw) + (name "libraw") + (version "0.18.12") + (source (origin + (method url-fetch) + (uri (string-append "https://www.libraw.org/data/LibRaw-" + version ".tar.gz")) + (sha256 + (base32 + "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap")))))) + (define-public libexif (package (name "libexif") -- cgit v1.2.3 From ea59f0487b5b441e249e95ec93a2d39b5a413c2c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 28 Aug 2018 02:56:05 -0400 Subject: gnu: Remove Krita 3. Krita 3 fails to build with Qt 5.11.1. Since it's also unmaintained upstream, remove it. * gnu/packages/kde.scm (krita-3): Remove variable. --- gnu/packages/kde.scm | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 7b157853d3..aa5be6b515 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -329,23 +329,6 @@ illustrators, matte and texture artists, and the VFX industry. Notable features include brush stabilizers, brush engines and wrap-around mode.") (license license:gpl2+))) -;; Krita 3 and 4's file formats are incompatible, so we are keeping Krita 3 -;; for now. -(define-public krita-3 - (package - (inherit krita) - (name "krita") - (version "3.3.3") - (source (origin - (inherit (package-source krita)) - (uri (string-append - "mirror://kde/stable/krita/" - (version-prefix version 3) - "/" name "-" version ".tar.gz")) - (sha256 - (base32 - "0pc6hnakkqy81x5b5ncivaps6hqv43i50sjwgi3i3cz9j8rlxh5y")))))) - (define-public kholidays (package (name "kholidays") -- cgit v1.2.3 From a446cf26d7f386a81b8667f5ec75fb5f6232d202 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Aug 2018 17:05:24 +0200 Subject: gnu: texinfo@5: Fix FTBFS with Perl >= 5.28. * gnu/packages/patches/texinfo-5-perl-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/texinfo.scm (texinfo-5)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/patches/texinfo-5-perl-compat.patch | 19 +++++++++++++++++++ gnu/packages/texinfo.scm | 1 + 3 files changed, 21 insertions(+) create mode 100644 gnu/packages/patches/texinfo-5-perl-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 76d6f69090..3309186d12 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1158,6 +1158,7 @@ dist_patch_DATA = \ %D%/packages/patches/teensy-loader-cli-help.patch \ %D%/packages/patches/teeworlds-use-latest-wavpack.patch \ %D%/packages/patches/texinfo-perl-compat.patch \ + %D%/packages/patches/texinfo-5-perl-compat.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/patches/texinfo-5-perl-compat.patch b/gnu/packages/patches/texinfo-5-perl-compat.patch new file mode 100644 index 0000000000..f16d6b4da8 --- /dev/null +++ b/gnu/packages/patches/texinfo-5-perl-compat.patch @@ -0,0 +1,19 @@ +Fix a deprecation warning with newer Perl that breaks some tests. + +--- a/tp/Texinfo/Parser.pm ++++ b/tp/Texinfo/Parser.pm +@@ -5438,12 +5438,12 @@ + } + } elsif ($command eq 'clickstyle') { + # REMACRO +- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { ++ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*/) { + $args = ['@'.$1]; + $self->{'clickstyle'} = $1 + unless(_ignore_global_commands($self)); + $remaining = $line; +- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; ++ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{})?\s*(\@(c|comment)((\@|\s+).*)?)?//; + $has_comment = 1 if (defined($4)); + } else { + $self->line_error (sprintf($self->__( diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 5fe7f1ec9c..fa98bd56b8 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -69,6 +69,7 @@ is on expressing the content semantically, avoiding physical markup commands.") (method url-fetch) (uri (string-append "mirror://gnu/texinfo/texinfo-" version ".tar.xz")) + (patches (search-patches "texinfo-5-perl-compat.patch")) (sha256 (base32 "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal")))) -- cgit v1.2.3 From 3469a5ea47ba7481bda9b2ff144bc13efd943c87 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Aug 2018 17:40:40 +0200 Subject: gnu: gcc@4.9: Fix FTBFS with Glibc >= 2.28. * gnu/packages/commencement.scm (gcc-for-libstdc++): New variable. (libstdc++-boot0): Inherit from GCC-FOR-LIBSTDC++ instead of GCC-4.9. * gnu/packages/gcc.scm (gcc-4.9)[source](patches): Add "gcc-4.9-libsanitizer-ustat.patch". * gnu/packages/patches/gcc-4.9-libsanitizer-ustat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/commencement.scm | 15 ++++++++- gnu/packages/gcc.scm | 1 + .../patches/gcc-4.9-libsanitizer-ustat.patch | 37 ++++++++++++++++++++++ 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gcc-4.9-libsanitizer-ustat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3309186d12..29c605006c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -700,6 +700,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-fix-texi2pod.patch \ %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \ %D%/packages/patches/gcc-4.9-libsanitizer-fix.patch \ + %D%/packages/patches/gcc-4.9-libsanitizer-ustat.patch \ %D%/packages/patches/gcc-libsanitizer-fix.patch \ %D%/packages/patches/gcc-libsanitizer-ustat.patch \ %D%/packages/patches/gcc-libvtv-runpath.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 30a0ffcec9..0aa65fe638 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -186,12 +186,25 @@ ,cf))))) (inputs %boot0-inputs)))) +;; Use a "fixed" package source for this early libstdc++ variant so we can +;; update GCC 4.9 without triggering a full rebuild. +(define gcc-for-libstdc++ + (package + (inherit gcc-4.9) + (source (origin + (inherit (package-source gcc-4.9)) + (patches (search-patches "gcc-4.9-libsanitizer-fix.patch" + "gcc-arm-bug-71399.patch" + "gcc-asan-missing-include.patch" + "gcc-libvtv-runpath.patch" + "gcc-fix-texi2pod.patch")))))) + (define libstdc++-boot0 ;; GCC's libcc1 is always built as a shared library (the top-level ;; 'Makefile.def' forcefully adds --enable-shared) and thus needs to refer ;; to libstdc++.so. We cannot build libstdc++-5.3 because it relies on ;; C++14 features missing in some of our bootstrap compilers. - (let ((lib (package-with-bootstrap-guile (make-libstdc++ gcc-4.9)))) + (let ((lib (package-with-bootstrap-guile (make-libstdc++ gcc-for-libstdc++)))) (package (inherit lib) (name "libstdc++-boot0") diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index e5b1433f92..520f5cba0b 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -398,6 +398,7 @@ Go. It also includes runtime support libraries for these languages.") (base32 "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc")) (patches (search-patches "gcc-4.9-libsanitizer-fix.patch" + "gcc-4.9-libsanitizer-ustat.patch" "gcc-arm-bug-71399.patch" "gcc-asan-missing-include.patch" "gcc-libvtv-runpath.patch" diff --git a/gnu/packages/patches/gcc-4.9-libsanitizer-ustat.patch b/gnu/packages/patches/gcc-4.9-libsanitizer-ustat.patch new file mode 100644 index 0000000000..795881ab9b --- /dev/null +++ b/gnu/packages/patches/gcc-4.9-libsanitizer-ustat.patch @@ -0,0 +1,37 @@ +Remove use of deprecated ustat interface in glibc 2.28: +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85835 + +Adapted to GCC 4 series from this upstream patch: +https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=260684 + +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -81,7 +81,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -163,7 +162,19 @@ + unsigned struct_old_utsname_sz = sizeof(struct old_utsname); + unsigned struct_oldold_utsname_sz = sizeof(struct oldold_utsname); + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); +- unsigned struct_ustat_sz = sizeof(struct ustat); ++ // Use pre-computed size of struct ustat to avoid which ++ // has been removed from glibc 2.28. ++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ ++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ ++ || defined(__x86_64__) ++#define SIZEOF_STRUCT_USTAT 32 ++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ ++ || defined(__powerpc__) || defined(__s390__) ++#define SIZEOF_STRUCT_USTAT 20 ++#else ++#error Unknown size of struct ustat ++#endif ++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID -- cgit v1.2.3 From 53b7c9716e59555477ed39c066463f1bb4e0e03b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 11:02:07 +0200 Subject: gnu: python-waf: Update to 2.0.10. * gnu/packages/python.scm (python-waf): Update to 2.0.10. --- 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 dd33ba8e0c..36c5b0ea93 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5406,14 +5406,14 @@ so it might be a tiny bit slower.") (define-public python-waf (package (name "python-waf") - (version "1.9.8") + (version "2.0.10") (source (origin (method url-fetch) (uri (string-append "https://waf.io/" "waf-" version ".tar.bz2")) (sha256 (base32 - "0wl4cnmp06lfxqjxaan58bqxn27smhydz0sg5prrfbl3bsw4gv6q")))) + "1v832jljl5wwqyimz40zgksf5ws1w3d2niz3qxamyp5dnyvzjl35")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 279ed3efee9c71116d368163f805fe9494518687 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 12:48:08 +0200 Subject: gnu: qtbase: Fix build with glibc >= 2.28. * gnu/packages/patches/qtbase-glibc-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/qt.scm (qtbase)[source](patches): Use it. [arguments]: Remove "--no-feature-renameat2" from #:configure-flags. --- gnu/local.mk | 1 + gnu/packages/patches/qtbase-glibc-compat.patch | 50 ++++++++++++++++++++++++++ gnu/packages/qt.scm | 4 +-- 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/qtbase-glibc-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 29c605006c..806a5f3c2a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1097,6 +1097,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qt4-ldflags.patch \ + %D%/packages/patches/qtbase-glibc-compat.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ diff --git a/gnu/packages/patches/qtbase-glibc-compat.patch b/gnu/packages/patches/qtbase-glibc-compat.patch new file mode 100644 index 0000000000..15a2540b3a --- /dev/null +++ b/gnu/packages/patches/qtbase-glibc-compat.patch @@ -0,0 +1,50 @@ +Fix qmake build with glibc 2.28. + +Taken from upstream: +https://code.qt.io/cgit/qt/qtbase.git/commit/?id=25feee4e061b99edab79503d81f5bd045c6c8e3d + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index 3469ebe5e6..c5585ea32a 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -98,10 +98,18 @@ + #define QT_NO_QOBJECT + #define QT_FEATURE_process -1 + #define QT_FEATURE_regularexpression -1 +-#define QT_FEATURE_renameat2 -1 ++#ifdef __GLIBC_PREREQ ++# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++#else ++# define QT_FEATURE_renameat2 -1 ++#endif + #define QT_FEATURE_sharedmemory -1 + #define QT_FEATURE_slog2 -1 +-#define QT_FEATURE_statx -1 ++#ifdef __GLIBC_PREREQ ++# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++#else ++# define QT_FEATURE_statx -1 ++#endif + #define QT_FEATURE_syslog -1 + #define QT_NO_SYSTEMLOCALE + #define QT_FEATURE_systemsemaphore -1 +diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp +index 0c9cdb8667..deb4a9f220 100644 +--- a/src/corelib/io/qfilesystemengine_unix.cpp ++++ b/src/corelib/io/qfilesystemengine_unix.cpp +@@ -91,7 +91,6 @@ extern "C" NSString *NSTemporaryDirectory(); + # include + # include + # include +-# include + + // in case linux/fs.h is too old and doesn't define it: + #ifndef FICLONE +@@ -112,6 +111,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp + # endif + + # if !QT_CONFIG(statx) && defined(SYS_statx) ++# include + static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf) + { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); } + # elif !QT_CONFIG(statx) && !defined(SYS_statx) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f6eb2831fd..affba14e98 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -494,7 +494,8 @@ system, and the core design of Django is reused in Grantlee.") (base32 "0ipv18ypbgpxhh49rfplqmflskmnhhwj1bjr5hrwi0jpvar4gl50")) ;; Use TZDIR to avoid depending on package "tzdata". - (patches (search-patches "qtbase-use-TZDIR.patch")) + (patches (search-patches "qtbase-use-TZDIR.patch" + "qtbase-glibc-compat.patch")) (modules '((guix build utils))) (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 @@ -608,7 +609,6 @@ system, and the core design of Django is reused in Grantlee.") ;; kernels that the glibc supports, including the RHEL6 ;; (2.6.32) and RHEL7 (3.10) kernels. "-no-feature-getentropy" ; requires Linux 3.17 - "-no-feature-renameat2" ; requires Linux 3.16 ;; Do not build examples; if desired, these could go ;; into a separate output, but for the time being, we -- cgit v1.2.3 From 7ea90c217fe6343b435434e409451eb0bd6fb6eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 13:23:39 +0200 Subject: gnu: nspr: Update to 4.20. * gnu/packages/gnuzilla.scm (nspr): Update to 4.20. --- gnu/packages/gnuzilla.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b6bf89a75b..a543e040ff 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -323,7 +323,7 @@ in C/C++.") (define-public nspr (package (name "nspr") - (version "4.19") + (version "4.20") (source (origin (method url-fetch) (uri (string-append @@ -331,7 +331,7 @@ in C/C++.") version "/src/nspr-" version ".tar.gz")) (sha256 (base32 - "0agpv3f17h8kmzi0ifibaaxc1k3xc0q61wqw3l6r2xr2z8bmkn9f")))) + "0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit v1.2.3 From e59588482b2d0db4511571ba8971839251e24ec0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 13:26:13 +0200 Subject: gnu: nss, nss-certs: Update to 3.39 [fixes CVE-2018-12384]. * gnu/packages/gnuzilla.scm (nss): Update to 3.39. * gnu/packages/certs.scm (nss-certs): Likewise. --- gnu/packages/certs.scm | 4 ++-- gnu/packages/gnuzilla.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index cb05fb83fc..6af6877423 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -76,7 +76,7 @@ (define-public nss-certs (package (name "nss-certs") - (version "3.38") + (version "3.39") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -87,7 +87,7 @@ "nss-" version ".tar.gz"))) (sha256 (base32 - "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c")))) + "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb")))) (build-system gnu-build-system) (outputs '("out")) (native-inputs diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a543e040ff..77a74a0ec4 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -359,7 +359,7 @@ in the Mozilla clients.") (define-public nss (package (name "nss") - (version "3.38") + (version "3.39") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -370,7 +370,7 @@ in the Mozilla clients.") "nss-" version ".tar.gz"))) (sha256 (base32 - "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c")) + "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-pkgconfig.patch" "nss-increase-test-timeout.patch")))) -- cgit v1.2.3 From ead46692ec8a17ed9cf668131343d7cf1b3725e5 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Fri, 31 Aug 2018 05:50:33 +0300 Subject: gnu: Add zabbix-agentd and zabbix-server. * gnu/packages/monitoring.scm (zabbix-agentd, zabbix-server): New variables. --- gnu/packages/monitoring.scm | 85 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 2 deletions(-) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index fae62d5493..a59e51a5e3 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -3,7 +3,8 @@ ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Gábor Boskovits +;;; Copyright © 2018 Gábor Boskovits w +;;; Copyright © 2018 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,18 +30,25 @@ #:use-module (guix build-system python) #:use-module (guix build-system gnu) #:use-module (guix build-system go) + #:use-module (guix utils) #:use-module (gnu packages admin) #:use-module (gnu packages base) + #:use-module (gnu packages curl) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages databases) #:use-module (gnu packages django) #:use-module (gnu packages gd) #:use-module (gnu packages image) #:use-module (gnu packages mail) + #:use-module (gnu packages networking) + #:use-module (gnu packages libevent) + #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages python) #:use-module (gnu packages python-web) - #:use-module (gnu packages time)) + #:use-module (gnu packages time) + #:use-module (gnu packages tls)) (define-public nagios (package @@ -138,6 +146,79 @@ etc. via a Web interface. Features include: @end itemize\n") (license license:gpl2))) +(define-public zabbix-agentd + (package + (name "zabbix-agentd") + (version "3.4.11") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/" version + "/zabbix-" version ".tar.gz")) + (sha256 + (base32 + "0qxgf6hx7ibhjmxd2sxizkjc8df4c9d31wz5hhql409ws98qf173")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--enable-agent" + (string-append "--with-iconv=" + (assoc-ref %build-inputs "libiconv")) + (string-append "--with-libpcre=" + (assoc-ref %build-inputs "pcre"))))) + (inputs + `(("libiconv" ,libiconv) + ("pcre" ,pcre))) + (home-page "https://www.zabbix.com/") + (synopsis "Distributed monitoring solution (client-side agent)") + (description "This package provides a distributed monitoring +solution (client-side agent)") + (license license:gpl2))) + +(define-public zabbix-server + (package + (inherit zabbix-agentd) + (name "zabbix-server") + (arguments + (substitute-keyword-arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-frontend + (lambda* (#:key outputs #:allow-other-keys) + (let* ((php (string-append (assoc-ref outputs "out") + "/share/zabbix/php")) + (front-end-conf (string-append php "/conf")) + (etc (string-append php "/etc"))) + (mkdir-p php) + (copy-recursively "./frontends/php" php) + (rename-file front-end-conf + (string-append front-end-conf "-example")) + (symlink "/etc/zabbix" front-end-conf))))) + ,@(package-arguments zabbix-agentd)) + ((#:configure-flags flags) + `(cons* "--enable-server" + "--with-postgresql" + (string-append "--with-libevent=" + (assoc-ref %build-inputs "libevent")) + "--with-net-snmp" + (string-append "--with-gnutls=" + (assoc-ref %build-inputs "gnutls")) + "--with-libcurl" + ,flags)))) + (inputs + `(("curl" ,curl) + ("libevent" ,libevent) + ("gnutls" ,gnutls) + ("postgresql" ,postgresql) + ("zlib" ,zlib) + ("net-snmp" ,net-snmp) + ("curl" ,curl) + ,@(package-inputs zabbix-agentd))) + (synopsis "Distributed monitoring solution (server-side)") + (description "This package provides a distributed monitoring +solution (server-side)"))) + (define-public darkstat (package (name "darkstat") -- cgit v1.2.3 From 352b5d7e746674b1dd4b8a30b05ef8ac567afa14 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 11:49:51 +0200 Subject: gnu: Add ruby-concurrent. * gnu/packages/ruby.scm (ruby-concurrent): 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 908dfd5751..e0a76fed2c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -193,6 +193,25 @@ a focus on simplicity and productivity.") (("/bin/sh") (which "sh"))) #t))))))) +(define-public ruby-concurrent + (package + (name "ruby-concurrent") + (version "1.0.5") + (source (origin + (method url-fetch) + (uri (rubygems-uri "concurrent-ruby" version)) + (sha256 + (base32 + "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); No rakefile + (home-page "https://github.com/ruby-concurrency/concurrent-ruby") + (synopsis "Concurrency tools for Ruby") + (description "This gem provides concurrency tools for Ruby. It provides +a library of common thread-safe types and data-structures as well as abstractions +for concurrency and communication between threads.") + (license license:expat))) + (define-public ruby-highline (package (name "ruby-highline") -- cgit v1.2.3 From cbb50182adc4e5252e4f1bf9010c09ada94f7ae1 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 11:51:17 +0200 Subject: gnu: ruby-i18n: Update to 1.1.0. * gnu/packages/ruby.scm (ruby-i18n): Update to 1.1.0. --- gnu/packages/ruby.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e0a76fed2c..ef6cc24f7f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -281,16 +281,17 @@ packaging native C and Java extensions in Ruby.") (define-public ruby-i18n (package (name "ruby-i18n") - (version "0.7.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (rubygems-uri "i18n" version)) (sha256 (base32 - "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758")))) + "0ppvmla21hssvrfm8g1n2fnb4lxn4yhy9qmmba0imanflgldrjmr")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; no tests + (propagated-inputs `(("concurrent-ruby" ,ruby-concurrent))) (synopsis "Internationalization library for Ruby") (description "Ruby i18n is an internationalization and localization solution for Ruby programs. It features translation and localization, -- cgit v1.2.3 From ef381322d57e07153aad7c93e8c5b6a9ec5525fc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 12:20:53 +0200 Subject: gnu: ruby-activesupport: Update to 5.2.1. * gnu/packages/ruby.scm (ruby-activesupport): Update to 5.2.1. --- 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 ef6cc24f7f..3ead6d710b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3036,14 +3036,14 @@ you about the changes.") (define-public ruby-activesupport (package (name "ruby-activesupport") - (version "5.1.4") + (version "5.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "activesupport" version)) (sha256 (base32 - "0sgf4rsfr7jcaqsx0wwzx4l4k9xsjlwv0mzl08pxiyp1qzyx8scr")))) + "0ziy6xk31k4fs115cdkba1ys4i8nzcyri7a2jig7nx7k5h7li6l2")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit v1.2.3 From afb7a3e8d56f34b60c99f5d636a7ce152667fc80 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 12:38:32 +0200 Subject: gnu: ruby-ttfunk: Update to 1.5.1. * gnu/packages/ruby.scm (ruby-ttfunk): Update to 1.5.1. --- gnu/packages/ruby.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3ead6d710b..5bbd81f261 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4678,7 +4678,7 @@ binary-to-text encoding. The main modern use of Ascii85 is in PostScript and (define-public ruby-ttfunk (package (name "ruby-ttfunk") - (version "1.4.0") + (version "1.5.1") (source (origin (method url-fetch) @@ -4689,12 +4689,18 @@ binary-to-text encoding. The main modern use of Ascii85 is in PostScript and (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1izq84pnm9niyvkzp8k0vl232q9zj41hwmp9na9fzycfh1pbnsl6")))) + "1ymcn12n5iws401yz03zsj8rr653fdqq13czsrciq09phgh9jzc5")))) (build-system ruby-build-system) (arguments `(#:test-target "spec" #:phases (modify-phases %standard-phases + (add-before 'build 'remove-ssh + (lambda _ + ;; remove dependency on an ssh key pair that doesn't exist + (substitute* "ttfunk.gemspec" + (("spec.signing_key.*") "")) + #t)) (add-before 'check 'remove-rubocop (lambda _ ;; remove rubocop as a dependency as not needed for testing @@ -4702,10 +4708,11 @@ binary-to-text encoding. The main modern use of Ascii85 is in PostScript and (("spec.add_development_dependency\\('rubocop'.*") "")) (substitute* "Rakefile" (("require 'rubocop/rake_task'") "") - (("Rubocop::RakeTask.new") "")) + (("RuboCop::RakeTask.new") "")) #t))))) (native-inputs `(("ruby-rspec" ,ruby-rspec) + ("ruby-yard" ,ruby-yard) ("bundler" ,bundler))) (synopsis "Font metrics parser for the Prawn PDF generator") (description -- cgit v1.2.3 From 0d16905b60bd4dab70dfafdb0a8d6fd29a304c44 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 12:39:15 +0200 Subject: gnu: Add ruby-public-suffix. * gnu/packages/ruby.scm (ruby-public-suffix): New variable. --- gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5bbd81f261..367832d277 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5097,3 +5097,27 @@ programs running in the background, in Ruby.") (sha256 (base32 "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p")))))) + +(define-public ruby-public-suffix + (package + (name "ruby-public-suffix") + (version "3.0.3") + (source (origin + (method url-fetch) + (uri (rubygems-uri "public_suffix" version)) + (sha256 + (base32 + "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l")))) + (build-system ruby-build-system) + (arguments + ;; Tests require network + `(#:tests? #f)) + (home-page "https://simonecarletti.com/code/publicsuffix-ruby/") + (synopsis "Domain name parser") + (description "The gem @code{public_suffix} is a domain name parser, +written in Ruby, and based on the @dfn{Public Suffix List}. A public suffix +is one under which Internet users can (or historically could) directly +register names. Some examples of public suffixes are @code{.com}, +@code{.co.uk} and @code{pvt.k12.ma.us}. The Public Suffix List is a list of +all known public suffixes.") + (license license:expat))) -- cgit v1.2.3 From 6f2c4efb56520f8f63ee7f15f694f5582b4d04c4 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 12:40:12 +0200 Subject: gnu: Add ruby-addressable. * gnu/package/ruby.scm (ruby-addressable): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 367832d277..862193f305 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5121,3 +5121,26 @@ register names. Some examples of public suffixes are @code{.com}, @code{.co.uk} and @code{pvt.k12.ma.us}. The Public Suffix List is a list of all known public suffixes.") (license license:expat))) + +(define-public ruby-addressable + (package + (name "ruby-addressable") + (version "2.5.2") + (source (origin + (method url-fetch) + (uri (rubygems-uri "addressable" version)) + (sha256 + (base32 + "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-public-suffix" ,ruby-public-suffix))) + (arguments + ;; No test target + `(#:tests? #f)) + (home-page "https://github.com/sporkmonger/addressable") + (synopsis "Alternative URI implementation") + (description "Addressable is a replacement for the URI implementation that +is part of Ruby's standard library. It more closely conforms to RFC 3986, +RFC 3987, and RFC 6570 (level 4), providing support for IRIs and URI templates.") + (license license:asl2.0))) -- cgit v1.2.3 From 9c7f15c048636fcba8f64f6e257482a01396ae6f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:08:32 +0200 Subject: gnu: Add ruby-colorator. * gnu/packages/ruby.scm (ruby-colorator): New variable. --- gnu/packages/ruby.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 862193f305..90af1481c9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5144,3 +5144,23 @@ all known public suffixes.") is part of Ruby's standard library. It more closely conforms to RFC 3986, RFC 3987, and RFC 6570 (level 4), providing support for IRIs and URI templates.") (license license:asl2.0))) + +(define-public ruby-colorator + (package + (name "ruby-colorator") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "colorator" version)) + (sha256 + (base32 + "0f7wvpam948cglrciyqd798gdc6z3cfijciavd0dfixgaypmvy72")))) + (build-system ruby-build-system) + (arguments + ;; No test target + `(#:tests? #f)) + (home-page "http://octopress.org/colorator/") + (synopsis "Terminal color library") + (description "Colorator is a Ruby gem that helps you colorize your text +for the terminal.") + (license license:expat))) -- cgit v1.2.3 From 78b9c291f6d656e2912f59b9eaf8dfaca925ea94 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:10:06 +0200 Subject: gnu: Add ruby-command-line-reporter. * gnu/packages/ruby.scm (ruby-command-line-reporter): New variable. --- gnu/packages/ruby.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 90af1481c9..7dab7b834f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5164,3 +5164,36 @@ RFC 3987, and RFC 6570 (level 4), providing support for IRIs and URI templates." (description "Colorator is a Ruby gem that helps you colorize your text for the terminal.") (license license:expat))) + +(define-public ruby-command-line-reporter + (package + (name "ruby-command-line-reporter") + (version "4.0.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "command_line_reporter" version)) + (sha256 + (base32 + "1qma35xrb772whxwy1rs9bicb9d6lvz0s2dd2dnn4fr6zcbcxc0a")))) + (build-system ruby-build-system) + (arguments + ;; No Rakefile + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-dependencies + (lambda _ + (substitute* ".gemspec" + ;; colored is unmaintained + (("colored") "colorator") + ;; colorator version + (("= 1.2") "= 1.1")) + #t))))) + (propagated-inputs `(("ruby-colorator" ,ruby-colorator))) + (home-page "https://github.com/wbailey/command_line_reporter") + (synopsis "Report production while executing Ruby scripts") + (description "This gem provides a DSL that makes it easy to write reports +of various types in ruby. It eliminates the need to litter your source with +puts statements, instead providing a more readable, expressive interface to +your application.") + (license license:asl2.0))) -- cgit v1.2.3 From f22c038799a9c83816ce6e19bf2220d4022ba642 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:41:18 +0200 Subject: gnu: Add ruby-command-line-reporter-3. * gnu/packages/ruby.scm (ruby-command-line-reporter-3): New variable. --- gnu/packages/ruby.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7dab7b834f..8321dda4cc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5197,3 +5197,14 @@ of various types in ruby. It eliminates the need to litter your source with puts statements, instead providing a more readable, expressive interface to your application.") (license license:asl2.0))) + +(define-public ruby-command-line-reporter-3 + (package + (inherit ruby-command-line-reporter) + (version "3.3.6") + (source (origin + (method url-fetch) + (uri (rubygems-uri "command_line_reporter" version)) + (sha256 + (base32 + "1h39zqqxp3k4qk49ajpx0jps1vmvxgkh43mqkb6znk583bl0fv71")))))) -- cgit v1.2.3 From 6bba8ecf7b9a087d405d30373bd18a5e524f4918 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:42:29 +0200 Subject: gnu: Add ruby-rdoc. * gnu/packages/ruby.scm (ruby-rdoc): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8321dda4cc..cd88ea921c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5208,3 +5208,24 @@ your application.") (sha256 (base32 "1h39zqqxp3k4qk49ajpx0jps1vmvxgkh43mqkb6znk583bl0fv71")))))) + +(define-public ruby-rdoc + (package + (name "ruby-rdoc") + (version "6.0.4") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "rdoc" version)) + (sha256 + (base32 + "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7")))) + (build-system ruby-build-system) + (native-inputs + `(("bundler" ,bundler))) + (home-page "https://ruby.github.io/rdoc/") + (synopsis "HTML and command-line documentation utility") + (description "RDoc produces HTML and command-line documentation for Ruby +projects. RDoc includes the +rdoc+ and +ri+ tools for generating and displaying +documentation from the command-line.") + (license license:gpl2+))) -- cgit v1.2.3 From 18077ffc4613be27d087eb4d3dadd5cdf189cd74 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:43:30 +0200 Subject: gnu: Add ruby-sass-listen. * gnu/packages/ruby.scm (ruby-sass-listen): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index cd88ea921c..60869be9b8 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5229,3 +5229,26 @@ your application.") projects. RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentation from the command-line.") (license license:gpl2+))) + +(define-public ruby-sass-listen + (package + (name "ruby-sass-listen") + (version "4.0.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "sass-listen" version)) + (sha256 + (base32 + "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df")))) + (build-system ruby-build-system) + (arguments + ;; No test target + `(#:tests? #f)) + (propagated-inputs + `(("ruby-rb-fsevent" ,ruby-rb-fsevent) + ("ruby-rb-inotify" ,ruby-rb-inotify))) + (home-page "https://github.com/sass/listen") + (synopsis "File modification notification library") + (description "The Listen gem listens to file modifications and notifies you +about the changes.") + (license license:expat))) -- cgit v1.2.3 From 0c8eedc153cb7293f2bf148be32171a0e1ea7a39 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:47:16 +0200 Subject: gnu: Add ruby-terminfo. * gnu/packages/ruby.scm (ruby-terminfo): New variable. --- gnu/packages/ruby.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 60869be9b8..5fdf53c9c9 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages java) #:use-module (gnu packages libffi) #:use-module (gnu packages maths) + #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages python) #:use-module (gnu packages ragel) @@ -5252,3 +5253,30 @@ documentation from the command-line.") (description "The Listen gem listens to file modifications and notifies you about the changes.") (license license:expat))) + +(define-public ruby-terminfo + (package + (name "ruby-terminfo") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "ruby-terminfo" version)) + (sha256 + (base32 + "0rl4ic5pzvrpgd42z0c1s2n3j39c9znksblxxvmhkzrc0ckyg2cm")))) + (build-system ruby-build-system) + (arguments + `(#:test-target "test" + ;; Rakefile requires old packages and would need modification to + ;; work with current software. + #:tests? #f)) + (inputs + `(("ncurses" ,ncurses))) + (native-inputs + `(("ruby-rubygems-tasks" ,ruby-rubygems-tasks) + ("ruby-rdoc" ,ruby-rdoc))) + (home-page "http://www.a-k-r.org/ruby-terminfo/") + (synopsis "Terminfo binding for Ruby") + (description "Ruby-terminfo provides terminfo binding for Ruby.") + (license license:bsd-3))) -- cgit v1.2.3 From ddc3a66798919afe98173dbd176ce818c57949af Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:48:13 +0200 Subject: gnu: Add ruby-diffy. * gnu/packages/ruby.scm (ruby-diffy): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5fdf53c9c9..0f2b66139f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5280,3 +5280,26 @@ about the changes.") (synopsis "Terminfo binding for Ruby") (description "Ruby-terminfo provides terminfo binding for Ruby.") (license license:bsd-3))) + +(define-public ruby-diffy + (package + (name "ruby-diffy") + (version "3.2.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "diffy" version)) + (sha256 + (base32 + "119imrkn01agwhx5raxhknsi331y5i4yda7r0ws0an6905ximzjg")))) + (build-system ruby-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (home-page "https://github.com/samg/diffy") + (synopsis "Convenient diffing in ruby") + (description "Diffy provides a convenient way to generate a diff from two +strings or files.") + (license license:expat))) -- cgit v1.2.3 From 6456beef016fea4189b24a5f960ce8e98cd245cc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:50:52 +0200 Subject: gnu: Add ruby-sass-spec. * gnu/packages/ruby.scm (ruby-sass-spec): New variable. --- gnu/packages/ruby.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0f2b66139f..c644ba75bd 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5303,3 +5303,29 @@ about the changes.") (description "Diffy provides a convenient way to generate a diff from two strings or files.") (license license:expat))) + +(define-public ruby-sass-spec + (package + (name "ruby-sass-spec") + (version "3.5.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/sass/sass-spec/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0nx8lp7c9qa58w489crgqa3c489xsyarn1a8h4np9mwwfqm1h3rr")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-command-line-reporter-3" ,ruby-command-line-reporter-3) + ("ruby-diffy" ,ruby-diffy) + ("ruby-terminfo" ,ruby-terminfo))) + (arguments + ;; No Rakefile + `(#:tests? #f)) + (home-page "https://github.com/sass/sass-spec") + (synopsis "Test suite for Sass") + (description "Sass Spec is a test suite for Sass. Test cases are all in +the @file{spec} directory.") + (license license:expat))) -- cgit v1.2.3 From f00f4492236e9006c022972d4e7ef21c6e301c4b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 13:54:09 +0200 Subject: gnu: Add ruby-sass. * gnu/packages/ruby.scm (ruby-sass): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c644ba75bd..58a9c97ded 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5329,3 +5329,24 @@ strings or files.") (description "Sass Spec is a test suite for Sass. Test cases are all in the @file{spec} directory.") (license license:expat))) + +(define-public ruby-sass + (package + (name "ruby-sass") + (version "3.5.7") + (source (origin + (method url-fetch) + (uri (rubygems-uri "sass" version)) + (sha256 + (base32 + "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-sass-listen" ,ruby-sass-listen))) + (native-inputs + `(("ruby-sass-spec" ,ruby-sass-spec))) + (home-page "http://sass-lang.com/") + (synopsis "CSS extension language") + (description "Sass is a CSS extension language. It extends CSS with +features that don't exist yet like variables, nesting, mixins and inheritance.") + (license license:expat))) -- cgit v1.2.3 From 5e242cb44ca0f57cc2fb483e8b3a211cd633b9bc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 14:07:08 +0200 Subject: gnu: Add ruby-jekyll-sass-converter. * gnu/packages/ruby.scm (ruby-jekyll-sass-converter): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 58a9c97ded..548d79e428 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5350,3 +5350,25 @@ the @file{spec} directory.") (description "Sass is a CSS extension language. It extends CSS with features that don't exist yet like variables, nesting, mixins and inheritance.") (license license:expat))) + +(define-public ruby-jekyll-sass-converter + (package + (name "ruby-jekyll-sass-converter") + (version "1.5.2") + (source (origin + (method url-fetch) + (uri (rubygems-uri "jekyll-sass-converter" version)) + (sha256 + (base32 + "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-sass" ,ruby-sass))) + (arguments + ;; No rakefile + `(#:tests? #f)) + (home-page "https://github.com/jekyll/jekyll-sass-converter") + (synopsis "Sass converter for Jekyll") + (description "This gem provide built-in support for the Sass converter +in Jekyll.") + (license license:expat))) -- cgit v1.2.3 From 88ed727fc5513ffbb87cba52604d0689939f3b3d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 14:08:06 +0200 Subject: gnu: Add ruby-listen-3.0. * gnu/packages/ruby.scm (ruby-listen-3.0): New variable. --- gnu/packages/ruby.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 548d79e428..a21e1fea9a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3034,6 +3034,17 @@ you about the changes.") (home-page "https://github.com/guard/listen") (license license:expat))) +(define-public ruby-listen-3.0 + (package + (inherit ruby-listen) + (version "3.0.8") + (source (origin + (method url-fetch) + (uri (rubygems-uri "listen" version)) + (sha256 + (base32 + "1l0y7hbyfiwpvk172r28hsdqsifq1ls39hsfmzi1vy4ll0smd14i")))))) + (define-public ruby-activesupport (package (name "ruby-activesupport") -- cgit v1.2.3 From ceac6f6f5bca77d541f793b2825d9de401be8aa6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 14:11:13 +0200 Subject: gnu: Add ruby-jekyll-watch. * gnu/packages/ruby.scm (ruby-jekyll-watch): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index a21e1fea9a..58cd6fc6d7 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5383,3 +5383,25 @@ features that don't exist yet like variables, nesting, mixins and inheritance.") (description "This gem provide built-in support for the Sass converter in Jekyll.") (license license:expat))) + +(define-public ruby-jekyll-watch + (package + (name "ruby-jekyll-watch") + (version "2.0.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "jekyll-watch" version)) + (sha256 + (base32 + "0m7scvj3ki8bmyx5v8pzibpg6my10nycnc28lip98dskf8iakprp")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-listen-3.0" ,ruby-listen-3.0))) + (arguments + ;; No rakefile + `(#:tests? #f)) + (home-page "https://github.com/jekyll/jekyll-watch") + (synopsis "Jekyll auto-rebuild support") + (description "This gems add the @code{--watch} switch to the jekyll CLI +interface. It allows Jekyll to rebuild your site when a file changes.") + (license license:expat))) -- cgit v1.2.3 From 3224a5a84a261fcc8a6972ace1cbd0018371d34f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 15:24:40 +0200 Subject: gnu: Add ruby-parallel. * gnu/packages/ruby.scm (ruby-parallel): 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 58cd6fc6d7..c3ce6ca39a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5405,3 +5405,22 @@ in Jekyll.") (description "This gems add the @code{--watch} switch to the jekyll CLI interface. It allows Jekyll to rebuild your site when a file changes.") (license license:expat))) + +(define-public ruby-parallel + (package + (name "ruby-parallel") + (version "1.12.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "parallel" version)) + (sha256 + (base32 + "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); No rakefile + (home-page "https://github.com/grosser/parallel") + (synopsis "Parallel processing in Ruby") + (description "Parallel allows you to run any code in parallel Processes +(to use all CPUs) or Threads(to speedup blocking operations). It is best +suited for map-reduce or e.g. parallel downloads/uploads.") + (license license:expat))) -- cgit v1.2.3 From 83d9f672212907bb0c683f0be428c1d847bf6001 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 15:28:00 +0200 Subject: gnu: Add ruby-cane. * gnu/packages/ruby.scm (ruby-cane): 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 c3ce6ca39a..b7a55fa31f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5424,3 +5424,22 @@ interface. It allows Jekyll to rebuild your site when a file changes.") (to use all CPUs) or Threads(to speedup blocking operations). It is best suited for map-reduce or e.g. parallel downloads/uploads.") (license license:expat))) + +(define-public ruby-cane + (package + (name "ruby-cane") + (version "3.0.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "cane" version)) + (sha256 + (base32 + "0yf5za3l7lhrqa3g56sah73wh33lbxy5y3cb7ij0a2bp1b4kwhih")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); No rakefile + (home-page "https://github.com/square/cane") + (propagated-inputs + `(("ruby-parallel" ,ruby-parallel))) + (synopsis "Code quality threshold checking") + (description "Cane fails your build if code quality thresholds are not met.") + (license license:asl2.0))) -- cgit v1.2.3 From 00d71efca6be6bff7e2bb0f5a61ae8a7929af39a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 15:33:08 +0200 Subject: gnu: Add ruby-morecane. * gnu/packages/ruby.scm (ruby-morecane): New variable. --- gnu/packages/ruby.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b7a55fa31f..93ed29443e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5443,3 +5443,25 @@ suited for map-reduce or e.g. parallel downloads/uploads.") (synopsis "Code quality threshold checking") (description "Cane fails your build if code quality thresholds are not met.") (license license:asl2.0))) + +(define-public ruby-morecane + (package + (name "ruby-morecane") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "morecane" version)) + (sha256 + (base32 + "0w70vb8z5bdhvr21h660aa43m5948pv0bd27z7ngai2iwdvqd771")))) + (build-system ruby-build-system) + (home-page "https://github.com/yob/morecane") + (arguments `(#:tests? #f)); No rakefile + (propagated-inputs + `(("ruby-parallel" ,ruby-parallel))) + (synopsis "Extra checks for cane") + (description "The cane gem provides a great framework for running quality +checks over your ruby project as part of continuous integration build. It +comes with a few checks out of the box, but also provides an API for loading +custom checks. This gem provides a set of additional checks.") + (license license:expat))) -- cgit v1.2.3 From abbe629c6a25bea320e49163fff71d33521bb127 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 15:35:36 +0200 Subject: gnu: Add ruby-pdf-reader. * gnu/packages/ruby.scm (ruby-pdf-reader): New variable. --- gnu/packages/ruby.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 93ed29443e..86b00ef8ae 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5465,3 +5465,33 @@ checks over your ruby project as part of continuous integration build. It comes with a few checks out of the box, but also provides an API for loading custom checks. This gem provides a set of additional checks.") (license license:expat))) + +(define-public ruby-pdf-reader + (package + (name "ruby-pdf-reader") + (version "2.1.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "pdf-reader" version)) + (sha256 + (base32 + "1b3ig4wpcgdbqa7yw0ahwbmikkkywn2a22bfmrknl5ls7g066x45")))) + (build-system ruby-build-system) + (arguments `(#:test-target "spec")) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-cane" ,ruby-cane) + ("ruby-morecane" ,ruby-morecane))) + (propagated-inputs + `(("ruby-afm" ,ruby-afm) + ("ruby-ascii85" ,ruby-ascii85) + ("ruby-hashery" ,ruby-hashery) + ("ruby-rc4" ,ruby-rc4) + ("ruby-ttfunk" ,ruby-ttfunk))) + (home-page "https://github.com/yob/pdf-reader") + (synopsis "PDF parser in Ruby") + (description "The PDF::Reader library implements a PDF parser conforming as +much as possible to the PDF specification from Adobe. It provides programmatic +access to the contents of a PDF file with a high degree of flexibility.") + (license license:gpl3+))) -- cgit v1.2.3 From 461fb8598efc319a61d3be0996a4f7d402839539 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 15:46:24 +0200 Subject: gnu: Add ruby-pdf-inspector. * gnu/packages/ruby.scm (ruby-pdf-inspector): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 86b00ef8ae..1ea41109cc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5495,3 +5495,24 @@ custom checks. This gem provides a set of additional checks.") much as possible to the PDF specification from Adobe. It provides programmatic access to the contents of a PDF file with a high degree of flexibility.") (license license:gpl3+))) + +(define-public ruby-pdf-inspector + (package + (name "ruby-pdf-inspector") + (version "1.3.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "pdf-inspector" version)) + (sha256 + (base32 + "1g853az4xzgqxr5xiwhb76g4sqmjg4s79mm35mp676zjsrwpa47w")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-pdf-reader" ,ruby-pdf-reader))) + (arguments `(#:tests? #f)); No rakefile + (home-page "https://github.com/prawnpdf/pdf-inspector") + (synopsis "Analysis classes for inspecting PDF output") + (description "This library provides a number of PDF::Reader based tools for +use in testing PDF output. Presently, the primary purpose of this tool is to +support the tests found in Prawn, a pure Ruby PDF generation library.") + (license license:gpl3+))) -- cgit v1.2.3 From 770e3b535e0c90764ce58ee8bfb2d68bc0324f7a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 15:57:51 +0200 Subject: gnu: Add ruby-pdf-core. * gnu/packages/ruby.scm (ruby-pdf-core): New variable. --- gnu/packages/ruby.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1ea41109cc..c21e4cc2d4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5516,3 +5516,23 @@ access to the contents of a PDF file with a high degree of flexibility.") use in testing PDF output. Presently, the primary purpose of this tool is to support the tests found in Prawn, a pure Ruby PDF generation library.") (license license:gpl3+))) + +(define-public ruby-pdf-core + (package + (name "ruby-pdf-core") + (version "0.8.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "pdf-core" version)) + (sha256 + (base32 + "15d6m99bc8bbzlkcg13qfpjjzphfg5x905pjbfygvpcxsm8gnsvg")))) + (build-system ruby-build-system) + (arguments + ; No test target + `(#:tests? #f)) + (home-page "https://github.com/prawnpdf/pdf-core") + (synopsis "Low level PDF features for Prawn") + (description "This is an experimental gem that extracts low-level PDF +functionality from Prawn.") + (license license:gpl3+))) -- cgit v1.2.3 From 37fbced73c3aeb85472c1f3008eb32a2d87f67ef Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 16:00:00 +0200 Subject: gnu: Add ruby-yard. * gnu/packages/ruby.scm (ruby-yard): New variable. --- gnu/packages/ruby.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c21e4cc2d4..7085adc1a0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5536,3 +5536,24 @@ support the tests found in Prawn, a pure Ruby PDF generation library.") (description "This is an experimental gem that extracts low-level PDF functionality from Prawn.") (license license:gpl3+))) + +(define-public ruby-yard + (package + (name "ruby-yard") + (version "0.9.16") + (source (origin + (method url-fetch) + (uri (rubygems-uri "yard" version)) + (sha256 + (base32 + "0lmmr1839qgbb3zxfa7jf5mzy17yjl1yirwlgzdhws4452gqhn67")))) + (build-system ruby-build-system) + (arguments `(#:test-target "spec")) + (home-page "https://yardoc.org/") + (synopsis "Ruby documentation tool") + (description "YARD is a documentation generation tool for the Ruby +programming language. It enables the user to generate consistent, usable +documentation that can be exported to a number of formats very easily, and +also supports extending for custom Ruby constructs such as custom class level +definitions.") + (license license:expat))) -- cgit v1.2.3 From 7ad8dd086c982e7cf971385d7fadd2a0d1feb209 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 16:07:25 +0200 Subject: gnu: Add ruby-prawn. * gnu/packages/ruby.scm (ruby-prawn): New variable. --- gnu/packages/ruby.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7085adc1a0..b1da911d9d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5557,3 +5557,38 @@ documentation that can be exported to a number of formats very easily, and also supports extending for custom Ruby constructs such as custom class level definitions.") (license license:expat))) + +(define-public ruby-prawn + (package + (name "ruby-prawn") + (version "2.2.2") + (source (origin + (method url-fetch) + (uri (rubygems-uri "prawn" version)) + (sha256 + (base32 + "1qdjf1v6sfl44g3rqxlg8k4jrzkwaxgvh2l4xws97a8f3xv4na4m")))) + (build-system ruby-build-system) + (arguments + ; No tests + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-dependencies + (lambda _ + (substitute* "prawn.gemspec" + (("~> 0.7.0") "~> 0.7")) + #t))))) + (propagated-inputs + `(("ruby-pdf-core" ,ruby-pdf-core) + ("ruby-ttfunk" ,ruby-ttfunk))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-pdf-inspector" ,ruby-pdf-inspector) + ("ruby-rspec" ,ruby-rspec) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-yard" ,ruby-yard))) + (home-page "http://prawnpdf.org/api-docs/2.0/") + (synopsis "PDF generation for Ruby") + (description "Prawn is a pure Ruby PDF generation library.") + (license license:gpl3+))) -- cgit v1.2.3 From 197ca8ecd20e52bc5993dbc2f223274fcdb85e36 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 16:09:04 +0200 Subject: gnu: Add ruby-prawn-table. * gnu/packages/ruby.scm (ruby-prawn-table): 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 b1da911d9d..dcc79732a5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5592,3 +5592,22 @@ definitions.") (synopsis "PDF generation for Ruby") (description "Prawn is a pure Ruby PDF generation library.") (license license:gpl3+))) + +(define-public ruby-prawn-table + (package + (name "ruby-prawn-table") + (version "0.2.2") + (source (origin + (method url-fetch) + (uri (rubygems-uri "prawn-table" version)) + (sha256 + (base32 + "1nxd6qmxqwl850icp18wjh5k0s3amxcajdrkjyzpfgq0kvilcv9k")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); No rakefile + (propagated-inputs + `(("ruby-prawn" ,ruby-prawn))) + (home-page "https://github.com/prawnpdf/prawn-table") + (synopsis "Tables support for Prawn") + (description "This gem provides tables support for Prawn.") + (license license:gpl3+))) -- cgit v1.2.3 From 0312706955d9b790671af4c8553bf70cf07057d0 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 16:19:36 +0200 Subject: gnu: Add ruby-kramdown. * gnu/packages/ruby.scm (ruby-kramdown): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index dcc79732a5..f7688aa51a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5611,3 +5611,26 @@ definitions.") (synopsis "Tables support for Prawn") (description "This gem provides tables support for Prawn.") (license license:gpl3+))) + +(define-public ruby-kramdown + (package + (name "ruby-kramdown") + (version "1.17.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "kramdown" version)) + (sha256 + (base32 + "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); FIXME: some test failures + (native-inputs + `(("ruby-prawn" ,ruby-prawn) + ("ruby-prawn-table" ,ruby-prawn-table))) + (home-page "https://kramdown.gettalong.org/") + (synopsis "Markdown parsing and converting library") + (description "Kramdown is a library for parsing and converting a superset +of Markdown. It is completely written in Ruby, supports standard Markdown +(with some minor modifications) and various extensions that have been made +popular by the PHP @code{Markdown Extra} package and @code{Maruku}.") + (license license:expat))) -- cgit v1.2.3 From fa0063bcf437e375d32126d33fa5f1d1044e8b08 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 16:48:39 +0200 Subject: gnu: Add ruby-http-parser.rb. * gnu/packages/ruby.scm (ruby-http-parser.rb): New variable. --- gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f7688aa51a..93772d9300 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5634,3 +5634,27 @@ of Markdown. It is completely written in Ruby, supports standard Markdown (with some minor modifications) and various extensions that have been made popular by the PHP @code{Markdown Extra} package and @code{Maruku}.") (license license:expat))) + +(define-public ruby-http-parser.rb + (package + (name "ruby-http-parser.rb") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "http_parser.rb" version)) + (sha256 + (base32 + "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi")))) + (build-system ruby-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (native-inputs + `(("ruby-rake-compiler" ,ruby-rake-compiler) + ("ruby-rspec" ,ruby-rspec))) + (home-page "https://github.com/tmm1/http_parser.rb") + (synopsis "HTTP parser un Ruby") + (description "This gem is a simple callback-based HTTP request/response +parser for writing http servers, clients and proxies.") + (license license:expat))) -- cgit v1.2.3 From 5e2f74bdb847db3b4dd429efcacd6dd4432a771b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 16:55:00 +0200 Subject: gnu: Add ruby-em-websocket. * gnu/packages/ruby.scm (ruby-em-websocket): New variable. --- gnu/packages/ruby.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 93772d9300..024a99ab4c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5658,3 +5658,30 @@ popular by the PHP @code{Markdown Extra} package and @code{Maruku}.") (description "This gem is a simple callback-based HTTP request/response parser for writing http servers, clients and proxies.") (license license:expat))) + +(define-public ruby-em-websocket + (package + (name "ruby-em-websocket") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "em-websocket" version)) + (sha256 + (base32 + "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3")))) + (build-system ruby-build-system) + (arguments + ;; No tests + `(#:tests? #f)) + (propagated-inputs + `(("ruby-eventmachine" ,ruby-eventmachine) + ("ruby-http-parser.rb" ,ruby-http-parser.rb))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + (home-page "https://github.com/igrigorik/em-websocket") + (synopsis "EventMachine based WebSocket server") + (description "Em-websocket is an EventMachine based WebSocket server +implementation.") + (license license:expat))) -- cgit v1.2.3 From 4ce0414bca13f609db27371a4f75c6e37111d10f Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:03:59 +0200 Subject: gnu: Add ruby-rouge. * gnu/packages/ruby.scm (ruby-rouge): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 024a99ab4c..e605f3e6de 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5685,3 +5685,26 @@ parser for writing http servers, clients and proxies.") (description "Em-websocket is an EventMachine based WebSocket server implementation.") (license license:expat))) + +(define-public ruby-rouge + (package + (name "ruby-rouge") + (version "3.2.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "rouge" version)) + (sha256 + (base32 + "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); No rakefile + (home-page "http://rouge.jneen.net/") + (synopsis "Code highlighter") + (description "Rouge is a code highlighter written in Ruby. It supports more +than 100 languages and outputs HTML or ANSI 256-color text. Its HTML output +is compatible with stylesheets designed for pygments.") + (license (list + ;; rouge is licensed under expat + license:expat + ;; pygments is licensed under bsd-2 + license:bsd-2)))) -- cgit v1.2.3 From 2c5028bd97d50723b1a0ad1b2b5781487779b78b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:04:59 +0200 Subject: gnu: Add ruby-rouge-2. * gnu/packages/ruby.scm (ruby-rouge-2): New variable. --- gnu/packages/ruby.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e605f3e6de..9aabd4ff8f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5708,3 +5708,14 @@ is compatible with stylesheets designed for pygments.") license:expat ;; pygments is licensed under bsd-2 license:bsd-2)))) + +(define-public ruby-rouge-2 + (package + (inherit ruby-rouge) + (version "2.2.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "rouge" version)) + (sha256 + (base32 + "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs")))))) -- cgit v1.2.3 From 2e072e37aa0c5cf0fc612c9e4d5540cec6189b13 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:08:08 +0200 Subject: gnu: Add ruby-hashie. * gnu/packages/ruby.scm (ruby-hashie): New variable. --- gnu/packages/ruby.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9aabd4ff8f..bfb98a0bff 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5719,3 +5719,23 @@ is compatible with stylesheets designed for pygments.") (sha256 (base32 "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs")))))) + +(define-public ruby-hashie + (package + (name "ruby-hashie") + (version "3.6.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "hashie" version)) + (sha256 + (base32 + "13bdzfp25c8k51ayzxqkbzag3wj5gc1jd8h7d985nsq6pn57g5xh")))) + (build-system ruby-build-system) + (native-inputs + `(("bundler" ,bundler))) + (arguments `(#:tests? #f)); FIXME: Could not locate Gemfile or .bundle/ directory + (home-page "https://github.com/intridea/hashie") + (synopsis "Extensions to Ruby Hashes") + (description "Hashie is a collection of classes and mixins that make Ruby +hashes more powerful.") + (license license:expat))) -- cgit v1.2.3 From 73bfc125ef61980920cd01691032153deba4b98d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:10:37 +0200 Subject: gnu: Add ruby-heredoc-unindent. * gnu/packages/ruby.scm (ruby-heredoc-unindent): New variable. --- gnu/packages/ruby.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index bfb98a0bff..34d883284d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5739,3 +5739,29 @@ is compatible with stylesheets designed for pygments.") (description "Hashie is a collection of classes and mixins that make Ruby hashes more powerful.") (license license:expat))) + +(define-public ruby-heredoc-unindent + (package + (name "ruby-heredoc-unindent") + (version "1.2.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "heredoc_unindent" version)) + (sha256 + (base32 + "14ijr2fsjwhrkjkcaz81d5xnfa4vvgvcflrff83avqw9klm011yw")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-hoe" ,ruby-hoe))) + (home-page "https://github.com/adrianomitre/heredoc_unindent") + (synopsis "Heredoc indentation cleaner") + (description "This gem removes common margin from indented strings, such +as the ones produced by indented heredocs. In other words, it strips out +leading whitespace chars at the beggining of each line, but only as much as +the line with the smallest margin. + +It is acknowledged that many strings defined by heredocs are just code and +fact is that most parsers are insensitive to indentation. If, however, the +strings are to be used otherwise, be it for printing or testing, the extra +indentation will probably be an issue and hence this gem.") + (license license:expat))) -- cgit v1.2.3 From f8ae2ee528be1b9d92a61b6dc6b470821e645afd Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:12:19 +0200 Subject: gnu: Add ruby-safe-yaml. * gnu/packages/ruby.scm (ruby-safe-yaml): New variable. --- gnu/packages/ruby.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 34d883284d..3f0cfcfcfa 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5765,3 +5765,26 @@ fact is that most parsers are insensitive to indentation. If, however, the strings are to be used otherwise, be it for printing or testing, the extra indentation will probably be an issue and hence this gem.") (license license:expat))) + +(define-public ruby-safe-yaml + (package + (name "ruby-safe-yaml") + (version "1.0.4") + (source (origin + (method url-fetch) + (uri (rubygems-uri "safe_yaml" version)) + (sha256 + (base32 + "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-rspec" ,ruby-rspec) + ("ruby-hashie" ,ruby-hashie) + ("ruby-heredoc-unindent" ,ruby-heredoc-unindent))) + (arguments `(#:test-target "spec" + #:tests? #f));; FIXME: one failure + (home-page "https://github.com/dtao/safe_yaml") + (synopsis "YAML parser") + (description "The SafeYAML gem provides an alternative implementation of +YAML.load suitable for accepting user input in Ruby applications.") + (license license:expat))) -- cgit v1.2.3 From f1ec4d761122f68a5fb42d5ddaf6a626b6f7837d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:28:10 +0200 Subject: gnu: Add ruby-mercenary. * gnu/packages/ruby.scm (ruby-mercenary): New variable. --- gnu/packages/ruby.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3f0cfcfcfa..4947e1b43b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5788,3 +5788,23 @@ indentation will probably be an issue and hence this gem.") (description "The SafeYAML gem provides an alternative implementation of YAML.load suitable for accepting user input in Ruby applications.") (license license:expat))) + +(define-public ruby-mercenary + (package + (name "ruby-mercenary") + (version "0.3.6") + (source (origin + (method url-fetch) + (uri (rubygems-uri "mercenary" version)) + (sha256 + (base32 + "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a")))) + (build-system ruby-build-system) + (arguments `(#:test-target "spec")) + (native-inputs + `(("bundler" ,bundler))) + (home-page "https://github.com/jekyll/mercenary") + (synopsis "Command-line apps library in Ruby") + (description "Mercenary is a lightweight and flexible library for writing +command-line apps in Ruby.") + (license license:expat))) -- cgit v1.2.3 From a13d451e1855c6e5f1dc3e197d872bc46951e78e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:30:06 +0200 Subject: gnu: Add ruby-liquid. * gnu/packages/ruby.scm (ruby-liquid): New variable. --- gnu/packages/ruby.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4947e1b43b..7e4c3b4f13 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5808,3 +5808,21 @@ YAML.load suitable for accepting user input in Ruby applications.") (description "Mercenary is a lightweight and flexible library for writing command-line apps in Ruby.") (license license:expat))) + +(define-public ruby-liquid + (package + (name "ruby-liquid") + (version "4.0.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "liquid" version)) + (sha256 + (base32 + "17fa0jgwm9a935fyvzy8bysz7j5n1vf1x2wzqkdfd5k08dbw3x2y")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); No rakefile + (home-page "https://shopify.github.io/liquid/") + (synopsis "Template language") + (description "Liquid is a template language written in Ruby. It is used +to load dynamic content on storefronts.") + (license license:expat))) -- cgit v1.2.3 From 49395112c43e62605a75dd02fcce688deb2d5f67 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:59:15 +0200 Subject: gnu: Add ruby-forwardable-extended. * gnu/packages/ruby.scm (ruby-forwardable-extended): New variable. --- gnu/packages/ruby.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7e4c3b4f13..3395cc6aa2 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5826,3 +5826,21 @@ command-line apps in Ruby.") (description "Liquid is a template language written in Ruby. It is used to load dynamic content on storefronts.") (license license:expat))) + +(define-public ruby-forwardable-extended + (package + (name "ruby-forwardable-extended") + (version "2.6.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "forwardable-extended" version)) + (sha256 + (base32 + "15zcqfxfvsnprwm8agia85x64vjzr2w0xn9vxfnxzgcv8s699v0v")))) + (build-system ruby-build-system) + (arguments `(#:tests? #f)); Cyclic dependency on luna-rspec-formatters + (home-page "https://github.com/envygeeks/forwardable-extended") + (synopsis "Delegation to hashes and instance variables in Forwardable") + (description "Forwardable Extended provides more @code{Forwardable} +methods for your source as @code{Forwardable::Extended}.") + (license license:expat))) -- cgit v1.2.3 From 37296113799dfadc81a5606d5dace89b406403d8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 18:04:43 +0200 Subject: gnu: Add ruby-pathutil. * gnu/packages/ruby.scm (ruby-pathutil): New variable. --- gnu/packages/ruby.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3395cc6aa2..5d8a8873e4 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5844,3 +5844,28 @@ to load dynamic content on storefronts.") (description "Forwardable Extended provides more @code{Forwardable} methods for your source as @code{Forwardable::Extended}.") (license license:expat))) + +(define-public ruby-pathutil + (package + (name "ruby-pathutil") + (version "0.16.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "pathutil" version)) + (sha256 + (base32 + "0wc18ms1rzi44lpjychyw2a96jcmgxqdvy2949r4vvb5f4p0lgvz")))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-forwardable-extended" ,ruby-forwardable-extended))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec))) + ;; Fails with: cannot load such file -- + ;; /tmp/guix-build-ruby-pathutil-0.16.0.drv-0/gem/benchmark/support/task + (arguments `(#:tests? #f)) + (home-page "https://github.com/envygeeks/pathutil") + (synopsis "Extended implementation of Pathname") + (description "Pathutil tries to be a faster pure Ruby implementation of +Pathname.") + (license license:expat))) -- cgit v1.2.3 From 49e1dde53fd0a2e3c1d636364c067de8dbb611d7 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:30:58 +0200 Subject: gnu: Add jekyll. * gnu/packages/ruby.scm (jekyll): New variable. --- gnu/packages/ruby.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5d8a8873e4..70c071f921 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5869,3 +5869,42 @@ methods for your source as @code{Forwardable::Extended}.") (description "Pathutil tries to be a faster pure Ruby implementation of Pathname.") (license license:expat))) + +(define-public jekyll + (package + (name "jekyll") + (version "3.8.3") + (source (origin + (method url-fetch) + (uri (rubygems-uri "jekyll" version)) + (sha256 + (base32 + "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk")))) + (build-system ruby-build-system) + (arguments + ;; No rakefile, but a test subdirectory + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-i18n + (lambda _ + (substitute* ".gemspec" + (("~> 0.7") ">= 0.7")) + #t))))) + (propagated-inputs + `(("ruby-addressable" ,ruby-addressable) + ("ruby-colorator" ,ruby-colorator) + ("ruby-em-websocket" ,ruby-em-websocket) + ("ruby-i18n" ,ruby-i18n) + ("ruby-jekyll-sass-converter" ,ruby-jekyll-sass-converter) + ("ruby-jekyll-watch" ,ruby-jekyll-watch) + ("ruby-kramdown" ,ruby-kramdown) + ("ruby-liquid" ,ruby-liquid) + ("ruby-mercenary" ,ruby-mercenary) + ("ruby-pathutil" ,ruby-pathutil) + ("ruby-rouge" ,ruby-rouge-2) + ("ruby-safe-yaml" ,ruby-safe-yaml))) + (home-page "https://jekyllrb.com/") + (synopsis "Static site generator") + (description "Jekyll is a simple, blog aware, static site generator.") + (license license:expat))) -- cgit v1.2.3 From 37a0f47073e1788e8991567c4fce5d2acaa8ce67 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 26 Aug 2018 17:33:20 +0200 Subject: gnu: Add ruby-jekyll-paginate-v2. * gnu/packages/ruby.scm (ruby-jekyll-paginate-v2): 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 70c071f921..616b86934d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5908,3 +5908,22 @@ Pathname.") (synopsis "Static site generator") (description "Jekyll is a simple, blog aware, static site generator.") (license license:expat))) + +(define-public ruby-jekyll-paginate-v2 + (package + (name "ruby-jekyll-paginate-v2") + (version "2.0.0") + (source (origin + (method url-fetch) + (uri (rubygems-uri "jekyll-paginate-v2" version)) + (sha256 + (base32 + "154bfpyml6abxww9868hhyfvxasl8qhsc5zy2q30c7dxaj0igdib")))) + (build-system ruby-build-system) + (propagated-inputs + `(("jekyll" ,jekyll))) + (home-page "https://github.com/sverrirs/jekyll-paginate-v2") + (synopsis "Pagination Generator for Jekyll 3") + (description "The Pagination Generator forms the core of the pagination +logic in Jekyll. It calculates and generates the pagination pages.") + (license license:expat))) -- cgit v1.2.3 From a0a273c1eec438c80cf0c716987514e551b3b8f4 Mon Sep 17 00:00:00 2001 From: Manuel Graf Date: Fri, 31 Aug 2018 17:24:42 +0200 Subject: gnu: Add perftest. * gnu/packages/linux.scm (perftest): New variable. Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 63b3ece8e1..02d723316d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Brendan Tildesley +;;; Copyright © 2018 Manuel Graf ;;; ;;; This file is part of GNU Guix. ;;; @@ -3622,6 +3623,48 @@ The following service daemons are also provided: license:cc0 ; most files in ccan/ license:bsd-3)))) ; providers/hfi1verbs are dual GPL2/BSD-3 +(define-public perftest + (package + (name "perftest") + (version "4.2-0.8") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/linux-rdma/perftest/releases/download/V" + version "/perftest-" version ".g0e24e67.tar.gz")) + (sha256 + (base32 "1r3pxn7cx3grb8myb4q1b0pk447pc06cifd0v7ym13xw00372dlx")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-header-paths + (lambda _ + (substitute* '("src/raw_ethernet_fs_rate.c" + "src/raw_ethernet_resources.c" + "src/raw_ethernet_resources.h" + "src/raw_ethernet_send_burst_lat.c" + "src/raw_ethernet_send_bw.c" + "src/raw_ethernet_send_lat.c") + (("/usr/include/netinet/ip.h") "netinet/ip.h")) + #t))))) + (inputs `(("rdma-core" ,rdma-core))) + (home-page "https://github.com/linux-rdma/perftest/") + (synopsis "Open Fabrics Enterprise Distribution (OFED) Performance Tests") + (description "This is a collection of tests written over uverbs intended for +use as a performance micro-benchmark. The tests may be used for hardware or +software tuning as well as for functional testing. + +The collection contains a set of bandwidth and latency benchmark such as: +@enumerate +@item Send - @code{ib_send_bw} and @code{ib_send_lat} +@item RDMA Read - @code{ib_read_bw} and @code{ib_read_lat} +@item RDMA Write - @code{ib_write_bw} and @code{ib_wriet_lat} +@item RDMA Atomic - @code{ib_atomic_bw} and @code{ib_atomic_lat} +@item Native Ethernet (when working with MOFED2) - @code{raw_ethernet_bw}, @code{raw_ethernet_lat} +@end enumerate") + (license license:gpl2))) + (define-public rng-tools (package (name "rng-tools") -- cgit v1.2.3 From 3159ef7c99c646b78b04cedb1bd3525c301ef978 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 1 Sep 2018 19:31:45 +0200 Subject: gnu: rust: Bootstrap (only) Rust 1.19.0 by mrustc. * gnu/packages/patches/rust-1.19-mrustc.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/rust.scm (rust-1.19)[source]: Add patch "rust-1.19-mrustc.patch". [arguments]<#:modules>: New field. <#:phases>[patch-cargo-tomls]: New phase. <#:phases>[build]: Modify. <#:phases>[install]: Modify. [native-inputs]: Replace rust-bootstrap by mrustc. (rust-1.23)[native-inputs]: New field. [arguments]<#:phases>: Delete phase "patch-cargo-tomls". --- gnu/local.mk | 1 + gnu/packages/patches/rust-1.19-mrustc.patch | 28 ++++++ gnu/packages/rust.scm | 127 +++++++++++++++++++++++++++- 3 files changed, 152 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/rust-1.19-mrustc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3b92a7ac0e..91de38c5a3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1124,6 +1124,7 @@ dist_patch_DATA = \ %D%/packages/patches/ruby-concurrent-test-arm.patch \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ + %D%/packages/patches/rust-1.19-mrustc.patch \ %D%/packages/patches/rust-bootstrap-stage0-test.patch \ %D%/packages/patches/rust-coresimd-doctest.patch \ %D%/packages/patches/rxvt-unicode-escape-sequences.patch \ diff --git a/gnu/packages/patches/rust-1.19-mrustc.patch b/gnu/packages/patches/rust-1.19-mrustc.patch new file mode 100644 index 0000000000..261162172e --- /dev/null +++ b/gnu/packages/patches/rust-1.19-mrustc.patch @@ -0,0 +1,28 @@ +See https://github.com/thepowersgang/mrustc/archive/v0.8.0.tar.gz + +--- rustc-1.19.0-src-orig/src/libcore/intrinsics.rs ++++ rustc-1.19.0-src/src/libcore/intrinsics.rs +@@ -678,5 +678,9 @@ + pub fn min_align_of_val(_: &T) -> usize; + ++ /// Obtain the length of a slice pointer ++ #[cfg(rust_compiler="mrustc")] ++ pub fn mrustc_slice_len(pointer: *const [T]) -> usize; ++ + /// Gets a static string slice containing the name of a type. + pub fn type_name() -> &'static str; + +--- rustc-1.19.0-src-orig/src/libcore/slice/mod.rs ++++ rustc-1.19.0-src/src/libcore/slice/mod.rs +@@ -413,6 +413,8 @@ + #[inline] + fn len(&self) -> usize { +- unsafe { +- mem::transmute::<&[T], Repr>(self).len +- } ++ #[cfg(not(rust_compiler="mrustc"))] ++ let rv = unsafe { mem::transmute::<&[T], Repr>(self).len }; ++ #[cfg(rust_compiler="mrustc")] ++ let rv = unsafe { ::intrinsics::mrustc_slice_len(self) }; ++ rv + } diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 0695f8c7d2..41195c0e10 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -171,10 +171,12 @@ in turn be used to build the final Rust.") (package (name "rust") (version "1.19.0") - (source (rust-source version "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm")) + (source (rust-source version "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm" + #:patches '("rust-1.19-mrustc.patch"))) (outputs '("out" "cargo")) (arguments `(#:imported-modules ,%cargo-build-system-modules ;for `generate-checksums' + #:modules ((guix build utils) (ice-9 match) (guix build gnu-build-system)) #:phases (modify-phases %standard-phases (add-after 'unpack 'set-env @@ -187,6 +189,24 @@ in turn be used to build the final Rust.") ;; guix llvm-3.9.1 package installs only shared libraries (setenv "LLVM_LINK_SHARED" "1") #t)) + (add-after 'unpack 'patch-cargo-tomls + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "src/librustc_errors/Cargo.toml" + (("[[]dependencies[]]") " +[dependencies] +term = \"0.4.4\" +")) + (substitute* "src/librustc/Cargo.toml" + (("[[]dependencies[]]") " +[dependencies] +getopts = { path = \"../libgetopts\" } +")) + (substitute* "src/librustdoc/Cargo.toml" + (("[[]dependencies[]]") " +[dependencies] +test = { path = \"../libtest\" } +")) + #t)) (add-after 'unpack 'patch-tests (lambda* (#:key inputs #:allow-other-keys) (let ((bash (assoc-ref inputs "bash"))) @@ -243,12 +263,97 @@ in turn be used to build the final Rust.") (generate-checksums dir ,%cargo-reference-project-file))) (find-files "src/vendor" ".cargo-checksum.json")) #t)) + ;; This phase is overridden by newer versions. (replace 'configure (const #t)) + ;; This phase is overridden by newer versions. + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((rustc-bootstrap (assoc-ref inputs "rustc-bootstrap"))) + (setenv "CFG_COMPILER_HOST_TRIPLE" + ,(nix-system->gnu-triplet (%current-system))) + (setenv "CFG_RELEASE" "") + (setenv "CFG_RELEASE_CHANNEL" "stable") + (setenv "CFG_LIBDIR_RELATIVE" "lib") + (setenv "CFG_VERSION" "1.19.0-stable-mrustc") + ; bad: (setenv "CFG_PREFIX" "mrustc") ; FIXME output path. + (mkdir-p "output") + (invoke (string-append rustc-bootstrap "/tools/bin/minicargo") + "src/rustc" "--vendor-dir" "src/vendor" + "--output-dir" "output/rustc-build" + "-L" (string-append rustc-bootstrap "/lib/mrust") + "-j" "1") + (install-file "output/rustc-build/rustc" "output") ; FIXME: Remove? + (setenv "CFG_COMPILER_HOST_TRIPLE" #f) + (setenv "CFG_RELEASE" #f) + (setenv "CFG_RELEASE_CHANNEL" #f) + (setenv "CFG_VERSION" #f) + (setenv "CFG_PREFIX" #f) + (setenv "CFG_LIBDIR_RELATIVE" #f) + (invoke (string-append rustc-bootstrap "/tools/bin/minicargo") + "src/tools/cargo" "--vendor-dir" "src/vendor" + "--output-dir" "output/cargo-build" + "-L" "output/" + "-L" (string-append rustc-bootstrap "/lib/mrust") + "-j" "1") + ;; Now use the newly-built rustc to build the libraries. + ;; One day that could be replaced by: + ;; (invoke "output/cargo-build/cargo" "build" + ;; "--manifest-path" "src/bootstrap/Cargo.toml" + ;; "--verbose") ; "--locked" "--frozen" + ;; but right now, Cargo has problems with libstd's circular + ;; dependencies. + (mkdir-p "output/target-libs") + (for-each ((@ (ice-9 match) match-lambda) + ((name . flags) + (write name) + (newline) + (apply invoke + "output/rustc-build/rustc" + "-C" (string-append "linker=" + (getenv "CC")) + "-L" "output/target-libs" + (string-append "src/" name "/lib.rs") + "-o" + (string-append "output/target-libs/" + (car (string-split name #\/)) + ".rlib") + flags))) + '(("libcore") + ("libstd_unicode") + ("liballoc") + ("libcollections") + ("librand") + ("liblibc/src" "--cfg" "stdbuild") + ("libunwind" "-l" "gcc_s") + ("libcompiler_builtins") + ("liballoc_system") + ("libpanic_unwind") + ;; Uses "cc" to link. + ("libstd" "-l" "dl" "-l" "rt" "-l" "pthread") + ("libarena"))) + #t))) + ;; This phase is overridden by newer versions. (replace 'check (const #t)) + ;; This phase is overridden by newer versions. (replace 'install - (const #t))))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (target-system ,(or (%current-target-system) + (nix-system->gnu-triplet + (%current-system)))) + (out-libs (string-append out "/lib/rustlib/" + target-system "/lib"))) + ;(setenv "CFG_PREFIX" out) + (mkdir-p out-libs) + (copy-recursively "output/target-libs" out-libs) + (install-file "output/rustc-build/rustc" + (string-append out "/bin")) + (install-file "output/cargo-build/cargo" + (string-append (assoc-ref outputs "cargo") + "/bin"))) + #t))))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) ; For the tests @@ -258,8 +363,8 @@ in turn be used to build the final Rust.") ("git" ,git) ("procps" ,procps) ; For the tests ("python-2" ,python-2) - ("rustc-bootstrap" ,rust-bootstrap) - ("cargo-bootstrap" ,rust-bootstrap "cargo") + ("rustc-bootstrap" ,mrustc) + ("cargo-bootstrap" ,mrustc "cargo") ("pkg-config" ,pkg-config) ; For "cargo" ("which" ,which))) (inputs @@ -400,6 +505,18 @@ safety and thread safety guarantees.") (version "1.23.0") (source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")) (outputs '("out" "doc" "cargo")) + (native-inputs + `(("bison" ,bison) ; For the tests + ("cmake" ,cmake) + ("flex" ,flex) ; For the tests + ("gdb" ,gdb) ; For the tests + ("git" ,git) + ("procps" ,procps) ; For the tests + ("python-2" ,python-2) + ("rustc-bootstrap" ,rust-bootstrap) + ("cargo-bootstrap" ,rust-bootstrap "cargo") + ("pkg-config" ,pkg-config) ; For "cargo" + ("which" ,which))) (arguments (substitute-keyword-arguments (package-arguments rust-1.19) ((#:phases phases) @@ -410,6 +527,8 @@ safety and thread safety guarantees.") (substitute* "src/binaryen/CMakeLists.txt" (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") "")) #t)) + ;; TODO: Revisit this and find out whether that's needed after all. + (delete 'patch-cargo-tomls) (add-after 'patch-tests 'patch-cargo-tests (lambda _ (substitute* "src/tools/cargo/tests/build.rs" -- cgit v1.2.3 From 24d298b459c170bfc652489464f1e2935e804117 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 2 Sep 2018 00:22:53 +0200 Subject: gnu: rust: Move rust-1.19 down. --- gnu/packages/rust.scm | 208 +++++++++++++++++++++++++------------------------- 1 file changed, 104 insertions(+), 104 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 41195c0e10..631dcfd67c 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -167,6 +167,110 @@ in turn be used to build the final Rust.") (snippet '(begin (delete-file-recursively "src/llvm") #t)) (patches (map search-patch patches)))) +(define* (rust-bootstrapped-package base-rust version checksum + #:key (patches '())) + "Bootstrap rust VERSION with source checksum CHECKSUM patched with PATCHES using BASE-RUST." + (package + (inherit base-rust) + (version version) + (source + (rust-source version checksum #:patches patches)) + (native-inputs + (alist-replace "cargo-bootstrap" (list base-rust "cargo") + (alist-replace "rustc-bootstrap" (list base-rust) + (package-native-inputs base-rust)))))) + +(define-public mrustc + (let ((rustc-version "1.19.0")) + (package + (name "mrustc") + (version "0.8.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thepowersgang/mrustc.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i")))) + (outputs '("out" "cargo")) + (build-system gnu-build-system) + (inputs + `(("llvm" ,llvm-3.9.1))) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex) + ;; Required for the libstd sources. + ("rustc" + ,(rust-source "1.19.0" "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm")))) + (arguments + `(#:tests? #f + #:make-flags (list (string-append "LLVM_CONFIG=" + (assoc-ref %build-inputs "llvm") + "/bin/llvm-config")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-date + (lambda _ + (substitute* "Makefile" + (("shell date") "shell date -d @1")) + #t)) + (add-after 'patch-date 'unpack-target-compiler + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "minicargo.mk" + ;; Don't try to build LLVM. + (("^[$][(]LLVM_CONFIG[)]:") "xxx:") + ;; Build for the correct target architecture. + (("^RUSTC_TARGET := x86_64-unknown-linux-gnu") + (string-append "RUSTC_TARGET := " + ,(or (%current-target-system) + (nix-system->gnu-triplet-for-rust))))) + (invoke "tar" "xf" (assoc-ref inputs "rustc")) + (chdir "rustc-1.19.0-src") + (invoke "patch" "-p0" "../rust_src.patch") + (chdir "..") + #t)) + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) + #t)) + (add-after 'build 'build-minicargo + (lambda _ + (for-each (lambda (target) + (invoke "make" "-f" "minicargo.mk" target)) + '("output/libstd.hir" "output/libpanic_unwind.hir" + "output/libproc_macro.hir" "output/libtest.hir")) + ;; Technically the above already does it - but we want to be clear. + (invoke "make" "-C" "tools/minicargo"))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (tools-bin (string-append out "/tools/bin")) + (cargo-out (assoc-ref outputs "cargo")) + (cargo-bin (string-append cargo-out "/bin")) + (lib (string-append out "/lib")) + (lib/rust (string-append lib "/mrust")) + (gcc (assoc-ref inputs "gcc"))) + ;; These files are not reproducible. + (for-each delete-file (find-files "output" "\\.txt$")) + (mkdir-p lib) + (copy-recursively "output" lib/rust) + (mkdir-p bin) + (mkdir-p tools-bin) + (install-file "bin/mrustc" bin) + ;; minicargo uses relative paths to resolve mrustc. + (install-file "tools/bin/minicargo" tools-bin) + (install-file "tools/bin/minicargo" cargo-bin) + #t)))))) + (synopsis "Compiler for the Rust progamming language") + (description "Rust is a systems programming language that provides memory +safety and thread safety guarantees.") + (home-page "https://github.com/thepowersgang/mrustc") + ;; Dual licensed. + (license (list license:asl2.0 license:expat))))) + (define rust-1.19 (package (name "rust") @@ -394,110 +498,6 @@ safety and thread safety guarantees.") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) -(define* (rust-bootstrapped-package base-rust version checksum - #:key (patches '())) - "Bootstrap rust VERSION with source checksum CHECKSUM patched with PATCHES using BASE-RUST." - (package - (inherit base-rust) - (version version) - (source - (rust-source version checksum #:patches patches)) - (native-inputs - (alist-replace "cargo-bootstrap" (list base-rust "cargo") - (alist-replace "rustc-bootstrap" (list base-rust) - (package-native-inputs base-rust)))))) - -(define-public mrustc - (let ((rustc-version "1.19.0")) - (package - (name "mrustc") - (version "0.8.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/thepowersgang/mrustc.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i")))) - (outputs '("out" "cargo")) - (build-system gnu-build-system) - (inputs - `(("llvm" ,llvm-3.9.1))) - (native-inputs - `(("bison" ,bison) - ("flex" ,flex) - ;; Required for the libstd sources. - ("rustc" - ,(rust-source "1.19.0" "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm")))) - (arguments - `(#:tests? #f - #:make-flags (list (string-append "LLVM_CONFIG=" - (assoc-ref %build-inputs "llvm") - "/bin/llvm-config")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-date - (lambda _ - (substitute* "Makefile" - (("shell date") "shell date -d @1")) - #t)) - (add-after 'patch-date 'unpack-target-compiler - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "minicargo.mk" - ;; Don't try to build LLVM. - (("^[$][(]LLVM_CONFIG[)]:") "xxx:") - ;; Build for the correct target architecture. - (("^RUSTC_TARGET := x86_64-unknown-linux-gnu") - (string-append "RUSTC_TARGET := " - ,(or (%current-target-system) - (nix-system->gnu-triplet-for-rust))))) - (invoke "tar" "xf" (assoc-ref inputs "rustc")) - (chdir "rustc-1.19.0-src") - (invoke "patch" "-p0" "../rust_src.patch") - (chdir "..") - #t)) - (replace 'configure - (lambda* (#:key inputs #:allow-other-keys) - (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) - #t)) - (add-after 'build 'build-minicargo - (lambda _ - (for-each (lambda (target) - (invoke "make" "-f" "minicargo.mk" target)) - '("output/libstd.hir" "output/libpanic_unwind.hir" - "output/libproc_macro.hir" "output/libtest.hir")) - ;; Technically the above already does it - but we want to be clear. - (invoke "make" "-C" "tools/minicargo"))) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (tools-bin (string-append out "/tools/bin")) - (cargo-out (assoc-ref outputs "cargo")) - (cargo-bin (string-append cargo-out "/bin")) - (lib (string-append out "/lib")) - (lib/rust (string-append lib "/mrust")) - (gcc (assoc-ref inputs "gcc"))) - ;; These files are not reproducible. - (for-each delete-file (find-files "output" "\\.txt$")) - (mkdir-p lib) - (copy-recursively "output" lib/rust) - (mkdir-p bin) - (mkdir-p tools-bin) - (install-file "bin/mrustc" bin) - ;; minicargo uses relative paths to resolve mrustc. - (install-file "tools/bin/minicargo" tools-bin) - (install-file "tools/bin/minicargo" cargo-bin) - #t)))))) - (synopsis "Compiler for the Rust progamming language") - (description "Rust is a systems programming language that provides memory -safety and thread safety guarantees.") - (home-page "https://github.com/thepowersgang/mrustc") - ;; Dual licensed. - (license (list license:asl2.0 license:expat))))) - (define-public rust-1.23 (package (inherit rust-1.19) -- cgit v1.2.3 From 9bf98520f2c44e291c7d335b8f3a834642361133 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 2 Sep 2018 12:44:20 +0800 Subject: gnu: rosegarden: Update to 18.06. * gnu/packages/music.scm (rosegarden): Update to 18.06. [home-page]: Use HTTPS. --- gnu/packages/music.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index edffcfce96..ba21e5da2b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3685,7 +3685,7 @@ specification and header.") (define-public rosegarden (package (name "rosegarden") - (version "17.04") + (version "18.06") (source (origin (method url-fetch) (uri (string-append @@ -3693,7 +3693,7 @@ specification and header.") version "/rosegarden-" version ".tar.bz2")) (sha256 (base32 - "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq")))) + "04qc80sqb2ji42pq3mayhvqqn39hlxzymsywpbpzfpchr19chxx7")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DUSE_QT5=1") ; "-DCMAKE_BUILD_TYPE=Release" @@ -3747,6 +3747,7 @@ specification and header.") ;; Tests create files in $HOME/.local/share/rosegarden . (mkdir-p "/tmp/foo") (setenv "HOME" "/tmp/foo") + (setenv "XDG_RUNTIME_DIR" "/tmp/foo") #t))))) (inputs `(("alsa-lib" ,alsa-lib) @@ -3773,7 +3774,7 @@ sequencer") (description "Rosegarden is a music composition and editing environment based around a MIDI sequencer that features a rich understanding of music notation and includes basic support for digital audio.") - (home-page "http://www.rosegardenmusic.com/") + (home-page "https://www.rosegardenmusic.com/") (license license:gpl2))) (define-public patchmatrix -- cgit v1.2.3 From ab2e38e206049ffd377a0a9d7890d8216e90816f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sun, 2 Sep 2018 08:49:39 +0200 Subject: gnu: wine-staging-patchset-data: Update to 3.15. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 3.15. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 9c1257b2a1..c50dd26f85 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -225,7 +225,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.14") + (version "3.15") (source (origin (method git-fetch) @@ -235,7 +235,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "0h6gck0p92hin0m13q1hnlfnqs4vy474w66ppinvqms2zn3vibgi")))) + "1rgbx4qnxaarkq5n8nvj57q0rhxcqbwm5897ws962fgxh6zymg9n")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) -- cgit v1.2.3 From 87284c6b48981bdf5976dba127c688f43579a24b Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sun, 2 Sep 2018 08:51:06 +0200 Subject: gnu: wine-staging: Update to 3.15. * gnu/packages/wine.scm (wine-staging): Update to 3.15. --- gnu/packages/wine.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index c50dd26f85..b818a3ccb5 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -281,7 +281,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "01dhn3a6k3dwnrbz4bxvszhh5sxwy6s89y459g805hjmq8s6d2a7")))) + "07mmd8r70ciqrxzdg2m2mg34kcnb43dk9nw1ljm8jbcznsawv8ic")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+" ,gtk+) ("libva" ,libva) -- cgit v1.2.3 From 20cbd4f5f4d08bc26c22eb40b6c1e55b02e93f23 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 1 Sep 2018 23:49:43 +0200 Subject: compile-as-derivation: Adjust %load-compiled-path. * build-aux/compile-as-derivation.scm: Set not only %load-path but also %load-compiled-path. This can avoid problems where a stale .go is loaded. --- build-aux/compile-as-derivation.scm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/build-aux/compile-as-derivation.scm b/build-aux/compile-as-derivation.scm index 59a84b1415..d945a8c79c 100644 --- a/build-aux/compile-as-derivation.scm +++ b/build-aux/compile-as-derivation.scm @@ -20,13 +20,20 @@ (use-modules (srfi srfi-26)) -;; Add ~/.config/guix/latest to the search path. -(add-to-load-path - (and=> (or (getenv "XDG_CONFIG_HOME") - (and=> (getenv "HOME") - (cut string-append <> "/.config"))) - (cute string-append <> "/guix/current/share/guile/site/" - (effective-version)))) +;; Add ~/.config/guix/current to the search path. +(eval-when (expand load eval) + (and=> (or (getenv "XDG_CONFIG_HOME") + (and=> (getenv "HOME") + (cut string-append <> "/.config/guix/current"))) + (lambda (current) + (set! %load-path + (cons (string-append current "/share/guile/site/" + (effective-version)) + %load-path)) + (set! %load-compiled-path + (cons (string-append current "/lib/guile/" (effective-version) + "/site-ccache") + %load-compiled-path))))) (use-modules (guix) (guix ui) (guix git-download) -- cgit v1.2.3 From 02fa1d251c9caeba39c7593e0b8ab52b60735b17 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 24 Aug 2018 15:51:31 +0200 Subject: discovery: Add 'scheme-modules*'. * guix/self.scm (scheme-modules*): Move to... * guix/discovery.scm (scheme-modules*): ... here. New procedure. Make 'sub-directory' an optional parameter. --- guix/discovery.scm | 13 ++++++++++++- guix/self.scm | 7 ------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/guix/discovery.scm b/guix/discovery.scm index 2b627d108e..3fc6e2c9e7 100644 --- a/guix/discovery.scm +++ b/guix/discovery.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +27,7 @@ #:use-module (ice-9 ftw) #:export (scheme-files scheme-modules + scheme-modules* fold-modules all-modules fold-module-public-variables)) @@ -115,6 +116,16 @@ name and the exception key and arguments." (string-append directory "/" sub-directory) directory)))) +(define* (scheme-modules* directory #:optional sub-directory) + "Return the list of module names found under SUB-DIRECTORY in DIRECTORY. +This is a source-only variant that does not try to load files." + (let ((prefix (string-length directory))) + (map (lambda (file) + (file-name->module-name (string-drop file prefix))) + (scheme-files (if sub-directory + (string-append directory "/" sub-directory) + directory))))) + (define* (fold-modules proc init path #:key (warn (const #f))) "Fold over all the Scheme modules present in PATH, a list of directories. Call (PROC MODULE RESULT) for each module that is found." diff --git a/guix/self.scm b/guix/self.scm index 90649db17f..81f9b0cfd5 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -206,13 +206,6 @@ list of file-name/file-like objects suitable as inputs to 'imported-files'." (local-file file #:recursive? #t))) (find-files (string-append directory "/" sub-directory) pred))) -(define (scheme-modules* directory sub-directory) - "Return the list of module names found under SUB-DIRECTORY in DIRECTORY." - (let ((prefix (string-length directory))) - (map (lambda (file) - (file-name->module-name (string-drop file prefix))) - (scheme-files (string-append directory "/" sub-directory))))) - (define* (sub-directory item sub-directory) "Return SUB-DIRECTORY within ITEM, which may be a file name or a file-like object." -- cgit v1.2.3 From fe634eaf93ba40862acdf62d7f197c6f19f0651c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 27 Aug 2018 15:38:59 +0200 Subject: Add (guix describe) and use it to initialize '%package-search-path'. * guix/describe.scm: New file. * Makefile.am (MODULES): Add it. * gnu/packages.scm (%default-package-module-path): New variable. (%package-module-path): Honor 'package-path-entries'. * build-aux/update-NEWS.scm (main): Use %DEFAULT-PACKAGE-MODULE-PATH instead of (last (%package-module-path)). --- Makefile.am | 1 + build-aux/update-NEWS.scm | 9 +++--- gnu/packages.scm | 27 ++++++++++++------ guix/describe.scm | 73 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+), 13 deletions(-) create mode 100644 guix/describe.scm diff --git a/Makefile.am b/Makefile.am index 324674a60e..b6efd6d625 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,6 +86,7 @@ MODULES = \ guix/derivations.scm \ guix/grafts.scm \ guix/inferior.scm \ + guix/describe.scm \ guix/gnu-maintenance.scm \ guix/self.scm \ guix/upstream.scm \ diff --git a/build-aux/update-NEWS.scm b/build-aux/update-NEWS.scm index 2e8f68c9a8..a9dffef1d2 100644 --- a/build-aux/update-NEWS.scm +++ b/build-aux/update-NEWS.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2017, 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -128,11 +128,10 @@ paragraph." (define (main . args) (match args ((news-file data-directory) - ;; Don't browse things listed in the user's $GUIX_PACKAGE_PATH. Here we - ;; assume that the last item in (%package-module-path) is the distro - ;; directory. + ;; Don't browse things listed in the user's $GUIX_PACKAGE_PATH and + ;; in external channels. (parameterize ((%package-module-path - (list (last (%package-module-path))))) + %default-package-module-path)) (define (package-file version) (string-append data-directory "/packages-" version ".txt")) diff --git a/gnu/packages.scm b/gnu/packages.scm index 7b954769e9..532297239d 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -30,6 +30,7 @@ #:select ((package-name->name+version . hyphen-separated-name->name+version))) #:autoload (guix profiles) (packages->manifest) + #:use-module (guix describe) #:use-module (ice-9 vlist) #:use-module (ice-9 match) #:use-module (srfi srfi-1) @@ -46,6 +47,7 @@ %auxiliary-files-path %bootstrap-binaries-path %package-module-path + %default-package-module-path fold-packages @@ -130,22 +132,31 @@ for system '~a'") ("gnu/packages.scm" gnu/) ("guix.scm")))) +(define %default-package-module-path + ;; Default search path for package modules. + `((,%distro-root-directory . "gnu/packages"))) + (define %package-module-path ;; Search path for package modules. Each item must be either a directory ;; name or a pair whose car is a directory and whose cdr is a sub-directory ;; to narrow the search. (let* ((not-colon (char-set-complement (char-set #\:))) (environment (string-tokenize (or (getenv "GUIX_PACKAGE_PATH") "") - not-colon))) - ;; Automatically add items from $GUIX_PACKAGE_PATH to Guile's search path. - (for-each (lambda (directory) - (set! %load-path (cons directory %load-path)) - (set! %load-compiled-path - (cons directory %load-compiled-path))) - environment) + not-colon)) + (channels (package-path-entries))) + ;; Automatically add channels and items from $GUIX_PACKAGE_PATH to Guile's + ;; search path. For historical reasons, $GUIX_PACKAGE_PATH goes to the + ;; front; channels go to the back so that they don't override Guix' own + ;; modules. + (set! %load-path + (append environment %load-path channels)) + (set! %load-compiled-path + (append environment %load-compiled-path channels)) (make-parameter - (append environment `((,%distro-root-directory . "gnu/packages")))))) + (append environment + %default-package-module-path + channels)))) (define %patch-path ;; Define it after '%package-module-path' so that '%load-path' contains user diff --git a/guix/describe.scm b/guix/describe.scm new file mode 100644 index 0000000000..3122a762fe --- /dev/null +++ b/guix/describe.scm @@ -0,0 +1,73 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 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 (guix describe) + #:use-module (guix memoization) + #:use-module (guix profiles) + #:use-module (srfi srfi-1) + #:use-module (ice-9 match) + #:export (package-path-entries)) + +;;; Commentary: +;;; +;;; This module provides supporting code to allow a Guix instance to find, at +;;; run time, which profile it's in (profiles created by 'guix pull'). That +;;; allows it to read meta-information about itself (e.g., repository URL and +;;; commit ID) and to find other channels available in the same profile. It's +;;; a bit like ELPA's pkg-info.el. +;;; +;;; Code: + +(define current-profile + (mlambda () + "Return the profile (created by 'guix pull') the calling process lives in, +or #f if this is not applicable." + (match (command-line) + ((program . _) + (and (string-suffix? "/bin/guix" program) + ;; Note: We want to do _lexical dot-dot resolution_. Using ".." + ;; for real would instead take us into the /gnu/store directory + ;; that ~/.config/guix/current/bin points to, whereas we want to + ;; obtain ~/.config/guix/current. + (let ((candidate (dirname (dirname program)))) + (and (file-exists? (string-append candidate "/manifest")) + candidate))))))) + +(define current-profile-entries + (mlambda () + "Return the list of entries in the 'guix pull' profile the calling process +lives in, or #f if this is not applicable." + (match (current-profile) + (#f '()) + (profile + (let ((manifest (profile-manifest profile))) + (manifest-entries manifest)))))) + +(define package-path-entries + (mlambda () + "Return a list of package path entries to be added to the package search +path. These entries are taken from the 'guix pull' profile the calling +process lives in, when applicable." + ;; Filter out Guix itself. + (filter-map (lambda (entry) + (and (not (string=? (manifest-entry-name entry) + "guix")) + (string-append (manifest-entry-item entry) + "/share/guile/site/" + (effective-version)))) + (current-profile-entries)))) -- cgit v1.2.3 From 0d39a3b98948314e135566b9315717695a9035ea Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 27 Aug 2018 18:05:49 +0200 Subject: Add (guix channels) and use it in (guix scripts pull). * guix/channels.scm: New file. * Makefile.am (MODULES): Add it. * guix/scripts/pull.scm: Use it. (%default-options): Remove 'repository-url' and 'ref'. (show-help, %options): Add '--channels'. (%self-build-file, %pull-version, build-from-source) (whole-package-for-legacy, derivation->manifest-entry): Remove. These now exist in a similar form in (guix channels). (build-and-install): Change 'source' to 'instances'. Remove #:url, #:branch, and #:commit. Rewrite using 'channel-instances->manifest'. (channel-list): New procedure. (guix-pull): Parameterize %REPOSITORY-CACHE-DIRECTORY. Call 'honor-lets-encrypt-certificates!' unconditionally. Load ~/.config/guix/channels.scm. Rewrite to use (guix channels). [use-le-certs?]: Remove. * po/guix/POTFILES.in: Add (guix channels). * doc/guix.texi (Invoking guix pull): Group the description of '--url', '--commit', and '--branch'. Remove mention of 'GUIX_PULL_URL'. Add references to "Channels". Document '--channels'. (Channels): New node. (Defining Packages): Link to "Channels" instead of "Package Modules". (Invoking guix edit): Link to "Package Modules" instead of "Defining Packages". (Package Modules): Document both GUIX_PACKAGE_PATH and channels. --- Makefile.am | 1 + doc/guix.texi | 277 +++++++++++++++++++++++++++++++++++++++-------- guix/channels.scm | 292 ++++++++++++++++++++++++++++++++++++++++++++++++++ guix/scripts/pull.scm | 218 +++++++++++++++++-------------------- po/guix/POTFILES.in | 1 + 5 files changed, 623 insertions(+), 166 deletions(-) create mode 100644 guix/channels.scm diff --git a/Makefile.am b/Makefile.am index b6efd6d625..af6870cf67 100644 --- a/Makefile.am +++ b/Makefile.am @@ -87,6 +87,7 @@ MODULES = \ guix/grafts.scm \ guix/inferior.scm \ guix/describe.scm \ + guix/channels.scm \ guix/gnu-maintenance.scm \ guix/self.scm \ guix/upstream.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 8611059791..ad82c67932 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -146,17 +146,18 @@ Package Management * Packages with Multiple Outputs:: Single source package, multiple outputs. * Invoking guix gc:: Running the garbage collector. * Invoking guix pull:: Fetching the latest Guix and distribution. +* Channels:: Customizing the package collection. * Invoking guix pack:: Creating software bundles. * Invoking guix archive:: Exporting and importing store files. Substitutes -* Official Substitute Server:: One particular source of substitutes. -* Substitute Server Authorization:: How to enable or disable substitutes. -* Substitute Authentication:: How Guix verifies substitutes. -* Proxy Settings:: How to get substitutes via proxy. -* Substitution Failure:: What happens when substitution fails. -* On Trusting Binaries:: How can you trust that binary blob? +* Official Substitute Server:: One particular source of substitutes. +* Substitute Server Authorization:: How to enable or disable substitutes. +* Substitute Authentication:: How Guix verifies substitutes. +* Proxy Settings:: How to get substitutes via proxy. +* Substitution Failure:: What happens when substitution fails. +* On Trusting Binaries:: How can you trust that binary blob? Programming Interface @@ -202,7 +203,7 @@ GNU Distribution * System Installation:: Installing the whole operating system. * System Configuration:: Configuring the operating system. -* Documentation:: Browsing software user manuals. +* Documentation:: Browsing software user manuals. * Installing Debugging Files:: Feeding the debugger. * Security Updates:: Deploying security fixes quickly. * Package Modules:: Packages from the programmer's viewpoint. @@ -264,7 +265,7 @@ Services * Audio Services:: The MPD. * Virtualization Services:: Virtualization services. * Version Control Services:: Providing remote access to Git repositories. -* Game Services:: Game servers. +* Game Services:: Game servers. * Miscellaneous Services:: Other services. Defining Services @@ -1694,6 +1695,7 @@ guix package -i emacs-guix * Packages with Multiple Outputs:: Single source package, multiple outputs. * Invoking guix gc:: Running the garbage collector. * Invoking guix pull:: Fetching the latest Guix and distribution. +* Channels:: Customizing the package collection. * Invoking guix pack:: Creating software bundles. * Invoking guix archive:: Exporting and importing store files. @end menu @@ -2276,12 +2278,12 @@ pre-built package binaries, but source tarballs, for instance, which also result from derivation builds, can be available as substitutes. @menu -* Official Substitute Server:: One particular source of substitutes. -* Substitute Server Authorization:: How to enable or disable substitutes. -* Substitute Authentication:: How Guix verifies substitutes. -* Proxy Settings:: How to get substitutes via proxy. -* Substitution Failure:: What happens when substitution fails. -* On Trusting Binaries:: How can you trust that binary blob? +* Official Substitute Server:: One particular source of substitutes. +* Substitute Server Authorization:: How to enable or disable substitutes. +* Substitute Authentication:: How Guix verifies substitutes. +* Proxy Settings:: How to get substitutes via proxy. +* Substitution Failure:: What happens when substitution fails. +* On Trusting Binaries:: How can you trust that binary blob? @end menu @node Official Substitute Server @@ -2746,7 +2748,8 @@ 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. +@uref{https://git-scm.com, Git} repository, by default the official +GNU@tie{}Guix repository, though this can be customized. On completion, @command{guix package} will use packages and package versions from this just-retrieved copy of Guix. Not only that, but all @@ -2821,20 +2824,23 @@ but it supports the following options: Produce verbose output, writing build logs to the standard error output. @item --url=@var{url} -Download Guix from the Git repository at @var{url}. - -@vindex GUIX_PULL_URL -By default, the source is taken from its canonical Git repository at -@code{gnu.org}, for the stable branch of Guix. To use a different source, -set the @code{GUIX_PULL_URL} environment variable. - -@item --commit=@var{commit} -Deploy @var{commit}, a valid Git commit ID represented as a hexadecimal -string. - -@item --branch=@var{branch} -Deploy the tip of @var{branch}, the name of a Git branch available on -the repository at @var{url}. +@itemx --commit=@var{commit} +@itemx --branch=@var{branch} +Download code from the specified @var{url}, at the given @var{commit} (a valid +Git commit ID represented as a hexadecimal string), or @var{branch}. + +@cindex @file{channels.scm}, configuration file +@cindex configuration file for channels +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). + +@item --channels=@var{file} +@itemx -C @var{file} +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. @item --list-generations[=@var{pattern}] @itemx -l [@var{pattern}] @@ -2848,9 +2854,180 @@ Use the bootstrap Guile to build the latest Guix. This option is only useful to Guix developers. @end table +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. + In addition, @command{guix pull} supports all the common build options (@pxref{Common Build Options}). +@node Channels +@section Channels + +@cindex channels +@cindex @file{channels.scm}, configuration file +@cindex configuration file for channels +@cindex @command{guix pull}, configuration file +@cindex configuration of @command{guix pull} +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. + +@subsection Using a Custom Guix Channel + +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: + +@lisp +;; Tell 'guix pull' to use my own repo. +(list (channel + (name 'guix) + (url "https://example.org/my-guix.git") + (branch "super-hacks"))) +@end lisp + +@noindent +From there on, @command{guix pull} will fetch code from the @code{super-hacks} +branch of the repository at @code{example.org}. + +@subsection Specifying Additional Channels + +@cindex extending the package collection (channels) +@cindex personal packages (channels) +@cindex channels, for personal packages +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? + +@c What follows stems from discussions at +@c as well as +@c earlier discussions on guix-devel@gnu.org. +@quotation Warning +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: + +@itemize +@item +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. + +@item +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. + +@item +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. +@end itemize + +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. +@end quotation + +Once you have a Git repository containing your own package modules, you can +write @code{~/.config/guix/channels.scm} to instruct @command{guix pull} to +pull from your personal channel @emph{in addition} to the default Guix +channel(s): + +@vindex %default-channels +@lisp +;; Add my personal packages to those Guix provides. +(cons (channel + (name 'my-personal-packages) + (url "https://example.org/personal-packages.git")) + %default-channels) +@end lisp + +@noindent +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: + +@example +$ guix pull --list-generations +@dots{} +Generation 19 Aug 27 2018 16:20:48 + guix d894ab8 + repository URL: https://git.savannah.gnu.org/git/guix.git + branch: master + commit: d894ab8e9bfabcefa6c49d9ba2e834dd5a73a300 + my-personal-packages dd3df5e + repository URL: https://example.org/personal-packages.git + branch: master + commit: dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb + 11 new packages: my-gimp, my-emacs-with-cool-features, @dots{} + 4 packages upgraded: emacs-racket-mode@@0.0.2-2.1b78827, @dots{} +@end example + +@noindent +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. + +@subsection Replicating Guix + +@cindex pinning, channels +@cindex replicating Guix +@cindex reproducibility, of Guix +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: + +@lisp +;; Deploy specific commits of my channels of interest. +(list (channel + (name 'guix) + (url "https://git.savannah.gnu.org/git/guix.git") + (commit "d894ab8e9bfabcefa6c49d9ba2e834dd5a73a300")) + (channel + (name 'my-personal-packages) + (url "https://example.org/personal-packages.git") + (branch "dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb"))) +@end lisp + +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. + +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. + @node Invoking guix pack @section Invoking @command{guix pack} @@ -3431,9 +3608,9 @@ more information on how to test package definitions, and @ref{Invoking guix lint}, for information on how to check a definition for style conformance. @vindex GUIX_PACKAGE_PATH -Lastly, @pxref{Package Modules}, for information +Lastly, @pxref{Channels}, for information on how to extend the distribution by adding your own package definitions -to @code{GUIX_PACKAGE_PATH}. +in a ``channel''. Finally, updating the package definition to a new upstream version can be partly automated by the @command{guix refresh} command @@ -6255,8 +6432,8 @@ and that of Vim. If you are using a Guix Git checkout (@pxref{Building from Git}), or have created your own packages on @code{GUIX_PACKAGE_PATH} -(@pxref{Defining Packages}), you will be able to edit the package -recipes. Otherwise, you will be able to examine the read-only recipes +(@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. @@ -8376,7 +8553,7 @@ For information on porting to other architectures or kernels, @menu * System Installation:: Installing the whole operating system. * System Configuration:: Configuring the operating system. -* Documentation:: Browsing software user manuals. +* Documentation:: Browsing software user manuals. * Installing Debugging Files:: Feeding the debugger. * Security Updates:: Deploying security fixes quickly. * Package Modules:: Packages from the programmer's viewpoint. @@ -8415,7 +8592,7 @@ available. @menu * Limitations:: What you can expect. * Hardware Considerations:: Supported hardware. -* USB Stick and DVD Installation:: Preparing the installation medium. +* USB Stick and DVD Installation:: Preparing the installation medium. * Preparing for Installation:: Networking, partitioning, etc. * Proceeding with the Installation:: The real thing. * Installing GuixSD in a VM:: GuixSD playground. @@ -10096,7 +10273,7 @@ declaration. * Audio Services:: The MPD. * Virtualization Services:: Virtualization services. * Version Control Services:: Providing remote access to Git repositories. -* Game Services:: Game servers. +* Game Services:: Game servers. * Miscellaneous Services:: Other services. @end menu @@ -22641,16 +22818,24 @@ 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.}. These package definitions -will not be visible by default. Users can invoke commands such as -@command{guix package} and @command{guix build} with the -@code{-e} option so that they know where to find the package. Better -yet, they can use the -@code{-L} option of these commands to make those modules visible -(@pxref{Invoking guix build, @code{--load-path}}), or define the -@code{GUIX_PACKAGE_PATH} environment variable. This environment -variable makes it easy to extend or customize the distribution and is -honored by all the user interfaces. +guile, GNU Guile Reference Manual}, for details.}. There are two ways to make +these package definitions visible to the user interfaces: + +@enumerate +@item +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. + +@item +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. +@end enumerate + +@code{GUIX_PACKAGE_PATH} works similarly to other search path variables: @defvr {Environment Variable} GUIX_PACKAGE_PATH This is a colon-separated list of directories to search for additional diff --git a/guix/channels.scm b/guix/channels.scm new file mode 100644 index 0000000000..ec3e05eaf5 --- /dev/null +++ b/guix/channels.scm @@ -0,0 +1,292 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 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 (guix channels) + #:use-module (guix git) + #:use-module (guix records) + #:use-module (guix gexp) + #:use-module (guix discovery) + #:use-module (guix monads) + #:use-module (guix profiles) + #:use-module (guix derivations) + #:use-module (guix store) + #:use-module (guix i18n) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-9) + #:use-module (srfi srfi-11) + #:autoload (guix self) (whole-package) + #:use-module (ice-9 match) + #:export (channel + channel? + channel-name + channel-url + channel-branch + channel-commit + channel-location + + %default-channels + + channel-instance? + channel-instance-channel + channel-instance-commit + channel-instance-checkout + + latest-channel-instances + channel-instance-derivations + latest-channel-derivations + channel-instances->manifest)) + +;;; Commentary: +;;; +;;; This module implements "channels." A channel is usually a source of +;;; package definitions. There's a special channel, the 'guix' channel, that +;;; provides all of Guix, including its commands and its documentation. +;;; User-defined channels are expected to typically provide a bunch of .scm +;;; files meant to be added to the '%package-search-path'. +;;; +;;; This module provides tools to fetch and update channels from a Git +;;; repository and to build them. +;;; +;;; Code: + +(define-record-type* channel make-channel + channel? + (name channel-name) + (url channel-url) + (branch channel-branch (default "master")) + (commit channel-commit (default #f)) + (location channel-location + (default (current-source-location)) (innate))) +;; TODO: Add a way to express dependencies among channels. + +(define %default-channels + ;; Default list of channels. + (list (channel + (name 'guix) + (branch "origin/master") + (url "https://git.savannah.gnu.org/git/guix.git")))) + +(define (guix-channel? channel) + "Return true if CHANNEL is the 'guix' channel." + (eq? 'guix (channel-name channel))) + +(define-record-type + (channel-instance channel commit checkout) + channel-instance? + (channel channel-instance-channel) + (commit channel-instance-commit) + (checkout channel-instance-checkout)) + +(define (channel-reference channel) + "Return the \"reference\" for CHANNEL, an sexp suitable for +'latest-repository-commit'." + (match (channel-commit channel) + (#f `(branch . ,(channel-branch channel))) + (commit `(commit . ,(channel-commit channel))))) + +(define (latest-channel-instances store channels) + "Return a list of channel instances corresponding to the latest checkouts of +CHANNELS." + (map (lambda (channel) + (format (current-error-port) + (G_ "Updating channel '~a' from Git repository at '~a'...~%") + (channel-name channel) + (channel-url channel)) + (let-values (((checkout commit) + (latest-repository-commit store (channel-url channel) + #:ref (channel-reference + channel)))) + (channel-instance channel commit checkout))) + channels)) + +(define %self-build-file + ;; The file containing code to build Guix. This serves the same purpose as + ;; a makefile, and, similarly, is intended to always keep this name. + "build-aux/build-self.scm") + +(define %pull-version + ;; This is the version of the 'guix pull' protocol. It specifies what's + ;; expected from %SELF-BUILD-FILE. The initial version ("0") was when we'd + ;; place a set of compiled Guile modules in ~/.config/guix/latest. + 1) + +(define (standard-module-derivation name source dependencies) + "Return a derivation that builds the Scheme modules in SOURCE and that +depend on DEPENDENCIES, a list of lowerable objects. The assumption is that +SOURCE contains package modules to be added to '%package-module-path'." + (define modules + (scheme-modules* source)) + + ;; FIXME: We should load, say SOURCE/.guix-channel.scm, which would allow + ;; channel publishers to specify things such as the sub-directory where .scm + ;; files live, files to exclude from the channel, preferred substitute URLs, + ;; etc. + (mlet* %store-monad ((compiled + (compiled-modules modules + #:name name + #:module-path (list source) + #:extensions dependencies))) + + (gexp->derivation name + (with-extensions dependencies + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + + (let ((go (string-append #$output "/lib/guile/" + (effective-version) + "/site-ccache")) + (scm (string-append #$output + "/share/guile/site/" + (effective-version)))) + (mkdir-p (dirname go)) + (symlink #$compiled go) + (mkdir-p (dirname scm)) + (symlink #$source scm)))))))) + +(define* (build-from-source name source + #:key verbose? commit + (dependencies '())) + "Return a derivation to build Guix from SOURCE, using the self-build script +contained therein. Use COMMIT as the version string." + ;; Running the self-build script makes it easier to update the build + ;; procedure: the self-build script of the Guix-to-be-installed contains the + ;; right dependencies, build procedure, etc., which the Guix-in-use may not + ;; be know. + (define script + (string-append source "/" %self-build-file)) + + (if (file-exists? script) + (let ((build (save-module-excursion + (lambda () + (primitive-load script))))) + ;; BUILD must be a monadic procedure of at least one argument: the + ;; source tree. + ;; + ;; Note: BUILD can return #f if it does not support %PULL-VERSION. In + ;; the future we'll fall back to a previous version of the protocol + ;; when that happens. + (build source #:verbose? verbose? #:version commit + #:pull-version %pull-version)) + + ;; Build a set of modules that extend Guix using the standard method. + (standard-module-derivation name source dependencies))) + +(define* (build-channel-instance instance #:optional (dependencies '())) + "Return, as a monadic value, the derivation for INSTANCE, a channel +instance. DEPENDENCIES is a list of extensions providing Guile modules that +INSTANCE depends on." + (build-from-source (symbol->string + (channel-name (channel-instance-channel instance))) + (channel-instance-checkout instance) + #:commit (channel-instance-commit instance) + #:dependencies dependencies)) + +(define (channel-instance-derivations instances) + "Return the list of derivations to build INSTANCES, in the same order as +INSTANCES." + (define core-instance + ;; The 'guix' channel is treated specially: it's an implicit dependency of + ;; all the other channels. + (find (lambda (instance) + (guix-channel? (channel-instance-channel instance))) + instances)) + + (mlet %store-monad ((core (build-channel-instance core-instance))) + (mapm %store-monad + (lambda (instance) + (if (eq? instance core-instance) + (return core) + (build-channel-instance instance + (list core)))) + instances))) + +(define latest-channel-derivations + (let ((latest-channel-instances (store-lift latest-channel-instances))) + (lambda (channels) + "Return, as a monadic value, the list of derivations for the latest +instances of CHANNELS." + (mlet %store-monad ((instances (latest-channel-instances channels))) + (channel-instance-derivations instances))))) + +(define (whole-package-for-legacy name modules) + "Return a full-blown Guix package for MODULES, a derivation that builds Guix +modules in the old ~/.config/guix/latest style." + (define packages + (resolve-interface '(gnu packages guile))) + + (letrec-syntax ((list (syntax-rules (->) + ((_) + '()) + ((_ (module -> variable) rest ...) + (cons (module-ref (resolve-interface + '(gnu packages module)) + 'variable) + (list rest ...))) + ((_ variable rest ...) + (cons (module-ref packages 'variable) + (list rest ...)))))) + (whole-package name modules + + ;; In the "old style", %SELF-BUILD-FILE would simply return a + ;; derivation that builds modules. We have to infer what the + ;; dependencies of these modules were. + (list guile-json guile-git guile-bytestructures + (ssh -> guile-ssh) (tls -> gnutls))))) + +(define (old-style-guix? drv) + "Return true if DRV corresponds to a ~/.config/guix/latest style of +derivation." + ;; Here we rely on a gross historical fact: that derivations produced by the + ;; "old style" (before commit 8a0d9bc8a3f153159d9e239a151c0fa98f1e12d8, + ;; dated May 30, 2018) did not depend on "guix-command.drv". + (not (find (lambda (input) + (string-suffix? "-guix-command.drv" + (derivation-input-path input))) + (derivation-inputs drv)))) + +(define (channel-instances->manifest instances) + "Return a profile manifest with entries for all of INSTANCES, a list of +channel instances." + (define instance->entry + (match-lambda + ((instance drv) + (let ((commit (channel-instance-commit instance)) + (channel (channel-instance-channel instance))) + (with-monad %store-monad + (return (manifest-entry + (name (symbol->string (channel-name channel))) + (version (string-take commit 7)) + (item (if (guix-channel? channel) + (if (old-style-guix? drv) + (whole-package-for-legacy + (string-append name "-" version) + drv) + drv) + drv)) + (properties + `((source (repository + (version 0) + (url ,(channel-url channel)) + (branch ,(channel-branch channel)) + (commit ,commit)))))))))))) + + (mlet* %store-monad ((derivations (channel-instance-derivations instances)) + (entries (mapm %store-monad instance->entry + (zip instances derivations)))) + (return (manifest entries)))) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index ee68c21a4c..18c04f05dd 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -30,26 +30,19 @@ #:use-module (guix grafts) #:use-module (guix memoization) #:use-module (guix monads) + #:use-module (guix channels) #:autoload (guix inferior) (open-inferior) #:use-module (guix scripts build) - #:autoload (guix self) (whole-package) #:use-module (guix git) #:use-module (git) #:use-module (gnu packages) - #:autoload (gnu packages ssh) (guile-ssh) - #:autoload (gnu packages tls) (gnutls) #:use-module ((guix scripts package) #:select (build-and-use-profile)) - #:use-module ((guix build utils) - #:select (with-directory-excursion delete-file-recursively)) - #:use-module ((guix build download) - #:select (%x509-certificate-directory)) #:use-module (gnu packages base) #:use-module (gnu packages guile) #:use-module ((gnu packages bootstrap) #:select (%bootstrap-guile)) #:use-module ((gnu packages certs) #:select (le-certs)) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:use-module (srfi srfi-35) #:use-module (srfi srfi-37) @@ -57,9 +50,6 @@ #:use-module (ice-9 vlist) #:export (guix-pull)) -(define %repository-url - (or (getenv "GUIX_PULL_URL") "https://git.savannah.gnu.org/git/guix.git")) - ;;; ;;; Command-line options. @@ -67,9 +57,7 @@ (define %default-options ;; Alist of default option values. - `((repository-url . ,%repository-url) - (ref . (branch . "origin/master")) - (system . ,(%current-system)) + `((system . ,(%current-system)) (substitutes? . #t) (build-hook? . #t) (graft? . #t) @@ -80,6 +68,8 @@ Download and deploy the latest version of Guix.\n")) (display (G_ " --verbose produce verbose output")) + (display (G_ " + -C, --channels=FILE deploy the channels defined in FILE")) (display (G_ " --url=URL download from the Git repository at URL")) (display (G_ " @@ -105,6 +95,9 @@ Download and deploy the latest version of Guix.\n")) (cons* (option '("verbose") #f #f (lambda (opt name arg result) (alist-cons 'verbose? #t result))) + (option '(#\C "channels") #t #f + (lambda (opt name arg result) + (alist-cons 'channel-file arg result))) (option '(#\l "list-generations") #f #t (lambda (opt name arg result) (cons `(query list-generations ,(or arg "")) @@ -142,70 +135,6 @@ Download and deploy the latest version of Guix.\n")) (define indirect-root-added (store-lift add-indirect-root)) -(define %self-build-file - ;; The file containing code to build Guix. This serves the same purpose as - ;; a makefile, and, similarly, is intended to always keep this name. - "build-aux/build-self.scm") - -(define %pull-version - ;; This is the version of the 'guix pull' protocol. It specifies what's - ;; expected from %SELF-BUILD-FILE. The initial version ("0") was when we'd - ;; place a set of compiled Guile modules in ~/.config/guix/latest. - 1) - -(define* (build-from-source source - #:key verbose? commit) - "Return a derivation to build Guix from SOURCE, using the self-build script -contained therein. Use COMMIT as the version string." - ;; Running the self-build script makes it easier to update the build - ;; procedure: the self-build script of the Guix-to-be-installed contains the - ;; right dependencies, build procedure, etc., which the Guix-in-use may not - ;; be know. - (let* ((script (string-append source "/" %self-build-file)) - (build (primitive-load script))) - ;; BUILD must be a monadic procedure of at least one argument: the source - ;; tree. - ;; - ;; Note: BUILD can return #f if it does not support %PULL-VERSION. In the - ;; future we'll fall back to a previous version of the protocol when that - ;; happens. - (build source #:verbose? verbose? #:version commit - #:pull-version %pull-version))) - -(define (whole-package-for-legacy name modules) - "Return a full-blown Guix package for MODULES, a derivation that builds Guix -modules in the old ~/.config/guix/latest style." - (whole-package name modules - - ;; In the "old style", %SELF-BUILD-FILE would simply return a - ;; derivation that builds modules. We have to infer what the - ;; dependencies of these modules were. - (list guile-json guile-git guile-bytestructures - guile-ssh gnutls))) - -(define* (derivation->manifest-entry drv - #:key url branch commit) - "Return a manifest entry for DRV, which represents Guix at COMMIT. Record -URL, BRANCH, and COMMIT as a property in the manifest entry." - (mbegin %store-monad - (what-to-build (list drv)) - (built-derivations (list drv)) - (let ((out (derivation->output-path drv))) - (return (manifest-entry - (name "guix") - (version (string-take commit 7)) - (item (if (file-exists? (string-append out "/bin/guix")) - drv - (whole-package-for-legacy (string-append name "-" - version) - drv))) - (properties - `((source (repository - (version 0) - (url ,url) - (branch ,branch) - (commit ,commit)))))))))) - (define (display-profile-news profile) "Display what's up in PROFILE--new packages, and all that." (match (memv (generation-number profile) @@ -223,8 +152,8 @@ URL, BRANCH, and COMMIT as a property in the manifest entry." #:heading (G_ "New in this revision:\n")))) (_ #t))) -(define* (build-and-install source config-dir - #:key verbose? url branch commit) +(define* (build-and-install instances config-dir + #:key verbose?) "Build the tool from SOURCE, and install it in CONFIG-DIR." (define update-profile (store-lift build-and-use-profile)) @@ -232,15 +161,9 @@ URL, BRANCH, and COMMIT as a property in the manifest entry." (define profile (string-append config-dir "/current")) - (mlet* %store-monad ((drv (build-from-source source - #:commit commit - #:verbose? verbose?)) - (entry (derivation->manifest-entry drv - #:url url - #:branch branch - #:commit commit))) + (mlet %store-monad ((manifest (channel-instances->manifest instances))) (mbegin %store-monad - (update-profile profile (manifest (list entry))) + (update-profile profile manifest) (return (display-profile-news profile))))) (define (honor-lets-encrypt-certificates! store) @@ -426,45 +349,106 @@ and ALIST2 differ, display HEADING upfront." ((numbers ...) (list-generations profile numbers))))))))) +(define (channel-list opts) + "Return the list of channels to use. If OPTS specify a channel file, +channels are read from there; otherwise, if ~/.config/guix/channels.scm +exists, read it; otherwise %DEFAULT-CHANNELS is used. Apply channel +transformations specified in OPTS (resulting from '--url', '--commit', or +'--branch'), if any." + (define file + (assoc-ref opts 'channel-file)) + + (define default-file + (string-append (config-directory) "/channels.scm")) + + (define (load-channels file) + (let ((result (load* file (make-user-module '((guix channels)))))) + (if (and (list? result) (every channel? result)) + result + (leave (G_ "'~a' did not return a list of channels~%") file)))) + + (define channels + (cond (file + (load-channels file)) + ((file-exists? default-file) + (load-channels default-file)) + (else + %default-channels))) + + (define (environment-variable) + (match (getenv "GUIX_PULL_URL") + (#f #f) + (url + (warning (G_ "The 'GUIX_PULL_URL' environment variable is deprecated. +Use '~/.config/guix/channels.scm' instead.")) + url))) + + (let ((ref (assoc-ref opts 'ref)) + (url (or (assoc-ref opts 'repository-url) + (environment-variable)))) + (if (or ref url) + (match channels + ((one) + ;; When there's only one channel, apply '--url', '--commit', and + ;; '--branch' to this specific channel. + (let ((url (or url (channel-url one)))) + (list (match ref + (('commit . commit) + (channel (inherit one) + (url url) (commit commit) (branch #f))) + (('branch . branch) + (channel (inherit one) + (url url) (commit #f) (branch branch))) + (#f + (channel (inherit one) (url url))))))) + (_ + ;; Otherwise bail out. + (leave + (G_ "'--url', '--commit', and '--branch' are not applicable~%")))) + channels))) + (define (guix-pull . args) - (define (use-le-certs? url) - (string-prefix? "https://git.savannah.gnu.org/" url)) - (with-error-handling (with-git-error-handling - (let* ((opts (parse-command-line args %options - (list %default-options))) - (url (assoc-ref opts 'repository-url)) - (ref (assoc-ref opts 'ref)) - (cache (string-append (cache-directory) "/pull"))) + (let* ((opts (parse-command-line args %options + (list %default-options))) + (cache (string-append (cache-directory) "/pull")) + (channels (channel-list opts))) + (cond ((assoc-ref opts 'query) (process-query opts)) ((assoc-ref opts 'dry-run?) #t) ;XXX: not very useful (else (with-store store - (parameterize ((%graft? (assoc-ref opts 'graft?))) + (parameterize ((%graft? (assoc-ref opts 'graft?)) + (%repository-cache-directory cache)) (set-build-options-from-command-line store opts) - ;; For reproducibility, always refer to the LE certificates - ;; when we know we're talking to Savannah. - (when (use-le-certs? url) - (honor-lets-encrypt-certificates! store)) - - (format (current-error-port) - (G_ "Updating from Git repository at '~a'...~%") - url) - - (let-values (((checkout commit) - (latest-repository-commit store url - #:ref ref - #:cache-directory - cache))) + ;; When certificates are already installed, use them. + ;; Otherwise, use the Let's Encrypt certificates, which we + ;; know Savannah uses. + (let ((certs (or (getenv "SSL_CERT_DIR") "/etc/ssl/certs"))) + (unless (file-exists? certs) + (honor-lets-encrypt-certificates! store))) + (let ((instances (latest-channel-instances store channels))) (format (current-error-port) - (G_ "Building from Git commit ~a...~%") - commit) + (N_ "Building from this channel:~%" + "Building from these channels:~%" + (length instances))) + (for-each (lambda (instance) + (let ((channel + (channel-instance-channel instance))) + (format (current-error-port) + " ~10a~a\t~a~%" + (channel-name channel) + (channel-url channel) + (string-take + (channel-instance-commit instance) + 7)))) + instances) (parameterize ((%guile-for-build (package-derivation store @@ -472,13 +456,7 @@ and ALIST2 differ, display HEADING upfront." %bootstrap-guile (canonical-package guile-2.2))))) (run-with-store store - (build-and-install checkout (config-directory) - #:url url - #:branch (match ref - (('branch . branch) - branch) - (_ #f)) - #:commit commit + (build-and-install instances (config-directory) #:verbose? (assoc-ref opts 'verbose?))))))))))))) diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index d11f408d42..7f881355e7 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -38,4 +38,5 @@ guix/upstream.scm guix/ui.scm guix/http-client.scm guix/nar.scm +guix/channels.scm nix/nix-daemon/guix-daemon.cc -- cgit v1.2.3 From 351b6463af81b43840f7725ea6e174dc6499c1d4 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 28 Aug 2018 15:00:43 +0200 Subject: gnu: emacs-elisp-refs: Update to 1.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-elisp-refs): Update to 1.3. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a1ce64ffaa..d8a5c54791 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -9003,7 +9003,7 @@ continue.") (define-public emacs-elisp-refs (package (name "emacs-elisp-refs") - (version "1.2") + (version "1.3") (source (origin (method url-fetch) @@ -9012,14 +9012,15 @@ continue.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0fj6wphwrvbslw46w7wgdk3b4bfr312ygj3lbgr9qw63lpqw26nl")))) + "02nzcn3v14n7mp7q32j5r4wdlpsw3zixzh6cf0cdyarfir6dly3p")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) ("emacs-f" ,emacs-f) ("emacs-list-utils" ,emacs-list-utils) ("emacs-loop" ,emacs-loop) - ("emacs-s" ,emacs-s))) + ("emacs-s" ,emacs-s) + ("emacs-shut-up" ,emacs-shut-up))) (home-page "https://github.com/Wilfred/elisp-refs") (synopsis "Find callers of elisp functions or macros") (description "Find references to functions, macros or variables. Unlike a -- cgit v1.2.3 From b21a55a9f218c32cf9df561ad0e8d10d1b596cf0 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 28 Aug 2018 15:01:32 +0200 Subject: gnu: emacs-helpful: Update to 0.13. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-helpful): Update to 0.13. Signed-off-by: Ludovic Courtès --- 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 d8a5c54791..2b8796f72e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -9660,7 +9660,7 @@ downloading manager for Emacs.") (define-public emacs-helpful (package (name "emacs-helpful") - (version "0.1") + (version "0.13") (source (origin (method url-fetch) (uri (string-append @@ -9669,7 +9669,7 @@ downloading manager for Emacs.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "16dx566qzrjj0bf43lnw7h1qlvgs94brqplamw8kppp2ylr72qs9")))) + "11kj04y1fa3vnw2991cyqf6adz6bb3hlrdkvypjnmpb0s64q64b6")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-elisp-refs" ,emacs-elisp-refs))) -- cgit v1.2.3 From 2bd6ed9e4c32928312eee9cd71137d5adf09f955 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sun, 2 Sep 2018 07:47:05 +0800 Subject: gnu: haskell-mode: Fix test failure. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Thanks to Jack Hill for exploring different solutions at . * gnu/packages/patches/haskell-mode-unused-variables.patch, gnu/packages/patches/haskell-mode-make-check.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/emacs.scm (haskell-mode)[source]: Use them. [arguments]: Adjust 'pre-build' phase to embed file name. Co-authored-by: Ludovic Courtès --- gnu/local.mk | 2 + gnu/packages/emacs.scm | 17 +++++---- gnu/packages/patches/haskell-mode-make-check.patch | 35 +++++++++++++++++ .../patches/haskell-mode-unused-variables.patch | 44 ++++++++++++++++++++++ 4 files changed, 91 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/haskell-mode-make-check.patch create mode 100644 gnu/packages/patches/haskell-mode-unused-variables.patch diff --git a/gnu/local.mk b/gnu/local.mk index 91de38c5a3..d929ec0da8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -791,6 +791,8 @@ dist_patch_DATA = \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/handbrake-pkg-config-path.patch \ + %D%/packages/patches/haskell-mode-unused-variables.patch \ + %D%/packages/patches/haskell-mode-make-check.patch \ %D%/packages/patches/hdf4-architectures.patch \ %D%/packages/patches/hdf4-reproducibility.patch \ %D%/packages/patches/hdf4-shared-fortran.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2b8796f72e..08554280c7 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -646,7 +646,11 @@ only a handful of functions that are not resource-specific.") "https://github.com/haskell/haskell-mode/archive/v" version ".tar.gz")) (sha256 - (base32 "0g6lcjw7lcgavv3yrd8xjcyqgfyjl787y32r1z14amw2f009m78h")))) + (base32 "0g6lcjw7lcgavv3yrd8xjcyqgfyjl787y32r1z14amw2f009m78h")) + (patches + (search-patches ; backport test failure fixes + "haskell-mode-unused-variables.patch" + "haskell-mode-make-check.patch")))) (inputs `(("emacs-el-search" ,emacs-el-search) ; for tests ("emacs-stream" ,emacs-stream))) ; for tests @@ -686,12 +690,11 @@ only a handful of functions that are not resource-specific.") (_ "")) inputs))) (substitute* (find-files "." "\\.el") (("/bin/sh") sh)) - (substitute* "tests/haskell-code-conventions.el" - ;; Function name recently changed in "emacs-el-search". - (("el-search--search-pattern") "el-search-forward") - ;; Don't contact home. - (("\\(when \\(>= emacs-major-version 25\\)") - "(require 'el-search) (when nil")) + ;; embed filename to fix test failure + (let ((file "tests/haskell-cabal-tests.el")) + (substitute* file + (("\\(buffer-file-name\\)") + (format #f "(or (buffer-file-name) ~s)" file)))) #t))) (replace 'install diff --git a/gnu/packages/patches/haskell-mode-make-check.patch b/gnu/packages/patches/haskell-mode-make-check.patch new file mode 100644 index 0000000000..a4d4d525f2 --- /dev/null +++ b/gnu/packages/patches/haskell-mode-make-check.patch @@ -0,0 +1,35 @@ +Copied from upstream repository. +Hunk #2 is removed since it cannot be applied and it is not needed. + +From 7cead7137bf54851c1b7df5a3854351296d21276 Mon Sep 17 00:00:00 2001 +From: Vasantha Ganesh K +Date: Thu, 22 Jun 2017 23:38:40 +0530 +Subject: [PATCH] removed `check-conventions' from make + +--- + Makefile | 7 +- + tests/haskell-code-conventions.el | 165 ------------------------------ + 2 files changed, 1 insertion(+), 171 deletions(-) + delete mode 100644 tests/haskell-code-conventions.el + +diff --git a/Makefile b/Makefile +index b2c89d6..aa907c5 100644 +--- a/Makefile ++++ b/Makefile +@@ -79,12 +79,7 @@ build-$(EMACS_VERSION)/build-flag : build-$(EMACS_VERSION) $(patsubst %.el,build + check-%: tests/%-tests.el + $(BATCH) -l "$<" -f ert-run-tests-batch-and-exit; + +-check: compile $(AUTOLOADS) check-ert check-conventions +- +-check-conventions : +- $(BATCH) -l tests/haskell-code-conventions.el \ +- -f haskell-check-conventions-batch-and-exit +- @echo "conventions are okay" ++check: compile $(AUTOLOADS) check-ert + + check-ert: $(ELCHECKS) + $(BATCH) --eval "(when (= emacs-major-version 24) \ +-- +2.18.0 + diff --git a/gnu/packages/patches/haskell-mode-unused-variables.patch b/gnu/packages/patches/haskell-mode-unused-variables.patch new file mode 100644 index 0000000000..b175fae28c --- /dev/null +++ b/gnu/packages/patches/haskell-mode-unused-variables.patch @@ -0,0 +1,44 @@ +Copied verbatim from upstream repository. + +From cee22450ee30e79952f594796721dc6b17798ee6 Mon Sep 17 00:00:00 2001 +From: Sascha Wilde +Date: Fri, 23 Sep 2016 15:35:59 +0200 +Subject: [PATCH] Removed unused lexical variables. + +--- + haskell-lexeme.el | 3 +-- + haskell-process.el | 4 +--- + 2 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/haskell-lexeme.el b/haskell-lexeme.el +index 4256a79..b832560 100644 +--- a/haskell-lexeme.el ++++ b/haskell-lexeme.el +@@ -138,8 +138,7 @@ When match is successful, match-data will contain: + (match-text 2) - whole qualified identifier + (match-text 3) - unqualified part of identifier + (match-text 4) - closing backtick" +- (let ((begin (point)) +- (match-data-old (match-data)) ++ (let ((match-data-old (match-data)) + first-backtick-start + last-backtick-start + qid-start +diff --git a/haskell-process.el b/haskell-process.el +index b4efba2..4f3f859 100644 +--- a/haskell-process.el ++++ b/haskell-process.el +@@ -160,9 +160,7 @@ HPTYPE is the result of calling `'haskell-process-type`' function." + (defun haskell-process-log (msg) + "Effective append MSG to the process log (if enabled)." + (when haskell-process-log +- (let* ((append-to (get-buffer-create "*haskell-process-log*")) +- (windows (get-buffer-window-list append-to t t)) +- move-point-in-windows) ++ (let* ((append-to (get-buffer-create "*haskell-process-log*"))) + (with-current-buffer append-to + ;; point should follow insertion so that it stays at the end + ;; of the buffer +-- +2.18.0 + -- cgit v1.2.3 From 391097782311c82c04b171db7373a0bbfc1d8653 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 2 Sep 2018 19:14:37 +0300 Subject: gnu: monitoring.scm: Fix copyright line. This is a follow-up to ead46692ec8a17ed9cf668131343d7cf1b3725e5. --- gnu/packages/monitoring.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index a59e51a5e3..12d736a76a 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Gábor Boskovits w +;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. -- cgit v1.2.3 From 647465ace9fdb474c924585c18e4056fe12a6052 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 2 Sep 2018 16:56:05 +0300 Subject: gnu: jellyfish: Update to 2.2.10. * gnu/packages/bioinformatics.scm (jellyfish): Update to 2.2.10. [supported-systems]: Add aarch64-linux, mips64el-linux. --- gnu/packages/bioinformatics.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 22a00894c2..f60fc4c84c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3602,7 +3602,7 @@ experiments and provide highly stable thresholds based on reproducibility.") (define-public jellyfish (package (name "jellyfish") - (version "2.2.7") + (version "2.2.10") (source (origin (method url-fetch) (uri (string-append "https://github.com/gmarcais/Jellyfish/" @@ -3610,7 +3610,7 @@ experiments and provide highly stable thresholds based on reproducibility.") "/jellyfish-" version ".tar.gz")) (sha256 (base32 - "1a1iwq9pq54k2m9ypvwl5s0bqfl64gwh9dx5af9i382ajas2016q")))) + "1k4pc3fvv6w1km2yph4m5sd78fbxp21d6xyzgmy0gjihzc6mb249")))) (build-system gnu-build-system) (outputs '("out" ;for library "ruby" ;for Ruby bindings @@ -3647,8 +3647,8 @@ DNA sequences. It outputs its k-mer counts in a binary format, which can be translated into a human-readable text format using the @code{jellyfish dump} command, or queried for specific k-mers with @code{jellyfish query}.") (home-page "http://www.genome.umd.edu/jellyfish.html") - ;; From their website: JELLYFISH runs on 64-bit Intel-compatible processors - (supported-systems '("x86_64-linux")) + ;; JELLYFISH seems to be 64-bit only. + (supported-systems '("x86_64-linux" "aarch64-linux" "mips64el-linux")) ;; The combined work is published under the GPLv3 or later. Individual ;; files such as lib/jsoncpp.cpp are released under the Expat license. (license (list license:gpl3+ license:expat)))) -- cgit v1.2.3 From aa613d71ece1ae56431b788c9aba55fdacd7a22f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 3 Sep 2018 08:18:50 +0200 Subject: gnu: openrct2: Update to 0.2.1. * gnu/packages/games.scm (openrct2-objects): Update to 1.0.6. * gnu/packages/games.scm (openrct2): Update to 0.2.1. --- gnu/packages/games.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3c5063f69b..728f763806 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2470,7 +2470,7 @@ Transport Tycoon Deluxe.") (define openrct2-objects (package (name "openrct2-objects") - (version "1.0.2") + (version "1.0.6") (source (origin (method url-fetch) @@ -2479,7 +2479,7 @@ Transport Tycoon Deluxe.") (file-name (string-append name "-" version ".zip")) (sha256 (base32 - "1z92afhbv13j1ig6fz0x8w9vdmfchssv16vwwhb0vj40pn1g1rwy")))) + "00kfy95zx6g4ldr6br5p7bwkwfx6pw9v78fd3rvghjnwyvf5fhki")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -2511,7 +2511,7 @@ Transport Tycoon Deluxe.") (define-public openrct2 (package (name "openrct2") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) @@ -2519,7 +2519,7 @@ Transport Tycoon Deluxe.") version ".tar.gz")) (sha256 (base32 - "1yrbjra27n2xxb1x47v962lc3qi8gwm5ws4f97952nvn533zrwxz")) + "1fxzk037xphpyk7vv5jfrcz739zrj86p43pnf5gjjv9rjxwv7m8f")) (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 26baaaf49b18c84f56bfacd0760d62b1e9ccf04c Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 3 Sep 2018 08:19:15 +0200 Subject: gnu: c-toxcore: Update to 0.2.7. * gnu/packages/messaging.scm (c-toxcore): Update to 0.2.7. --- 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 b03cb8f03a..afbb458ad9 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -873,7 +873,7 @@ protocols.") (define-public c-toxcore (package (name "c-toxcore") - (version "0.2.6") + (version "0.2.7") (source (origin (method url-fetch) @@ -882,7 +882,7 @@ protocols.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "04b3ifkj64yy06vph0hlq24mw9fh24zmq1qdf40fmj24vvgfmjpl")))) + "1lcw979zakyb5kzy8yfk87js3bzfz3k2jxidda6ga6ljdnqdpxmy")))) (arguments `(#:tests? #f)) ; FIXME: Testsuite seems to stay stuck on test 3. Disable ; for now. -- cgit v1.2.3 From 02ddafef5516c23caa91c821926774f618e48ad0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 3 Sep 2018 13:47:01 +0200 Subject: gnu: python-scipy: Disable broken tests. * gnu/packages/python.scm (python-scipy)[arguments]: Skip two broken tests. --- gnu/packages/python.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fd1fdbf82d..9fdadfbd73 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3755,6 +3755,18 @@ functions.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-broken-tests + (lambda _ + (substitute* "scipy/sparse/linalg/dsolve/tests/test_linsolve.py" + (("^( +)def test_threads_parallel\\(self\\):" m indent) + (string-append indent + "@pytest.mark.skip(reason=\"Disabled by Guix\")\n" + m))) + (substitute* "scipy/sparse/linalg/eigen/arpack/tests/test_arpack.py" + (("^def test_parallel_threads\\(\\):" m) + (string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n" + m))) + #t)) (add-before 'build 'configure-openblas (lambda* (#:key inputs #:allow-other-keys) (call-with-output-file "site.cfg" -- cgit v1.2.3 From 290bef39f689f8c36807533214bc1a450be32522 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 3 Sep 2018 13:10:58 +0300 Subject: gnu: efl: Update to 1.21.0. * gnu/packages/enlightenment.scm (efl): Update to 1.21.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 15ec492793..0cc9bb9575 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -62,7 +62,7 @@ (define-public efl (package (name "efl") - (version "1.20.7") + (version "1.21.0") (source (origin (method url-fetch) (uri (string-append @@ -70,7 +70,7 @@ version ".tar.xz")) (sha256 (base32 - "1zkn5ix81xck3n84dxvkjh4alwc6zj8x989d0zqi5c6ppijvgadh")))) + "0jxfrcz2aq1synxzd6sh9nhxz7fg9qgz0idr8zj6gaiplmwbwrby")))) (outputs '("out" ; 49 MB "include")) ; 17 MB (build-system gnu-build-system) -- cgit v1.2.3 From 0cc64476691dd47b79d93a38c89c488b1c985323 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 3 Sep 2018 17:32:21 +0300 Subject: gnu: python-efl: Update to 1.21.0. * gnu/packages/enlightenment.scm (python-efl): Update to 1.21.0. [source]: Don't use pypi source. [arguments]: Delete network tests. --- gnu/packages/enlightenment.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 0cc9bb9575..40a5ec1cf4 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -312,35 +312,36 @@ embedded systems.") (define-public python-efl (package (name "python-efl") - (version "1.20.0") + (version "1.21.0") (source (origin (method url-fetch) - (uri (list - (pypi-uri "python-efl" version) - (string-append "http://download.enlightenment.org/rel/bindings/" - "python/python-efl-" version ".tar.gz"))) + (uri (string-append "http://download.enlightenment.org/rel/bindings/" + "python/python-efl-" version ".tar.xz")) (sha256 (base32 - "1680pgpf501nhbc9arm0nfj6rpcw17aryh0pgmmmszxlgpifpdzy")))) + "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases - (replace 'build - (lambda _ - (zero? - (system* "env" "ENABLE_CYTHON=1" "python" "setup.py" "build")))) + (replace 'build + (lambda _ + (setenv "ENABLE_CYTHON" "1") + (invoke "python" "setup.py" "build"))) (add-before 'build 'set-flags - (lambda _ - (setenv "CFLAGS" - (string-append "-I" (assoc-ref %build-inputs "python-dbus") - "/include/dbus-1.0")) - #t)) + (lambda _ + (setenv "CFLAGS" + (string-append "-I" (assoc-ref %build-inputs "python-dbus") + "/include/dbus-1.0")) + #t)) (add-before 'check 'set-environment (lambda _ ;; Some tests require write access to HOME. (setenv "HOME" "/tmp") + ;; These tests try to connect to the internet. + (delete-file "tests/ecore/test_09_file_download.py") + (delete-file "tests/ecore/test_11_con.py") #t))))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From fb458bf3bc98805dfb4a4c16cf4ca9d6d394495c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 3 Sep 2018 17:03:50 +0200 Subject: gnu: sudo: Update to 1.8.25. * gnu/packages/admin.scm (sudo): Update to 1.8.25. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3d58780b95..8807ab18b5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -963,7 +963,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.8.24") + (version "1.8.25") (source (origin (method url-fetch) (uri @@ -973,7 +973,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "1s2v49n905wf3phmdnaa6v1dwck2lrcin0flg85z7klf35x5b25l")) + "0hfw6pcwjvv1vvnhb4n1p210306jm4npz99p9cfhbd33yrhhzkwx")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From cfcfc6ab627cbba2d5cd7893352e77d5e3667175 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 31 Aug 2018 16:53:27 +0200 Subject: Fix some typos. * doc/guix.texi (Sound Services, DNS Services): Fix typos. * gnu/packages/cpp.scm (json-modern-cxx)[description]: Likewise. * gnu/packages/emacs.scm (emacs-fancy-narrow)[synopsis, description]: Likewise. Edit & mark up while we're here. * gnu/packages/mail.scm (alot)[synopsis, description]: Ditto. --- doc/guix.texi | 4 ++-- gnu/packages/cpp.scm | 2 +- gnu/packages/emacs.scm | 11 ++++++----- gnu/packages/mail.scm | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ad82c67932..307f915dbb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -13539,7 +13539,7 @@ Users need to be in the @code{lp} group to access the D-Bus service. The @code{(gnu services sound)} module provides a service to configure the Advanced Linux Sound Architecture (ALSA) system, which making PulseAudio the -prefered ALSA output driver. +preferred ALSA output driver. @deffn {Scheme Variable} alsa-service-type This is the type for the @uref{https://alsa-project.org/, Advanced Linux Sound @@ -17425,7 +17425,7 @@ When true, don't read the hostnames in /etc/hosts. @item @code{port} (default: @code{53}) The port to listen on. Setting this to zero completely disables DNS -funtion, leaving only DHCP and/or TFTP. +responses, leaving only DHCP and/or TFTP functions. @item @code{local-service?} (default: @code{#t}) Accept DNS queries only from hosts whose address is on a local subnet, diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 0160e42f6a..d591e6a884 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -236,7 +236,7 @@ as ordering relation.") (build-system cmake-build-system) (synopsis "JSON parser and printer library for C++") (description "JSON for Modern C++ is a C++ JSON library that provides -intutive syntax and trivial integration.") +intuitive syntax and trivial integration.") (license license:expat))) (define-public xtl diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 08554280c7..8f0c564f88 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -9567,11 +9567,12 @@ duplicate hook and function names further into a single declarative call.") "0rf2rnzg82pdqch041yyx3f9ddixffkk9s2ydzg8hwy66sg3385n")))) (build-system emacs-build-system) (home-page "https://github.com/Malabarba/fancy-narrow/releases") - (synopsis "Immitate narrow-to-region with more eye-candy") - (description "Unlike narrow-to-region, which completely hides text outside -the narrowed region, this package simply deemphasizes the text, makes it -readonly, and makes it unreachable. This leads to a much more natural -feeling, where the region stays static (instead of being brutally moved to a + (synopsis "Imitate @code{narrow-to-region} with more eye candy") + (description + "Unlike @code{narrow-to-region}, which completely hides text outside +the narrowed region, this package simply de-emphasizes the text, makes it +read-only, and makes it unreachable. This leads to a much more natural +feeling where the region stays static (instead of being brutally moved to a blank slate) and is clearly highlighted with respect to the rest of the buffer.") (license license:gpl2+))) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 1f7e971d60..4944dd7622 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -706,9 +706,9 @@ attachments, create new maildirs, and so on.") ("python2-pygpgme" ,python2-pygpgme) ("python2-notmuch" ,python2-notmuch))) (home-page "https://github.com/pazz/alot") - (synopsis "Commandline MUA using notmuch") + (synopsis "Command-line MUA using @code{notmuch}") (description - "Alot is an experimental terminal mail user agent (MUA) based on + "Alot is an experimental terminal mail user agent (@dfn{MUA}) based on @code{notmuch} mail. It is written in Python using the @code{urwid} toolkit.") (license gpl3+))) -- cgit v1.2.3 From b619b7f67b9ebc7bc5617ccbf6c638bfa9a0d481 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 30 Aug 2018 21:57:36 +0200 Subject: gnu: libircclient: Update to 1.10. * gnu/packages/messaging.scm (libircclient): Update to 1.10. --- gnu/packages/messaging.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index afbb458ad9..4d7cc6923e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1565,7 +1565,7 @@ using ncurses and libmesode, inspired by Irssi.") (define-public libircclient (package (name "libircclient") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) @@ -1573,7 +1573,7 @@ using ncurses and libmesode, inspired by Irssi.") version "/libircclient-" version ".tar.gz")) (sha256 (base32 - "0r60i76jh4drjh2jgp5sx71chagqllmkaq49zv67nrhqwvp9ghw1")))) + "0b9wa0h3xc31wpqlvgxgnvqp5wgx3kwsf5s9432m5cj8ycx6zcmv")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) @@ -1584,8 +1584,7 @@ using ncurses and libmesode, inspired by Irssi.") "--enable-shared" "--enable-ipv6" "--enable-openssl") - ;; no test suite - #:tests? #f)) + #:tests? #f)) ; no test suite (home-page "https://www.ulduzsoft.com/libircclient/") (synopsis "Library implementing the client IRC protocol") (description "Libircclient is a library which implements the client IRC -- cgit v1.2.3 From 38a8cd329d82fdd5f5a1b3b4813869294dbf6544 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 31 Aug 2018 10:24:21 +0200 Subject: gnu: python-nbxmpp: Update to 0.6.7. * gnu/packages/messaging.scm (python-nbxmpp): Update to 0.6.7. --- 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 4d7cc6923e..42a0847b7a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -548,14 +548,14 @@ simultaneously and therefore appear under the same nickname on IRC.") (define-public python-nbxmpp (package (name "python-nbxmpp") - (version "0.6.6") + (version "0.6.7") (source (origin (method url-fetch) (uri (pypi-uri "nbxmpp" version)) (sha256 (base32 - "0bp60syqc3qp2i28phvadxlpwizjbr6bxw4m363p9yn5fl687qnh")))) + "0fas4iawjfdmkz8vr042wpq6b2qispi6fy35g4a62jw50jb1saav")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; no tests -- cgit v1.2.3 From a5896da34e93754a7b69b2adf049444833b1a402 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 3 Sep 2018 19:33:14 +0300 Subject: gnu: gnu-pw-mgr: Update to 2.4.2. * gnu/packages/gnu-pw-mgr.scm (gnu-pw-mgr): Update to 2.4.2. --- gnu/packages/gnu-pw-mgr.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnu-pw-mgr.scm b/gnu/packages/gnu-pw-mgr.scm index 38f9e8187a..a56bc09e61 100644 --- a/gnu/packages/gnu-pw-mgr.scm +++ b/gnu/packages/gnu-pw-mgr.scm @@ -30,7 +30,7 @@ (define-public gnu-pw-mgr (package (name "gnu-pw-mgr") - (version "2.3.3") + (version "2.4.2") (source (origin (method url-fetch) @@ -38,7 +38,7 @@ version ".tar.xz")) (sha256 (base32 - "04xh38j7l0sfnb01kp05xc908pvqfc0lph94k7n9bi46zy3qy7ma")))) + "1yvdzc5w37qrjrkby5699ygj9bhkvgi3zk9k9jcjry1j6b7wdl17")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 915620619954ff100ebc097f048adcc65715b0a0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 12:08:20 +0200 Subject: gnu: simplescreenrecorder: Build against modular Qt. * gnu/packages/video.scm (simplescreenrecorder)[inputs]: Remove QT. Add QTBASE and QTX11EXTRAS. --- gnu/packages/video.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6825cd7d2d..3e074e6c3f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2217,7 +2217,8 @@ making @dfn{screencasts}.") ("jack" ,jack-1) ("libxi" ,libxi) ("pulseaudio" ,pulseaudio) - ("qt" ,qt))) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments `(#:configure-flags -- cgit v1.2.3 From 1ae2c577a6c79ac2914e268ffca89459b196dcb2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 15:09:50 +0200 Subject: gnu: ilmbase: Update to 2.3.0. * gnu/packages/graphics.scm (ilmbase): Update to 2.3.0. [source](uri): Change to new download location. --- gnu/packages/graphics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 6632c9a1a3..e5ec318e1b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -228,14 +228,15 @@ many more.") (define-public ilmbase (package (name "ilmbase") - (version "2.2.1") + (version "2.3.0") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/openexr/ilmbase-" + (uri (string-append "https://github.com/openexr/openexr/releases" + "/download/v" version "/ilmbase-" version ".tar.gz")) (sha256 (base32 - "17k0hq19wplx9s029kjrq6c51x2ryrfmaavcappkd0g67gk0dhna")) + "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5")) (patches (search-patches "ilmbase-fix-tests.patch")))) (build-system gnu-build-system) (home-page "http://www.openexr.com/") -- cgit v1.2.3 From fcde1d27bb668f3a5972b31031bdb19f5d8ef68e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 15:15:26 +0200 Subject: gnu: openexr: Update to 2.3.0. * gnu/packages/graphics.scm (openexr): Update to 2.3.0. [source](uri): Change to new download location. [source](snippet): Remove workaround. [source](patches): Remove. * gnu/packages/patches/openexr-missing-samples.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/graphics.scm | 17 +++++----------- gnu/packages/patches/openexr-missing-samples.patch | 23 ---------------------- 3 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 gnu/packages/patches/openexr-missing-samples.patch diff --git a/gnu/local.mk b/gnu/local.mk index d929ec0da8..1924ae9467 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1000,7 +1000,6 @@ dist_patch_DATA = \ %D%/packages/patches/ola-readdir-r.patch \ %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ - %D%/packages/patches/openexr-missing-samples.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openldap-CVE-2017-9287.patch \ %D%/packages/patches/openocd-nrf52.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index e5ec318e1b..9c2869c12b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -320,29 +320,22 @@ graphics.") (define-public openexr (package (name "openexr") - (version "2.2.1") + (version "2.3.0") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/openexr/openexr-" + (uri (string-append "https://github.com/openexr/openexr/releases" + "/download/v" version "/openexr-" version ".tar.gz")) (sha256 (base32 - "1kdf2gqznsdinbd5vcmqnif442nyhdf9l7ckc51410qm2gv5m6lg")) + "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x")) (modules '((guix build utils))) (snippet '(begin (substitute* (find-files "." "tmpDir\\.h") (("\"/var/tmp/\"") "\"/tmp/\"")) - - ;; Install 'ImfStdIO.h'. Reported at - ;; - ;; and . - (substitute* "IlmImf/Makefile.in" - (("ImfIO\\.h") - "ImfIO.h ImfStdIO.h")) - #t)) - (patches (search-patches "openexr-missing-samples.patch")))) + #t)))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/openexr-missing-samples.patch b/gnu/packages/patches/openexr-missing-samples.patch deleted file mode 100644 index 16cc9bb625..0000000000 --- a/gnu/packages/patches/openexr-missing-samples.patch +++ /dev/null @@ -1,23 +0,0 @@ -This patch comments out tests that rely on files that are missing -from the source tarball. - ---- openexr-2.2.0/IlmImfTest/testSampleImages.cpp 2015-02-25 16:19:21.565105625 +0100 -+++ openexr-2.2.0/IlmImfTest/testSampleImages.cpp 2015-02-25 16:21:46.394128206 +0100 -@@ -162,16 +162,6 @@ testSampleImages (const std::string&) - compareImages (ILM_IMF_TEST_IMAGEDIR "comp_b44.exr", - ILM_IMF_TEST_IMAGEDIR "comp_b44_piz.exr"); - -- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr", -- ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr"); -- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr", -- ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr"); -- -- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr", -- ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr"); -- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr", -- ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr"); -- - - cout << "ok\n" << endl; - } - -- cgit v1.2.3 From 84aa18ff7ff06a2738187d5911dafeb3df39a679 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 15:54:09 +0200 Subject: gnu: re2: Update to 2018-09-01. * gnu/packages/regex.scm (re2): Update to 2018-09-01. --- gnu/packages/regex.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index 3f501a0736..c9d9e8a359 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -29,7 +29,7 @@ (define-public re2 (package (name "re2") - (version "2018-08-01") + (version "2018-09-01") (home-page "https://github.com/google/re2") (source (origin (method url-fetch) @@ -37,7 +37,7 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0lmpc3cb9bvc27fp27jacx6qjn176v8z8p7k70byc092q68mr6bw")))) + "0hygr88hvy7if1i45m5r6x60zf73439j2fwzw7wwcw9gb01v690l")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From cbd7c65709b1195de9196772c7f8ae6863797b35 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Sep 2018 15:35:23 +0200 Subject: gnu: ppp: Return #t from all phases. * gnu/packages/samba.scm (ppp)[arguments]: Return #t from phase. --- gnu/packages/samba.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 345655d584..a6d6ee30cd 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -417,7 +417,8 @@ key-value pair databases and a real LDAP database.") (("/usr/include/crypt\\.h") (string-append libc "/include/crypt.h")) (("/usr/include/pcap-bpf.h") - (string-append libpcap "/include/pcap-bpf.h"))))))))) + (string-append libpcap "/include/pcap-bpf.h"))) + #t)))))) (inputs `(("libpcap" ,libpcap))) (synopsis "Implementation of the Point-to-Point Protocol") -- cgit v1.2.3 From 1f7d142000ad15d037cf3d934f7b6233f3a5b434 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 19:27:01 +0200 Subject: gnu: python-matplotlib: Update to 2.2.3. * gnu/packages/python.scm (python-matplotlib): Update to 2.2.3. --- 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 9fdadfbd73..8cf5550f81 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3468,14 +3468,14 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. (define-public python-matplotlib (package (name "python-matplotlib") - (version "2.2.2") + (version "2.2.3") (source (origin (method url-fetch) (uri (pypi-uri "matplotlib" version)) (sha256 (base32 - "1s6dv225w3k4fv52h8lfjc7qq5y56i9755ayx0mz48ddi99fzisd")))) + "1rcc7x9ig3hpchkc4cwdvym3y451w74275fxr455zkfagrsvymbk")))) (build-system python-build-system) (propagated-inputs ; the following packages are all needed at run time `(("python-cycler" ,python-cycler) -- cgit v1.2.3 From 91bb495b85e9870773f9a4785f325c0cc9a2c3d1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Sep 2018 19:00:59 +0200 Subject: gnu: arpack-ng: Drop redundant phase. * gnu/packages/maths.scm (arpack-ng)[arguments]: Remove. --- gnu/packages/maths.scm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 377e47bc58..36a77b1f0a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -470,11 +470,6 @@ computing convex hulls.") (base32 "0f8jx3fifmj9qdp289zr7r651y1q48k1jya859rqxq62mvis7xsh")))) (build-system gnu-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autoreconf - (lambda _ - (invoke "autoreconf" "-vfi")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From c702749dfd47ea6983768cd5b8cf828898445af0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Sep 2018 19:01:32 +0200 Subject: gnu: arpack-ng: Update to 3.6.2. * gnu/packages/maths.scm (arpack-ng): Update to 3.6.2. --- 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 36a77b1f0a..50c0a320e0 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -459,7 +459,7 @@ computing convex hulls.") (define-public arpack-ng (package (name "arpack-ng") - (version "3.5.0") + (version "3.6.2") (home-page "https://github.com/opencollab/arpack-ng") (source (origin @@ -468,7 +468,7 @@ computing convex hulls.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0f8jx3fifmj9qdp289zr7r651y1q48k1jya859rqxq62mvis7xsh")))) + "16jrvdl0gh78rrfnvrcxwys4slwfh6qmwwjhfc9d6vwrvq184g37")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 65a58f390704878e8adc8712786333ebd79c6a64 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 3 Sep 2018 15:42:42 +0200 Subject: gnu: ppp: Use OpenSSL for cryptography. * gnu/packages/samba.scm (ppp)[source](patches): Add upstream patch. [inputs]: Add OPENSSL. [arguments]: Add substitution for OpenSSL headers. --- gnu/packages/samba.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index a6d6ee30cd..65d41a2b67 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -400,6 +400,18 @@ key-value pair databases and a real LDAP database.") (method url-fetch) (uri (string-append "https://www.samba.org/ftp/ppp/ppp-" version ".tar.gz")) + (patches + (list (origin + ;; Use OpenSSL for cryptography instead of the obsolete glibc + ;; crypto functions that were removed in glibc 2.28. + (method url-fetch) + (uri (string-append "https://github.com/paulusmack/ppp/commit/" + "3c7b86229f7bd2600d74db14b1fe5b3896be3875" + ".patch")) + (file-name "ppp-use-openssl-crypto.patch") + (sha256 + (base32 + "0qlbi247lx3injpy8a1gcij9yilik0vfaibkpvdp88k3sa1rs69z"))))) (sha256 (base32 "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02")))) @@ -412,15 +424,19 @@ key-value pair databases and a real LDAP database.") (add-before 'configure 'patch-Makefile (lambda* (#:key inputs #:allow-other-keys) (let ((libc (assoc-ref inputs "libc")) + (openssl (assoc-ref inputs "openssl")) (libpcap (assoc-ref inputs "libpcap"))) (substitute* "pppd/Makefile.linux" (("/usr/include/crypt\\.h") (string-append libc "/include/crypt.h")) + (("/usr/include/openssl") + (string-append openssl "/include/openssl")) (("/usr/include/pcap-bpf.h") (string-append libpcap "/include/pcap-bpf.h"))) #t)))))) (inputs - `(("libpcap" ,libpcap))) + `(("libpcap" ,libpcap) + ("openssl" ,(@ (gnu packages tls) openssl)))) (synopsis "Implementation of the Point-to-Point Protocol") (home-page "https://ppp.samba.org/") (description -- cgit v1.2.3 From 38fe6449c0d1fac6f64fcbabfbc94943752830b9 Mon Sep 17 00:00:00 2001 From: Benjamin Slade Date: Mon, 3 Sep 2018 23:19:30 +0200 Subject: gnu: Add transset-df. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xorg.scm (transset-df): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/xorg.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 3875765d25..c89661272b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2018 Benjamin Slade ;;; ;;; This file is part of GNU Guix. ;;; @@ -6196,3 +6197,44 @@ and embedded platforms.") cursor to any point on the screen with a few key strokes. It also simulates mouse click. You can do everything mouse can do with a keyboard.") (license license:bsd-3))) + +(define-public transset-df + (package + (name "transset-df") + (version "6") + (source (origin + (method url-fetch) + (uri (string-append "http://forchheimer.se/" name "/" name "-" version + ".tar.gz")) + (sha256 + (base32 + "1vnykwwrv75miigbhmcwxniw8xnhsdyzhqydip2m9crxi2lwhqs5")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'setenv + (lambda _ + (setenv "CC" (which "gcc")) + #t)) + (delete 'configure) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "transset-df" bin) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs `(("libxcomposite" ,libxcomposite) + ("libxdamager" ,libxdamage) + ("libxrender" ,libxrender))) + (synopsis "Set the transparency of X11 windows") + (description "The @command{transset-df} command allows you to set the +opacity of X11 windows. This patched version of X.Org's @command{transset} +adds functionality, including: selecting window by clicking (as transset), +selecting windows by pointing select actual focused X11 window, selecting by +window name or id, forcing toggle, increase or decrease opacity.") + (home-page "http://forchheimer.se/transset-df/") + (license license:x11))) -- cgit v1.2.3 From 5108c18e7e163c3b45568f1f4c3416581a2cea19 Mon Sep 17 00:00:00 2001 From: Raphaël Mélotte Date: Mon, 3 Sep 2018 10:20:06 +0200 Subject: gnu: perl: Add support for cross-compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/perl.scm (perl): use cross-libc when cross-compiling Signed-off-by: Ludovic Courtès --- gnu/packages/perl.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 4d70e019b9..b10be9567d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -48,6 +48,7 @@ #:use-module (guix utils) ;substitute-keyword-arguments for perl-5.26.2 #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages cross-base) #:use-module (gnu packages freedesktop) #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-web) @@ -79,7 +80,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"))) @@ -128,7 +129,10 @@ (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 fd95f37f361ad9444fb13faebda29662d3bf7be6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 3 Sep 2018 23:49:06 +0200 Subject: Revert "gnu: perl: Add support for cross-compilation" This reverts commit 5108c18e7e163c3b45568f1f4c3416581a2cea19, which was accidentally committed. --- gnu/packages/perl.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index b10be9567d..4d70e019b9 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -48,7 +48,6 @@ #:use-module (guix utils) ;substitute-keyword-arguments for perl-5.26.2 #:use-module (gnu packages base) #:use-module (gnu packages compression) - #:use-module (gnu packages cross-base) #:use-module (gnu packages freedesktop) #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-web) @@ -80,7 +79,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"))) @@ -129,10 +128,7 @@ (add-after 'install 'remove-extra-references (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (libc (assoc-ref inputs - (if ,(%current-target-system) - "cross-libc" - "libc"))) + (libc (assoc-ref inputs "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 9c4b522f1572db2c5dab81976982b95d5da51e6e Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 24 Aug 2018 00:36:15 +0530 Subject: gnu: Add ghc-wcwidth. * gnu/packages/haskell.scm (ghc-wcwidth): New variable. --- gnu/packages/haskell.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index a07bb049a2..6e19cd67ee 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -10152,4 +10152,29 @@ tools are not needed to actually run Gtk2Hs programs.") backends provided by the @code{Cairo} and @code{Diagrams} libraries.") (license license:bsd-3))) +(define-public ghc-wcwidth + (package + (name "ghc-wcwidth") + (version "0.0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://hackage.haskell.org/package/wcwidth/wcwidth-" + version ".tar.gz")) + (sha256 + (base32 + "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz")))) + (build-system haskell-build-system) + (inputs + `(("ghc-setlocale" ,ghc-setlocale) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-attoparsec" ,ghc-attoparsec))) + (home-page "https://github.com/solidsnack/wcwidth/") + (synopsis "Haskell bindings to wcwidth") + (description "This package provides Haskell bindings to your system's +native wcwidth and a command line tool to examine the widths assigned by it. +The command line tool can compile a width table to Haskell code that assigns +widths to the Char type.") + (license license:bsd-3))) + ;;; haskell.scm ends here -- cgit v1.2.3 From 3ad6b8909025a8f4d3e1f1f5ea16bcd0cace557c Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 24 Aug 2018 12:14:17 +0530 Subject: gnu: ghc-tasty: Update to 1.1.0.3. * gnu/packages/haskell-check.scm (ghc-tasty): Update to 1.1.0.3. [inputs]: Add ghc-wcwidth. (ghc-attoparsec-bootstrap, ghc-integer-logarithms-bootstrap, ghc-scientific-bootstrap): New variables. (ghc-wcwidth)[inputs]: Replace ghc-attoparsec with ghc-attoparsec-bootstrap. (ghc-scientific)[inputs]: Replace ghc-integer-logarithms with ghc-integer-logarithms-bootstrap. (ghc-attoparsec)[inputs]: Replace ghc-scientific with ghc-scientific-bootstrap. --- gnu/packages/haskell-check.scm | 7 ++++--- gnu/packages/haskell.scm | 27 ++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index c3ef85f3f0..1064872fec 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -183,7 +183,7 @@ timer functions of different operating systems via a unified API.") (define-public ghc-tasty (package (name "ghc-tasty") - (version "0.11.0.4") + (version "1.1.0.3") (source (origin (method url-fetch) @@ -193,7 +193,7 @@ timer functions of different operating systems via a unified API.") ".tar.gz")) (sha256 (base32 - "05pxjzgbgjdn7477xry0ssjrnmnsydqiq6nm6ck8n2da1baliqp0")))) + "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) @@ -205,7 +205,8 @@ timer functions of different operating systems via a unified API.") ("ghc-unbounded-delays" ,ghc-unbounded-delays) ("ghc-async" ,ghc-async) ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-clock-bootstrap" ,ghc-clock-bootstrap))) + ("ghc-clock-bootstrap" ,ghc-clock-bootstrap) + ("ghc-wcwidth" ,ghc-wcwidth))) (home-page "http://documentup.com/feuerbach/tasty") (synopsis "Modern and extensible testing framework") (description "Tasty is a modern testing framework for Haskell. It lets diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6e19cd67ee..70929ddae6 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2866,7 +2866,7 @@ with slicing and Clang-style colored diagnostics.") ;; re-enable them. (arguments `(#:tests? #f)) (inputs - `(("ghc-scientific" ,ghc-scientific) + `(("ghc-scientific-bootstrap" ,ghc-scientific-bootstrap) ("ghc-text" ,ghc-text))) (native-inputs `(("ghc-tasty" ,ghc-tasty) @@ -2881,6 +2881,13 @@ aimed particularly at dealing efficiently with network protocols and complicated text/binary file formats.") (license license:bsd-3))) +(define ghc-attoparsec-bootstrap + (package + (inherit ghc-attoparsec) + (name "ghc-attoparsec-bootstrap") + (arguments '(#:tests? #f)) + (native-inputs '()))) + (define-public ghc-zip-archive (package (name "ghc-zip-archive") @@ -5208,6 +5215,13 @@ occurrences of a substring (the first in case of overlaps) with another.") in migrated modules.") (license license:expat))) +(define ghc-integer-logarithms-bootstrap + (package + (inherit ghc-integer-logarithms) + (name "ghc-integer-logarithms-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()))) + (define-public ghc-scientific (package (name "ghc-scientific") @@ -5224,7 +5238,7 @@ in migrated modules.") "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397")))) (build-system haskell-build-system) (inputs - `(("ghc-integer-logarithms" ,ghc-integer-logarithms) + `(("ghc-integer-logarithms-bootstrap" ,ghc-integer-logarithms-bootstrap) ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive))) @@ -5245,6 +5259,13 @@ and space efficient. They are represented using notation}.") (license license:bsd-3))) +(define ghc-scientific-bootstrap + (package + (inherit ghc-scientific) + (name "ghc-scientific-bootstrap") + (arguments `(#:tests? #f)) + (native-inputs '()))) + (define-public ghc-boxes (package (name "ghc-boxes") @@ -10168,7 +10189,7 @@ backends provided by the @code{Cairo} and @code{Diagrams} libraries.") (inputs `(("ghc-setlocale" ,ghc-setlocale) ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-attoparsec" ,ghc-attoparsec))) + ("ghc-attoparsec-bootstrap" ,ghc-attoparsec-bootstrap))) (home-page "https://github.com/solidsnack/wcwidth/") (synopsis "Haskell bindings to wcwidth") (description "This package provides Haskell bindings to your system's -- cgit v1.2.3 From 8374cc4b051e31905581250fbc0697b1513db60a Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 4 Sep 2018 15:21:56 +0530 Subject: gnu: ghc-tasty-ant-xml: Update to 1.1.4. * gnu/packages/haskell-check.scm (ghc-tasty-ant-xml): Update to 1.1.4. --- gnu/packages/haskell-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 1064872fec..65333f8269 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -39,7 +39,7 @@ (define-public ghc-tasty-ant-xml (package (name "ghc-tasty-ant-xml") - (version "1.0.2") + (version "1.1.4") (source (origin (method url-fetch) @@ -49,7 +49,7 @@ ".tar.gz")) (sha256 (base32 - "0pgz2lclg2hp72ykljcbxd88pjanfdfk8m5vb2qzcyjr85kwrhxv")))) + "0v0gsb90kh6hwlgxbclzawsskywc6yf7n8xhiifia97l4y0yx2m8")))) (build-system haskell-build-system) (inputs `(("ghc-generic-deriving" ,ghc-generic-deriving) -- cgit v1.2.3 From 6300ba5b6669e6e1a3864144390a358b8c260296 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 4 Sep 2018 15:24:32 +0530 Subject: gnu: ghc-integer-logarithms: Allow building with newer tasty. * gnu/packages/haskell.scm (ghc-integer-logarithms)[arguments]: Allow building with newer tasty. --- gnu/packages/haskell.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 70929ddae6..e7072633de 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -5197,6 +5197,8 @@ occurrences of a substring (the first in case of overlaps) with another.") (base32 "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j")))) (build-system haskell-build-system) + (arguments + `(#:configure-flags (list "--allow-newer=tasty"))) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) ("ghc-smallcheck" ,ghc-smallcheck) -- cgit v1.2.3 From 906a396bff28ba46b37014a0efc5d4fbf417dc82 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 4 Sep 2018 17:26:14 +0530 Subject: gnu: ghc-zlib: Enable tests. * gnu/packages/haskell.scm (ghc-zlib)[arguments]: Enable tests. Allow building with newer tasty. [native-inputs]: Add ghc-quickcheck, ghc-tasty, ghc-tasty-hunit and ghc-tasty-quickcheck. --- gnu/packages/haskell.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e7072633de..b8ae26346e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2078,9 +2078,13 @@ literals.") (base32 "1vbzf0awb6zb456xf48za1kl22018646cfzq4frvxgb9ay97vk0d")))) (build-system haskell-build-system) - ;; Tests require older versions of testy. - (arguments `(#:tests? #f)) + (arguments `(#:configure-flags (list "--allow-newer=tasty"))) (inputs `(("zlib" ,zlib))) + (native-inputs + `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) (home-page "https://hackage.haskell.org/package/zlib") (synopsis "Compression and decompression in the gzip and zlib formats") -- cgit v1.2.3 From b50658fe8ac898544a5c481f232a454c485524b9 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Thu, 16 Aug 2018 13:33:48 +0200 Subject: gnu: kicad: Update to 5.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (kicad): Update to 5.0.0. [source]: Change from git to url-fetch. [arguments]: Remove now unneeded build version parameter. [inputs]: Add opencascade-oce. Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index d53b25cff9..ee524ec78e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2018 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -680,24 +681,19 @@ language.") (define-public ao (deprecated-package "ao-cad" libfive)) -;; We use kicad from a git commit, because support for boost 1.61.0 has been -;; recently added. (define-public kicad - (let ((commit "5f4599fb56da4dd748845ab10abec02961d477f3") - (revision "2")) (package (name "kicad") - (version (string-append "4.0-" revision "." - (string-take commit 7))) + (version "5.0.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.launchpad.net/kicad") - (commit commit))) + (method url-fetch) + (file-name (string-append name "-" version ".tar.xz")) + (uri (string-append + "https://launchpad.net/kicad/5.0/" version "/+download/" name + "-" version ".tar.xz")) (sha256 - (base32 "1833pln2975gmc5s18xf7s8m9vg834lmxxdjk0wlk3lq7bvjjnff")) - (file-name (string-append name "-" version "-checkout")))) + (base32 "17nqjszyvd25wi6550j981whlnb1wxzmlanljdjihiki53j84x9p")))) (build-system cmake-build-system) (arguments `(#:out-of-source? #t @@ -706,8 +702,6 @@ language.") #:configure-flags (list "-DKICAD_STABLE_VERSION=ON" "-DKICAD_REPO_NAME=stable" - ,(string-append "-DKICAD_BUILD_VERSION=4.0-" - (string-take commit 7)) "-DKICAD_SKIP_BOOST=ON"; Use our system's boost library. "-DKICAD_SCRIPTING=ON" "-DKICAD_SCRIPTING_MODULES=ON" @@ -754,6 +748,7 @@ language.") ("libngspice" ,libngspice) ("libsm" ,libsm) ("mesa" ,mesa) + ("opencascade-oce" ,opencascade-oce) ("openssl" ,openssl) ("python" ,python-2) ("wxwidgets" ,wxwidgets-gtk2) @@ -764,7 +759,7 @@ language.") boards and electrical circuits. The software has a number of programs that perform specific functions, for example, pcbnew (Editing PCB), eeschema (editing electrical diagrams), gerbview (viewing Gerber files) and others.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public kicad-library (let ((version "4.0.7")) -- cgit v1.2.3 From 71ca16b58d20aa26157acc4c345c0af80ec8df5d Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 3 Sep 2018 11:57:38 +0100 Subject: gnu: petsc-openmpi: Configure with support for hdf5 data format. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (petsc-openmpi)[inputs]: Add hdf5-parallel-openmpi. [arguments]: Add '--with-hdf5-include' and '--with-hdf5-lib' flags. Add 'set-test-environment' phase. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 50c0a320e0..42136f65ea 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Thomas Danckaert -;;; Copyright © 2017 Paul Garlick +;;; Copyright © 2017, 2018 Paul Garlick ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017 Theodoros Foradis @@ -1685,6 +1685,7 @@ scientific applications modeled by partial differential equations.") (name "petsc-openmpi") (inputs `(("openmpi" ,openmpi) + ("hdf5" ,hdf5-parallel-openmpi) ,@(package-inputs petsc))) (arguments (substitute-keyword-arguments (package-arguments petsc) @@ -1692,7 +1693,21 @@ scientific applications modeled by partial differential equations.") ``("--with-mpiexec=mpirun" ,(string-append "--with-mpi-dir=" (assoc-ref %build-inputs "openmpi")) - ,@(delete "--with-mpi=0" ,cf))))) + ,(string-append "--with-hdf5-include=" + (assoc-ref %build-inputs "hdf5") "/include") + ,(string-append "--with-hdf5-lib=" + (assoc-ref %build-inputs "hdf5") "/lib/libhdf5.a") + ,@(delete "--with-mpi=0" ,cf))) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'check 'set-test-environment + (lambda _ + ;; By default, running the test suite would fail because 'ssh' + ;; could not be found in $PATH. Define this variable to + ;; placate Open MPI without adding a dependency on OpenSSH (the + ;; agent isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) + #t)))))) (synopsis "Library to solve PDEs (with MPI support)"))) (define-public petsc-complex-openmpi -- cgit v1.2.3 From 1bf758767d1553594b6d7534ca8c38a2171b5afe Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Mon, 3 Sep 2018 02:25:31 +0800 Subject: gnu: Add emacs-picpocket. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-picpocket): New public variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8f0c564f88..957b72f4e7 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016, 2017, 2018 Nicolas Goaziou -;;; Copyright © 2016, 2017 Alex Vong +;;; Copyright © 2016, 2017, 2018 Alex Vong ;;; Copyright © 2016, 2017, 2018 Arun Isaac ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017, 2018 Mathieu Othacehe @@ -11315,6 +11315,43 @@ e.g. the package dependencies it requires. See function file.") (license license:gpl3+)))) +(define-public emacs-picpocket + (let ((version "20180610.1059") ; taken from melpa + (commit "ce4b6ed088384f2414af82e8e4eae5b92c2874bf")) + (package + (name "emacs-picpocket") + (version version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/johanclaesson/picpocket") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15vpbcv83mc4j1pvrk7xic0klh2bl9gzg2xxs7c2lmnix52hy8mv")))) + (build-system emacs-build-system) + (arguments ; needed for running tests + `(#:tests? #t + #:emacs ,emacs + #:test-command '("emacs" "--batch" + "-l" "picpocket-test.el" + "-f" "ert-run-tests-batch-and-exit"))) + (home-page "https://github.com/johanclaesson/picpocket") + (synopsis "Image viewer for Emacs") + (description + "Picpocket is an image viewer for GNU Emacs. It has commands for: + +@itemize +@item File operations on the picture files (delete, move, copy, hardlink). +@item Scale and rotate the picture. +@item Associate pictures with tags which are saved to disk. +@item Filter pictures according to tags. +@item Customizing keystrokes for quick tagging and file operations. +@item Undo and browse history of undoable commands. +@end itemize") + (license license:gpl3+)))) + (define-public emacs-wgrep-helm ;; `emacs-wgrep-helm' was mistakenly added. (deprecated-package "emacs-wgrep-helm" emacs-wgrep)) -- cgit v1.2.3 From 7e1d229019c1924a2748e5daec2a619e7efbd7d7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 Sep 2018 17:22:55 +0200 Subject: inferior: Add home-page and location package accessors. * guix/inferior.scm (inferior-package-home-page) (inferior-package-location): New procedures. * tests/inferior.scm ("inferior-packages"): Test them. --- guix/inferior.scm | 20 +++++++++++++++++++- tests/inferior.scm | 26 ++++++++++++++++---------- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/guix/inferior.scm b/guix/inferior.scm index 05c8d65deb..af37233a03 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -19,6 +19,7 @@ (define-module (guix inferior) #:use-module (srfi srfi-9) #:use-module (srfi srfi-9 gnu) + #:use-module ((guix utils) #:select (source-properties->location)) #:use-module (ice-9 match) #:use-module (ice-9 popen) #:export (inferior? @@ -33,7 +34,9 @@ inferior-packages inferior-package-synopsis - inferior-package-description)) + inferior-package-description + inferior-package-home-page + inferior-package-location)) ;;; Commentary: ;;; @@ -198,3 +201,18 @@ TRANSLATE? is true, translate it to the current locale's language." (if translate? '(compose (@ (guix ui) P_) package-description) 'package-description))) + +(define (inferior-package-home-page package) + "Return the home page of PACKAGE." + (inferior-package-field package 'package-home-page)) + +(define (inferior-package-location package) + "Return the source code location of PACKAGE, either #f or a +record." + (source-properties->location + (inferior-package-field package + '(compose (lambda (loc) + (and loc + (location->source-properties + loc))) + package-location)))) diff --git a/tests/inferior.scm b/tests/inferior.scm index 5e0f8ae66e..ff5cad4210 100644 --- a/tests/inferior.scm +++ b/tests/inferior.scm @@ -45,9 +45,11 @@ (test-equal "inferior-packages" (take (sort (fold-packages (lambda (package lst) - (alist-cons (package-name package) + (cons (list (package-name package) (package-version package) - lst)) + (package-home-page package) + (package-location package)) + lst)) '()) (lambda (x y) (string Date: Fri, 31 Aug 2018 17:07:07 +0200 Subject: Switch to Guile-Gcrypt. This removes (guix hash) and (guix pk-crypto), which now live as part of Guile-Gcrypt (version 0.1.0.) * guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm, tests/hash.scm, tests/pk-crypto.scm: Remove. * configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and LIBGCRYPT_LIBDIR assignments. * m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove. * README: Add Guile-Gcrypt to the dependencies; move libgcrypt as "required unless --disable-daemon". * doc/guix.texi (Requirements): Likewise. * gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm, guix/git.scm, guix/http-client.scm, guix/import/cpan.scm, guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm, guix/import/gnu.scm, guix/import/hackage.scm, guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm, guix/pki.scm, guix/scripts/archive.scm, guix/scripts/authenticate.scm, guix/scripts/download.scm, guix/scripts/hash.scm, guix/scripts/pack.scm, guix/scripts/publish.scm, guix/scripts/refresh.scm, guix/scripts/substitute.scm, guix/store.scm, guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm, tests/builders.scm, tests/challenge.scm, tests/cpan.scm, tests/crate.scm, tests/derivations.scm, tests/gem.scm, tests/nar.scm, tests/opam.scm, tests/pki.scm, tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm, tests/store.scm, tests/substitute.scm: Adjust imports. * gnu/system/vm.scm: Likewise. (guile-sqlite3&co): Rename to... (gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT. (expression->derivation-in-linux-vm)[config]: Remove. (iso9660-image)[config]: Remove. (qemu-image)[config]: Remove. (system-docker-image)[config]: Remove. * guix/scripts/pack.scm: Adjust imports. (guile-sqlite3&co): Rename to... (gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT. (self-contained-tarball)[build]: Call 'make-config.scm' without #:libgcrypt argument. (squashfs-image)[libgcrypt]: Remove. [build]: Call 'make-config.scm' without #:libgcrypt. (docker-image)[config, json]: Remove. [build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from the imported modules. * guix/self.scm (specification->package): Remove "libgcrypt", add "guile-gcrypt". (compiled-guix): Remove #:libgcrypt. [guile-gcrypt]: New variable. [dependencies]: Add it. [*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call. Add #:extensions. [*config*]: Remove #:libgcrypt from 'make-config.scm' call. (%dependency-variables): Remove %libgcrypt. (make-config.scm): Remove #:libgcrypt. * build-aux/build-self.scm (guile-gcrypt): New variable. (make-config.scm): Remove #:libgcrypt. (build-program)[fake-gcrypt-hash]: New variable. Add (gcrypt hash) to the imported modules. Adjust load path assignments. * gnu/packages/package-management.scm (guix)[propagated-inputs]: Add GUILE-GCRYPT. [arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search path. --- Makefile.am | 5 - README | 3 +- build-aux/build-self.scm | 83 ++++++-- configure.ac | 13 +- doc/guix.texi | 4 +- gnu/packages/bash.scm | 2 +- gnu/packages/package-management.scm | 5 +- gnu/system/vm.scm | 48 ++--- guix/derivations.scm | 2 +- guix/docker.scm | 2 +- guix/gcrypt.scm | 49 ----- guix/git.scm | 2 +- guix/hash.scm | 184 ---------------- guix/http-client.scm | 2 +- guix/import/cpan.scm | 2 +- guix/import/cran.scm | 2 +- guix/import/crate.scm | 2 +- guix/import/elpa.scm | 2 +- guix/import/gnu.scm | 2 +- guix/import/hackage.scm | 2 +- guix/import/texlive.scm | 2 +- guix/import/utils.scm | 2 +- guix/nar.scm | 4 +- guix/pk-crypto.scm | 407 ------------------------------------ guix/pki.scm | 2 +- guix/scripts/archive.scm | 2 +- guix/scripts/authenticate.scm | 2 +- guix/scripts/download.scm | 2 +- guix/scripts/hash.scm | 6 +- guix/scripts/pack.scm | 60 ++---- guix/scripts/publish.scm | 4 +- guix/scripts/refresh.scm | 2 +- guix/scripts/substitute.scm | 4 +- guix/self.scm | 26 +-- guix/store.scm | 2 +- guix/store/deduplication.scm | 2 +- guix/tests.scm | 2 +- m4/guix.m4 | 18 -- tests/base32.scm | 2 +- tests/builders.scm | 2 +- tests/challenge.scm | 2 +- tests/cpan.scm | 2 +- tests/crate.scm | 2 +- tests/derivations.scm | 2 +- tests/gem.scm | 2 +- tests/hash.scm | 128 ------------ tests/nar.scm | 2 +- tests/opam.scm | 2 +- tests/packages.scm | 2 +- tests/pk-crypto.scm | 290 ------------------------- tests/pki.scm | 4 +- tests/publish.scm | 4 +- tests/pypi.scm | 2 +- tests/store-deduplication.scm | 2 +- tests/store.scm | 2 +- tests/substitute.scm | 4 +- 56 files changed, 180 insertions(+), 1241 deletions(-) delete mode 100644 guix/gcrypt.scm delete mode 100644 guix/hash.scm delete mode 100644 guix/pk-crypto.scm delete mode 100644 tests/hash.scm delete mode 100644 tests/pk-crypto.scm diff --git a/Makefile.am b/Makefile.am index af6870cf67..a3498460e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,9 +63,6 @@ MODULES = \ guix/base64.scm \ guix/cpio.scm \ guix/records.scm \ - guix/gcrypt.scm \ - guix/hash.scm \ - guix/pk-crypto.scm \ guix/pki.scm \ guix/progress.scm \ guix/combinators.scm \ @@ -331,8 +328,6 @@ SCM_TESTS = \ tests/base32.scm \ tests/base64.scm \ tests/cpio.scm \ - tests/hash.scm \ - tests/pk-crypto.scm \ tests/pki.scm \ tests/print.scm \ tests/sets.scm \ diff --git a/README b/README index 348a7ada5f..4c76c4bc43 100644 --- a/README +++ b/README @@ -21,7 +21,7 @@ Guix is based on the [[https://nixos.org/nix/][Nix]] package manager. GNU Guix currently depends on the following packages: - [[https://gnu.org/software/guile/][GNU Guile 2.2.x or 2.0.x]], version 2.0.13 or later - - [[https://gnupg.org/][GNU libgcrypt]] + - [[https://notabug.org/cwebber/guile-gcrypt][Guile-Gcrypt]] 0.1.0 or later - [[https://www.gnu.org/software/make/][GNU Make]] - [[https://www.gnutls.org][GnuTLS]] compiled with guile support enabled - [[https://notabug.org/civodul/guile-sqlite3][Guile-SQLite3]], version 0.1.0 or later @@ -31,6 +31,7 @@ GNU Guix currently depends on the following packages: Unless `--disable-daemon' was passed, the following packages are needed: + - [[https://gnupg.org/][GNU libgcrypt]] - [[https://sqlite.org/][SQLite 3]] - [[https://gcc.gnu.org][GCC's g++]] - optionally [[http://www.bzip.org][libbz2]] diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 3ecdc931a5..f472724f18 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -22,6 +22,7 @@ #:use-module (guix ui) #:use-module (guix config) #:use-module (guix modules) + #:use-module (guix build-system gnu) #:use-module (srfi srfi-1) #:use-module (srfi srfi-19) #:use-module (rnrs io ports) @@ -72,7 +73,7 @@ (variables rest ...)))))) (variables %localstatedir %storedir %sysconfdir %system))) -(define* (make-config.scm #:key libgcrypt zlib gzip xz bzip2 +(define* (make-config.scm #:key zlib gzip xz bzip2 (package-name "GNU Guix") (package-version "0") (bug-report-address "bug-guix@gnu.org") @@ -92,7 +93,6 @@ %state-directory %store-database-directory %config-directory - %libgcrypt %libz %gzip %bzip2 @@ -137,9 +137,6 @@ (define %xz #+(and xz (file-append xz "/bin/xz"))) - (define %libgcrypt - #+(and libgcrypt - (file-append libgcrypt "/lib/libgcrypt"))) (define %libz #+(and zlib (file-append zlib "/lib/libz"))))))) @@ -200,6 +197,44 @@ person's version identifier." ;; XXX: Replace with a Git commit id. (date->string (current-date 0) "~Y~m~d.~H")) +(define guile-gcrypt + ;; The host Guix may or may not have 'guile-gcrypt', which was introduced in + ;; August 2018. If it has it, it's at least version 0.1.0, which is good + ;; enough. If it doesn't, specify our own package because the target Guix + ;; requires it. + (match (find-best-packages-by-name "guile-gcrypt" #f) + (() + (package + (name "guile-gcrypt") + (version "0.1.0") + (home-page "https://notabug.org/cwebber/guile-gcrypt") + (source (origin + (method url-fetch) + (uri (string-append home-page "/archive/v" version ".tar.gz")) + (sha256 + (base32 + "1gir7ifknbmbvjlql5j6wzk7bkb5lnmq80q59ngz43hhpclrk5k3")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,(specification->package "pkg-config")) + ("autoconf" ,(specification->package "autoconf")) + ("automake" ,(specification->package "automake")) + ("texinfo" ,(specification->package "texinfo")))) + (inputs + `(("guile" ,(specification->package "guile")) + ("libgcrypt" ,(specification->package "libgcrypt")))) + (synopsis "Cryptography library for Guile using Libgcrypt") + (description + "Guile-Gcrypt provides a Guile 2.x interface to a subset of the +GNU Libgcrypt crytographic library. It provides modules for cryptographic +hash functions, message authentication codes (MAC), public-key cryptography, +strong randomness, and more. It is implemented using the foreign function +interface (FFI) of Guile.") + (license #f))) ;license:gpl3+ + ((package . _) + package))) + (define* (build-program source version #:optional (guile-version (effective-version)) #:key (pull-version 0)) @@ -212,10 +247,21 @@ person's version identifier." (('gnu _ ...) #t) (_ #f))) + (define fake-gcrypt-hash + ;; Fake (gcrypt hash) module; see below. + (scheme-file "hash.scm" + #~(define-module (gcrypt hash) + #:export (sha1 sha256)))) + (with-imported-modules `(((guix config) - => ,(make-config.scm - #:libgcrypt - (specification->package "libgcrypt"))) + => ,(make-config.scm)) + + ;; To avoid relying on 'with-extensions', which was + ;; introduced in 0.15.0, provide a fake (gcrypt + ;; hash) just so that we can build modules, and + ;; adjust %LOAD-PATH later on. + ((gcrypt hash) => ,fake-gcrypt-hash) + ,@(source-module-closure `((guix store) (guix self) (guix derivations) @@ -237,13 +283,24 @@ person's version identifier." (match %load-path ((front _ ...) (unless (string=? front source) ;already done? - (set! %load-path (list source front))))))) - - ;; Only load our own modules or those of Guile. + (set! %load-path + (list source + (string-append #$guile-gcrypt + "/share/guile/site/" + (effective-version)) + front))))))) + + ;; Only load Guile-Gcrypt, our own modules, or those + ;; of Guile. (match %load-compiled-path ((front _ ... sys1 sys2) - (set! %load-compiled-path - (list front sys1 sys2))))) + (unless (string-prefix? #$guile-gcrypt front) + (set! %load-compiled-path + (list (string-append #$guile-gcrypt + "/lib/guile/" + (effective-version) + "/site-ccache") + front sys1 sys2)))))) (use-modules (guix store) (guix self) diff --git a/configure.ac b/configure.ac index b34f15a77b..c83d4d8a28 100644 --- a/configure.ac +++ b/configure.ac @@ -130,6 +130,11 @@ if test "x$guix_cv_have_recent_guile_sqlite3" != "xyes"; then AC_MSG_ERROR([A recent Guile-SQLite3 could not be found; please install it.]) fi +GUILE_MODULE_AVAILABLE([have_guile_gcrypt], [(gcrypt hash)]) +if test "x$have_guile_gcrypt" != "xyes"; then + AC_MSG_ERROR([Guile-Gcrypt could not be found; please install it.]) +fi + dnl Make sure we have a full-fledged Guile. GUIX_ASSERT_GUILE_FEATURES([regex posix socket net-db threads]) @@ -213,16 +218,10 @@ AC_ARG_WITH([libgcrypt-libdir], esac]) dnl If none of the --with-libgcrypt-* options was used, try to determine the -dnl absolute file name of libgcrypt.so. +dnl the library directory. case "x$LIBGCRYPT_PREFIX$LIBGCRYPT_LIBDIR" in xnono) GUIX_LIBGCRYPT_LIBDIR([LIBGCRYPT_LIBDIR]) - if test "x$LIBGCRYPT_LIBDIR" != x; then - LIBGCRYPT="$LIBGCRYPT_LIBDIR/libgcrypt" - else - dnl 'config-daemon.ac' expects "no" in this case. - LIBGCRYPT_LIBDIR="no" - fi ;; esac diff --git a/doc/guix.texi b/doc/guix.texi index 307f915dbb..9375aac30c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -620,7 +620,8 @@ GNU Guix depends on the following packages: @itemize @item @url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.13 or later, including 2.2.x; -@item @url{http://gnupg.org/, GNU libgcrypt}; +@item @url{https://notabug.org/cwebber/guile-gcrypt, Guile-Gcrypt}, version +0.1.0 or later; @item @uref{http://gnutls.org/, GnuTLS}, specifically its Guile bindings (@pxref{Guile Preparations, how to install the GnuTLS bindings for @@ -662,6 +663,7 @@ Unless @code{--disable-daemon} was passed to @command{configure}, the following packages are also needed: @itemize +@item @url{http://gnupg.org/, GNU libgcrypt}; @item @url{http://sqlite.org, SQLite 3}; @item @url{http://gcc.gnu.org, GCC's g++}, with support for the C++11 standard. diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 64f7782f58..121a459fa6 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -36,7 +36,7 @@ #:use-module (guix store) #:use-module (guix build-system gnu) #:autoload (guix gnupg) (gnupg-verify*) - #:autoload (guix hash) (port-sha256) + #:autoload (gcrypt hash) (port-sha256) #:autoload (guix base32) (bytevector->nix-base32-string) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 78db0abfa8..e40a94a844 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -213,6 +213,7 @@ ;; Guile-JSON, and Guile-Git automatically. (let* ((out (assoc-ref outputs "out")) (guile (assoc-ref inputs "guile")) + (gcrypt (assoc-ref inputs "guile-gcrypt")) (json (assoc-ref inputs "guile-json")) (sqlite (assoc-ref inputs "guile-sqlite3")) (git (assoc-ref inputs "guile-git")) @@ -220,7 +221,8 @@ "guile-bytestructures")) (ssh (assoc-ref inputs "guile-ssh")) (gnutls (assoc-ref inputs "gnutls")) - (deps (list json sqlite gnutls git bs ssh)) + (deps (list gcrypt json sqlite gnutls + git bs ssh)) (effective (read-line (open-pipe* OPEN_READ @@ -279,6 +281,7 @@ '()))) (propagated-inputs `(("gnutls" ,gnutls) + ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index b505b0cf6b..3898872a46 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -32,7 +32,7 @@ #:use-module (guix modules) #:use-module (guix scripts pack) #:use-module (guix utils) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix base32) #:use-module ((guix self) #:select (make-config.scm)) @@ -43,7 +43,7 @@ #:use-module (gnu packages cdrom) #:use-module (gnu packages compression) #:use-module (gnu packages guile) - #:autoload (gnu packages gnupg) (libgcrypt) + #:autoload (gnu packages gnupg) (guile-gcrypt) #:use-module (gnu packages gawk) #:use-module (gnu packages bash) #:use-module (gnu packages less) @@ -124,10 +124,12 @@ (('gnu rest ...) #t) (rest #f))) -(define guile-sqlite3&co - ;; Guile-SQLite3 and its propagated inputs. - (cons guile-sqlite3 - (package-transitive-propagated-inputs guile-sqlite3))) +(define gcrypt-sqlite3&co + ;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs. + (append-map (lambda (package) + (cons package + (package-transitive-propagated-inputs package))) + (list guile-gcrypt guile-sqlite3))) (define* (expression->derivation-in-linux-vm name exp #:key @@ -164,10 +166,6 @@ based on the size of the closure of REFERENCES-GRAPHS. When REFERENCES-GRAPHS is true, it must be a list of file name/store path pairs, as for `derivation'. The files containing the reference graphs are made available under the /xchg CIFS share." - (define config - ;; (guix config) module for consumption by (guix gcrypt). - (make-config.scm #:libgcrypt libgcrypt)) - (define user-builder (program-file "builder-in-linux-vm" exp)) @@ -195,12 +193,14 @@ made available under the /xchg CIFS share." (define builder ;; Code that launches the VM that evaluates EXP. - (with-extensions guile-sqlite3&co + (with-extensions gcrypt-sqlite3&co (with-imported-modules `(,@(source-module-closure '((guix build utils) (gnu build vm)) #:select? not-config?) - ((guix config) => ,config)) + + ;; For consumption by (gnu store database). + ((guix config) => ,(make-config.scm))) #~(begin (use-modules (guix build utils) (gnu build vm)) @@ -255,9 +255,6 @@ made available under the /xchg CIFS share." "Return a bootable, stand-alone iso9660 image. INPUTS is a list of inputs (as for packages)." - (define config - (make-config.scm #:libgcrypt libgcrypt)) - (define schema (and register-closures? (local-file (search-path %load-path @@ -265,12 +262,12 @@ INPUTS is a list of inputs (as for packages)." (expression->derivation-in-linux-vm name - (with-extensions guile-sqlite3&co + (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) => ,config)) + ((guix config) => ,(make-config.scm))) #~(begin (use-modules (gnu build vm) (guix store database) @@ -347,9 +344,6 @@ INPUTS is a list of inputs (as for packages). When COPY-INPUTS? is true, copy 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." - (define config - (make-config.scm #:libgcrypt libgcrypt)) - (define schema (and register-closures? (local-file (search-path %load-path @@ -357,13 +351,13 @@ the image." (expression->derivation-in-linux-vm name - (with-extensions guile-sqlite3&co + (with-extensions gcrypt-sqlite3&co (with-imported-modules `(,@(source-module-closure '((gnu build vm) (gnu build bootloader) (guix store database) (guix build utils)) #:select? not-config?) - ((guix config) => ,config)) + ((guix config) => ,(make-config.scm))) #~(begin (use-modules (gnu build bootloader) (gnu build vm) @@ -462,10 +456,6 @@ makes sense when you want to build a GuixSD Docker image that has Guix installed inside of it. If you don't need Guix (e.g., your GuixSD Docker image just contains a web server that is started by the Shepherd), then you should set REGISTER-CLOSURES? to #f." - (define config - ;; (guix config) module for consumption by (guix gcrypt). - (make-config.scm #:libgcrypt libgcrypt)) - (define schema (and register-closures? (local-file (search-path %load-path @@ -475,8 +465,8 @@ should set REGISTER-CLOSURES? to #f." (name -> (string-append name ".tar.gz")) (graph -> "system-graph")) (define build - (with-extensions (cons guile-json ;for (guix docker) - guile-sqlite3&co) ;for (guix store database) + (with-extensions (cons guile-json ;for (guix docker) + gcrypt-sqlite3&co) ;for (guix store database) (with-imported-modules `(,@(source-module-closure '((guix docker) (guix store database) @@ -484,7 +474,7 @@ should set REGISTER-CLOSURES? to #f." (guix build store-copy) (gnu build vm)) #:select? not-config?) - ((guix config) => ,config)) + ((guix config) => ,(make-config.scm))) #~(begin (use-modules (guix docker) (guix build utils) diff --git a/guix/derivations.scm b/guix/derivations.scm index da686e89e2..7afecb10cc 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -35,7 +35,7 @@ #:use-module (guix memoization) #:use-module (guix combinators) #:use-module (guix monads) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix base32) #:use-module (guix records) #:use-module (guix sets) diff --git a/guix/docker.scm b/guix/docker.scm index b869901599..0757d3356f 100644 --- a/guix/docker.scm +++ b/guix/docker.scm @@ -19,7 +19,7 @@ ;;; along with GNU Guix. If not, see . (define-module (guix docker) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix base16) #:use-module ((guix build utils) #:select (mkdir-p diff --git a/guix/gcrypt.scm b/guix/gcrypt.scm deleted file mode 100644 index 1517501751..0000000000 --- a/guix/gcrypt.scm +++ /dev/null @@ -1,49 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 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 (guix gcrypt) - #:use-module (guix config) - #:use-module (system foreign) - #:export (gcrypt-version - libgcrypt-func)) - -;;; Commentary: -;;; -;;; Common code for the GNU Libgcrypt bindings. Loading this module -;;; initializes Libgcrypt as a side effect. -;;; -;;; Code: - -(define libgcrypt-func - (let ((lib (dynamic-link %libgcrypt))) - (lambda (func) - "Return a pointer to symbol FUNC in libgcrypt." - (dynamic-func func lib)))) - -(define gcrypt-version - ;; According to the manual, this function must be called before any other, - ;; and it's not clear whether it can be called more than once. So call it - ;; right here from the top level. - (let* ((ptr (libgcrypt-func "gcry_check_version")) - (proc (pointer->procedure '* ptr '(*))) - (version (pointer->string (proc %null-pointer)))) - (lambda () - "Return the version number of libgcrypt as a string." - version))) - -;;; gcrypt.scm ends here diff --git a/guix/git.scm b/guix/git.scm index 193e2df111..c577eba5ee 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -21,7 +21,7 @@ #:use-module (git) #:use-module (git object) #:use-module (guix base32) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module ((guix build utils) #:select (mkdir-p)) #:use-module (guix store) #:use-module (guix utils) diff --git a/guix/hash.scm b/guix/hash.scm deleted file mode 100644 index 8d7ba21425..0000000000 --- a/guix/hash.scm +++ /dev/null @@ -1,184 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2018 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 (guix hash) - #:use-module (guix gcrypt) - #:use-module (rnrs bytevectors) - #:use-module (ice-9 binary-ports) - #:use-module (system foreign) - #:use-module ((guix build utils) #:select (dump-port)) - #:use-module (srfi srfi-11) - #:use-module (srfi srfi-26) - #:export (sha1 - sha256 - open-sha256-port - port-sha256 - file-sha256 - open-sha256-input-port)) - -;;; Commentary: -;;; -;;; Cryptographic hashes. -;;; -;;; Code: - - -;;; -;;; Hash. -;;; - -(define-syntax GCRY_MD_SHA256 - ;; Value as of Libgcrypt 1.5.2. - (identifier-syntax 8)) - -(define-syntax GCRY_MD_SHA1 - (identifier-syntax 2)) - -(define bytevector-hash - (let ((hash (pointer->procedure void - (libgcrypt-func "gcry_md_hash_buffer") - `(,int * * ,size_t)))) - (lambda (bv type size) - "Return the hash TYPE, of SIZE bytes, of BV as a bytevector." - (let ((digest (make-bytevector size))) - (hash type (bytevector->pointer digest) - (bytevector->pointer bv) (bytevector-length bv)) - digest)))) - -(define sha1 - (cut bytevector-hash <> GCRY_MD_SHA1 20)) - -(define sha256 - (cut bytevector-hash <> GCRY_MD_SHA256 (/ 256 8))) - -(define open-sha256-md - (let ((open (pointer->procedure int - (libgcrypt-func "gcry_md_open") - `(* ,int ,unsigned-int)))) - (lambda () - (let* ((md (bytevector->pointer (make-bytevector (sizeof '*)))) - (err (open md GCRY_MD_SHA256 0))) - (if (zero? err) - (dereference-pointer md) - (throw 'gcrypt-error err)))))) - -(define md-write - (pointer->procedure void - (libgcrypt-func "gcry_md_write") - `(* * ,size_t))) - -(define md-read - (pointer->procedure '* - (libgcrypt-func "gcry_md_read") - `(* ,int))) - -(define md-close - (pointer->procedure void - (libgcrypt-func "gcry_md_close") - '(*))) - - -(define (open-sha256-port) - "Return two values: an output port, and a thunk. When the thunk is called, -it returns the SHA256 hash (a bytevector) of all the data written to the -output port." - (define sha256-md - (open-sha256-md)) - - (define digest #f) - (define position 0) - - (define (finalize!) - (let ((ptr (md-read sha256-md 0))) - (set! digest (bytevector-copy (pointer->bytevector ptr 32))) - (md-close sha256-md))) - - (define (write! bv offset len) - (if (zero? len) - (begin - (finalize!) - 0) - (let ((ptr (bytevector->pointer bv offset))) - (md-write sha256-md ptr len) - (set! position (+ position len)) - len))) - - (define (get-position) - position) - - (define (close) - (unless digest - (finalize!))) - - (values (make-custom-binary-output-port "sha256" - write! get-position #f - close) - (lambda () - (unless digest - (finalize!)) - digest))) - -(define (port-sha256 port) - "Return the SHA256 hash (a bytevector) of all the data drained from PORT." - (let-values (((out get) - (open-sha256-port))) - (dump-port port out) - (close-port out) - (get))) - -(define (file-sha256 file) - "Return the SHA256 hash (a bytevector) of FILE." - (call-with-input-file file port-sha256)) - -(define (open-sha256-input-port port) - "Return an input port that wraps PORT and a thunk to get the hash of all the -data read from PORT. The thunk always returns the same value." - (define md - (open-sha256-md)) - - (define (read! bv start count) - (let ((n (get-bytevector-n! port bv start count))) - (if (eof-object? n) - 0 - (begin - (unless digest - (let ((ptr (bytevector->pointer bv start))) - (md-write md ptr n))) - n)))) - - (define digest #f) - - (define (finalize!) - (let ((ptr (md-read md 0))) - (set! digest (bytevector-copy (pointer->bytevector ptr 32))) - (md-close md))) - - (define (get-hash) - (unless digest - (finalize!)) - digest) - - (define (unbuffered port) - ;; Guile <= 2.0.9 does not support 'setvbuf' on custom binary input ports. - (setvbuf port _IONBF) - port) - - (values (unbuffered (make-custom-binary-input-port "sha256" read! #f #f #f)) - get-hash)) - -;;; hash.scm ends here diff --git a/guix/http-client.scm b/guix/http-client.scm index 3b34d4ffba..07360e6108 100644 --- a/guix/http-client.scm +++ b/guix/http-client.scm @@ -34,7 +34,7 @@ #:use-module (guix ui) #:use-module (guix utils) #:use-module (guix base64) - #:autoload (guix hash) (sha256) + #:autoload (gcrypt hash) (sha256) #:use-module ((guix build utils) #:select (mkdir-p dump-port)) #:use-module ((guix build download) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index d0ff64ed05..d4bea84353 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -27,7 +27,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (json) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix store) #:use-module (guix utils) #:use-module (guix base32) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index a5203fe78d..89c84f7037 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -29,7 +29,7 @@ #:use-module (web uri) #:use-module (guix memoization) #:use-module (guix http-client) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix store) #:use-module (guix base32) #:use-module ((guix download) #:select (download-to-store)) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 3724a457a4..e0b400d054 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -20,7 +20,7 @@ #:use-module (guix base32) #:use-module (guix build-system cargo) #:use-module ((guix download) #:prefix download:) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix http-client) #:use-module (guix import json) #:use-module (guix import utils) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index c37afaf8e6..83354d3f04 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -32,7 +32,7 @@ #:use-module (guix http-client) #:use-module (guix store) #:use-module (guix ui) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix base32) #:use-module (guix upstream) #:use-module (guix packages) diff --git a/guix/import/gnu.scm b/guix/import/gnu.scm index bbb17047f0..29324d7554 100644 --- a/guix/import/gnu.scm +++ b/guix/import/gnu.scm @@ -21,7 +21,7 @@ #:use-module (guix import utils) #:use-module (guix utils) #:use-module (guix store) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix base32) #:use-module (guix upstream) #:use-module (srfi srfi-1) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 54301de2e8..766a0b53f1 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -33,7 +33,7 @@ #:use-module ((guix import utils) #:select (factorize-uri recursive-import)) #:use-module (guix import cabal) #:use-module (guix store) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix base32) #:use-module (guix memoization) #:use-module (guix upstream) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index d4c3714364..791b514485 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -26,7 +26,7 @@ #:use-module (srfi srfi-34) #:use-module (web uri) #:use-module (guix http-client) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix memoization) #:use-module (guix store) #:use-module (guix base32) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 0dc8fd5857..516c0cfaa2 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -23,7 +23,7 @@ (define-module (guix import utils) #:use-module (guix base32) #:use-module ((guix build download) #:prefix build:) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix http-client) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) diff --git a/guix/nar.scm b/guix/nar.scm index 3556de1379..0495b4a40c 100644 --- a/guix/nar.scm +++ b/guix/nar.scm @@ -25,9 +25,9 @@ #:use-module (guix store) #:use-module (guix store database) #:use-module (guix ui) ; for '_' - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix pki) - #:use-module (guix pk-crypto) + #:use-module (gcrypt pk-crypto) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) diff --git a/guix/pk-crypto.scm b/guix/pk-crypto.scm deleted file mode 100644 index 55ba7b1bb8..0000000000 --- a/guix/pk-crypto.scm +++ /dev/null @@ -1,407 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2017 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 (guix pk-crypto) - #:use-module (guix base16) - #:use-module (guix gcrypt) - - #:use-module (system foreign) - #:use-module (rnrs bytevectors) - #:use-module (ice-9 match) - #:use-module (ice-9 rdelim) - #:export (canonical-sexp? - error-source - error-string - string->canonical-sexp - canonical-sexp->string - read-file-sexp - number->canonical-sexp - canonical-sexp-car - canonical-sexp-cdr - canonical-sexp-nth - canonical-sexp-nth-data - canonical-sexp-length - canonical-sexp-null? - canonical-sexp-list? - bytevector->hash-data - hash-data->bytevector - key-type - sign - verify - generate-key - find-sexp-token - canonical-sexp->sexp - sexp->canonical-sexp) - #:re-export (gcrypt-version)) - - -;;; Commentary: -;;; -;;; Public key cryptographic routines from GNU Libgcrypt. -;;;; -;;; Libgcrypt uses "canonical s-expressions" to represent key material, -;;; parameters, and data. We keep it as an opaque object to map them to -;;; Scheme s-expressions because (1) Libgcrypt sexps may be stored in secure -;;; memory, and (2) the read syntax is different. -;;; -;;; A 'canonical-sexp->sexp' procedure is provided nevertheless, for use in -;;; cases where it is safe to move data out of Libgcrypt---e.g., when -;;; processing ACL entries, public keys, etc. -;;; -;;; Canonical sexps were defined by Rivest et al. in the IETF draft at -;;; for the purposes of SPKI -;;; (see .) -;;; -;;; Code: - -;; Libgcrypt "s-expressions". -(define-wrapped-pointer-type - canonical-sexp? - naked-pointer->canonical-sexp - canonical-sexp->pointer - (lambda (obj port) - ;; Don't print OBJ's external representation: we don't want key material - ;; to leak in backtraces and such. - (format port "#" - (number->string (object-address obj) 16) - (number->string (pointer-address (canonical-sexp->pointer obj)) - 16)))) - -(define finalize-canonical-sexp! - (libgcrypt-func "gcry_sexp_release")) - -(define-inlinable (pointer->canonical-sexp ptr) - "Return a that wraps PTR." - (let* ((sexp (naked-pointer->canonical-sexp ptr)) - (ptr* (canonical-sexp->pointer sexp))) - ;; Did we already have a object for PTR? - (when (equal? ptr ptr*) - ;; No, so we can safely add a finalizer (in Guile 2.0.9 - ;; 'set-pointer-finalizer!' *adds* a finalizer rather than replacing the - ;; existing one.) - (set-pointer-finalizer! ptr finalize-canonical-sexp!)) - sexp)) - -(define error-source - (let* ((ptr (libgcrypt-func "gcry_strsource")) - (proc (pointer->procedure '* ptr (list int)))) - (lambda (err) - "Return the error source (a string) for ERR, an error code as thrown -along with 'gcry-error'." - (pointer->string (proc err))))) - -(define error-string - (let* ((ptr (libgcrypt-func "gcry_strerror")) - (proc (pointer->procedure '* ptr (list int)))) - (lambda (err) - "Return the error description (a string) for ERR, an error code as -thrown along with 'gcry-error'." - (pointer->string (proc err))))) - -(define string->canonical-sexp - (let* ((ptr (libgcrypt-func "gcry_sexp_new")) - (proc (pointer->procedure int ptr `(* * ,size_t ,int)))) - (lambda (str) - "Parse STR and return the corresponding gcrypt s-expression." - - ;; When STR comes from 'canonical-sexp->string', it may contain - ;; characters that are really meant to be interpreted as bytes as in a C - ;; 'char *'. Thus, convert STR to ISO-8859-1 so the byte values of the - ;; characters are preserved. - (let* ((sexp (bytevector->pointer (make-bytevector (sizeof '*)))) - (err (proc sexp (string->pointer str "ISO-8859-1") 0 1))) - (if (= 0 err) - (pointer->canonical-sexp (dereference-pointer sexp)) - (throw 'gcry-error 'string->canonical-sexp err)))))) - -(define-syntax GCRYSEXP_FMT_ADVANCED - (identifier-syntax 3)) - -(define canonical-sexp->string - (let* ((ptr (libgcrypt-func "gcry_sexp_sprint")) - (proc (pointer->procedure size_t ptr `(* ,int * ,size_t)))) - (lambda (sexp) - "Return a textual representation of SEXP." - (let loop ((len 1024)) - (let* ((buf (bytevector->pointer (make-bytevector len))) - (size (proc (canonical-sexp->pointer sexp) - GCRYSEXP_FMT_ADVANCED buf len))) - (if (zero? size) - (loop (* len 2)) - (pointer->string buf size "ISO-8859-1"))))))) - -(define (read-file-sexp file) - "Return the canonical sexp read from FILE." - (call-with-input-file file - (compose string->canonical-sexp - read-string))) - -(define canonical-sexp-car - (let* ((ptr (libgcrypt-func "gcry_sexp_car")) - (proc (pointer->procedure '* ptr '(*)))) - (lambda (lst) - "Return the first element of LST, an sexp, if that element is a list; -return #f if LST or its first element is not a list (this is different from -the usual Lisp 'car'.)" - (let ((result (proc (canonical-sexp->pointer lst)))) - (if (null-pointer? result) - #f - (pointer->canonical-sexp result)))))) - -(define canonical-sexp-cdr - (let* ((ptr (libgcrypt-func "gcry_sexp_cdr")) - (proc (pointer->procedure '* ptr '(*)))) - (lambda (lst) - "Return the tail of LST, an sexp, or #f if LST is not a list." - (let ((result (proc (canonical-sexp->pointer lst)))) - (if (null-pointer? result) - #f - (pointer->canonical-sexp result)))))) - -(define canonical-sexp-nth - (let* ((ptr (libgcrypt-func "gcry_sexp_nth")) - (proc (pointer->procedure '* ptr `(* ,int)))) - (lambda (lst index) - "Return the INDEXth nested element of LST, an s-expression. Return #f -if that element does not exist, or if it's an atom. (Note: this is obviously -different from Scheme's 'list-ref'.)" - (let ((result (proc (canonical-sexp->pointer lst) index))) - (if (null-pointer? result) - #f - (pointer->canonical-sexp result)))))) - -(define (dereference-size_t p) - "Return the size_t value pointed to by P." - (bytevector-uint-ref (pointer->bytevector p (sizeof size_t)) - 0 (native-endianness) - (sizeof size_t))) - -(define canonical-sexp-length - (let* ((ptr (libgcrypt-func "gcry_sexp_length")) - (proc (pointer->procedure int ptr '(*)))) - (lambda (sexp) - "Return the length of SEXP if it's a list (including the empty list); -return zero if SEXP is an atom." - (proc (canonical-sexp->pointer sexp))))) - -(define token-string? - (let ((token-cs (char-set-union char-set:digit - char-set:letter - (char-set #\- #\. #\/ #\_ - #\: #\* #\+ #\=)))) - (lambda (str) - "Return #t if STR is a token as per Section 4.3 of -." - (and (not (string-null? str)) - (string-every token-cs str) - (not (char-set-contains? char-set:digit (string-ref str 0))))))) - -(define canonical-sexp-nth-data - (let* ((ptr (libgcrypt-func "gcry_sexp_nth_data")) - (proc (pointer->procedure '* ptr `(* ,int *)))) - (lambda (lst index) - "Return as a symbol (for \"sexp tokens\") or a bytevector (for any other -\"octet string\") the INDEXth data element (atom) of LST, an s-expression. -Return #f if that element does not exist, or if it's a list." - (let* ((size* (bytevector->pointer (make-bytevector (sizeof '*)))) - (result (proc (canonical-sexp->pointer lst) index size*))) - (if (null-pointer? result) - #f - (let* ((len (dereference-size_t size*)) - (str (pointer->string result len "ISO-8859-1"))) - ;; The sexp spec speaks of "tokens" and "octet strings". - ;; Sometimes these octet strings are actual strings (text), - ;; sometimes they're bytevectors, and sometimes they're - ;; multi-precision integers (MPIs). Only the application knows. - ;; However, for convenience, we return a symbol when a token is - ;; encountered since tokens are frequent (at least in the 'car' - ;; of each sexp.) - (if (token-string? str) - (string->symbol str) ; an sexp "token" - (bytevector-copy ; application data, textual or binary - (pointer->bytevector result len))))))))) - -(define (number->canonical-sexp number) - "Return an s-expression representing NUMBER." - (string->canonical-sexp (string-append "#" (number->string number 16) "#"))) - -(define* (bytevector->hash-data bv - #:optional - (hash-algo "sha256") - #:key (key-type 'ecc)) - "Given BV, a bytevector containing a hash of type HASH-ALGO, return an -s-expression suitable for use as the 'data' argument for 'sign'. KEY-TYPE -must be a symbol: 'dsa, 'ecc, or 'rsa." - (string->canonical-sexp - (format #f "(data (flags ~a) (hash \"~a\" #~a#))" - (case key-type - ((ecc dsa) "rfc6979") - ((rsa) "pkcs1") - (else (error "unknown key type" key-type))) - hash-algo - (bytevector->base16-string bv)))) - -(define (key-type sexp) - "Return a symbol denoting the type of public or private key represented by -SEXP--e.g., 'rsa', 'ecc'--or #f if SEXP does not denote a valid key." - (case (canonical-sexp-nth-data sexp 0) - ((public-key private-key) - (canonical-sexp-nth-data (canonical-sexp-nth sexp 1) 0)) - (else #f))) - -(define* (hash-data->bytevector data) - "Return two values: the hash value (a bytevector), and the hash algorithm (a -string) extracted from DATA, an sexp as returned by 'bytevector->hash-data'. -Return #f if DATA does not conform." - (let ((hash (find-sexp-token data 'hash))) - (if hash - (let ((algo (canonical-sexp-nth-data hash 1)) - (value (canonical-sexp-nth-data hash 2))) - (values value (symbol->string algo))) - (values #f #f)))) - -(define sign - (let* ((ptr (libgcrypt-func "gcry_pk_sign")) - (proc (pointer->procedure int ptr '(* * *)))) - (lambda (data secret-key) - "Sign DATA, a canonical s-expression representing a suitable hash, with -SECRET-KEY (a canonical s-expression whose car is 'private-key'.) Note that -DATA must be a 'data' s-expression, as returned by -'bytevector->hash-data' (info \"(gcrypt) Cryptographic Functions\")." - (let* ((sig (bytevector->pointer (make-bytevector (sizeof '*)))) - (err (proc sig (canonical-sexp->pointer data) - (canonical-sexp->pointer secret-key)))) - (if (= 0 err) - (pointer->canonical-sexp (dereference-pointer sig)) - (throw 'gcry-error 'sign err)))))) - -(define verify - (let* ((ptr (libgcrypt-func "gcry_pk_verify")) - (proc (pointer->procedure int ptr '(* * *)))) - (lambda (signature data public-key) - "Verify that SIGNATURE is a signature of DATA with PUBLIC-KEY, all of -which are gcrypt s-expressions." - (zero? (proc (canonical-sexp->pointer signature) - (canonical-sexp->pointer data) - (canonical-sexp->pointer public-key)))))) - -(define generate-key - (let* ((ptr (libgcrypt-func "gcry_pk_genkey")) - (proc (pointer->procedure int ptr '(* *)))) - (lambda (params) - "Return as an s-expression a new key pair for PARAMS. PARAMS must be an -s-expression like: (genkey (rsa (nbits 4:2048)))." - (let* ((key (bytevector->pointer (make-bytevector (sizeof '*)))) - (err (proc key (canonical-sexp->pointer params)))) - (if (zero? err) - (pointer->canonical-sexp (dereference-pointer key)) - (throw 'gcry-error 'generate-key err)))))) - -(define find-sexp-token - (let* ((ptr (libgcrypt-func "gcry_sexp_find_token")) - (proc (pointer->procedure '* ptr `(* * ,size_t)))) - (lambda (sexp token) - "Find in SEXP the first element whose 'car' is TOKEN and return it; -return #f if not found." - (let* ((token (string->pointer (symbol->string token))) - (res (proc (canonical-sexp->pointer sexp) token 0))) - (if (null-pointer? res) - #f - (pointer->canonical-sexp res)))))) - -(define-inlinable (canonical-sexp-null? sexp) - "Return #t if SEXP is the empty-list sexp." - (null-pointer? (canonical-sexp->pointer sexp))) - -(define (canonical-sexp-list? sexp) - "Return #t if SEXP is a list." - (or (canonical-sexp-null? sexp) - (> (canonical-sexp-length sexp) 0))) - -(define (canonical-sexp-fold proc seed sexp) - "Fold PROC (as per SRFI-1) over SEXP, a canonical sexp." - (if (canonical-sexp-list? sexp) - (let ((len (canonical-sexp-length sexp))) - (let loop ((index 0) - (result seed)) - (if (= index len) - result - (loop (+ 1 index) - ;; XXX: Call 'nth-data' *before* 'nth' to work around - ;; , which - ;; affects 1.6.0 and earlier versions. - (proc (or (canonical-sexp-nth-data sexp index) - (canonical-sexp-nth sexp index)) - result))))) - (error "sexp is not a list" sexp))) - -(define (canonical-sexp->sexp sexp) - "Return a Scheme sexp corresponding to SEXP. This is particularly useful to -compare sexps (since Libgcrypt does not provide an 'equal?' procedure), or to -use pattern matching." - (if (canonical-sexp-list? sexp) - (reverse - (canonical-sexp-fold (lambda (item result) - (cons (if (canonical-sexp? item) - (canonical-sexp->sexp item) - item) - result)) - '() - sexp)) - - ;; As of Libgcrypt 1.6.0, there's no function to extract the buffer of a - ;; non-list sexp (!), so we first enlist SEXP, then get at its buffer. - (let ((sexp (string->canonical-sexp - (string-append "(" (canonical-sexp->string sexp) - ")")))) - (or (canonical-sexp-nth-data sexp 0) - (canonical-sexp-nth sexp 0))))) - -(define (sexp->canonical-sexp sexp) - "Return a canonical sexp equivalent to SEXP, a Scheme sexp as returned by -'canonical-sexp->sexp'." - ;; XXX: This is inefficient, but the Libgcrypt API doesn't allow us to do - ;; much better. - (string->canonical-sexp - (call-with-output-string - (lambda (port) - (define (write item) - (cond ((list? item) - (display "(" port) - (for-each write item) - (display ")" port)) - ((symbol? item) - (format port " ~a" item)) - ((bytevector? item) - (format port " #~a#" - (bytevector->base16-string item))) - (else - (error "unsupported sexp item type" item)))) - - (write sexp))))) - -(define (gcrypt-error-printer port key args default-printer) - "Print the gcrypt error specified by ARGS." - (match args - ((proc err) - (format port "In procedure ~a: ~a: ~a" - proc (error-source err) (error-string err))))) - -(set-exception-printer! 'gcry-error gcrypt-error-printer) - -;;; pk-crypto.scm ends here diff --git a/guix/pki.scm b/guix/pki.scm index 1551425c33..6326e065e9 100644 --- a/guix/pki.scm +++ b/guix/pki.scm @@ -18,7 +18,7 @@ (define-module (guix pki) #:use-module (guix config) - #:use-module (guix pk-crypto) + #:use-module (gcrypt pk-crypto) #:use-module ((guix utils) #:select (with-atomic-file-output)) #:use-module ((guix build utils) #:select (mkdir-p)) #:use-module (ice-9 match) diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm index a359f405fe..fb2f61ce30 100644 --- a/guix/scripts/archive.scm +++ b/guix/scripts/archive.scm @@ -29,7 +29,7 @@ #:use-module (guix monads) #:use-module (guix ui) #:use-module (guix pki) - #:use-module (guix pk-crypto) + #:use-module (gcrypt pk-crypto) #:use-module (guix scripts) #:use-module (guix scripts build) #:use-module (gnu packages) diff --git a/guix/scripts/authenticate.scm b/guix/scripts/authenticate.scm index 8b19dc871b..f1fd8ee895 100644 --- a/guix/scripts/authenticate.scm +++ b/guix/scripts/authenticate.scm @@ -19,7 +19,7 @@ (define-module (guix scripts authenticate) #:use-module (guix config) #:use-module (guix base16) - #:use-module (guix pk-crypto) + #:use-module (gcrypt pk-crypto) #:use-module (guix pki) #:use-module (guix ui) #:use-module (ice-9 binary-ports) diff --git a/guix/scripts/download.scm b/guix/scripts/download.scm index 1b99bc62cf..b9162d3449 100644 --- a/guix/scripts/download.scm +++ b/guix/scripts/download.scm @@ -20,7 +20,7 @@ #:use-module (guix ui) #:use-module (guix scripts) #:use-module (guix store) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix base16) #:use-module (guix base32) #:use-module ((guix download) #:hide (url-fetch)) diff --git a/guix/scripts/hash.scm b/guix/scripts/hash.scm index cae5d6bcdf..2bd2ac4a06 100644 --- a/guix/scripts/hash.scm +++ b/guix/scripts/hash.scm @@ -20,7 +20,7 @@ (define-module (guix scripts hash) #:use-module (guix base32) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix serialization) #:use-module (guix ui) #:use-module (guix scripts) @@ -44,7 +44,7 @@ `((format . ,bytevector->nix-base32-string))) (define (show-help) - (display (G_ "Usage: guix hash [OPTION] FILE + (display (G_ "Usage: gcrypt hash [OPTION] FILE Return the cryptographic hash of FILE. Supported formats: 'nix-base32' (default), 'base32', and 'base16' ('hex' @@ -93,7 +93,7 @@ and 'hexadecimal' can be used as well).\n")) (exit 0))) (option '(#\V "version") #f #f (lambda args - (show-version-and-exit "guix hash"))))) + (show-version-and-exit "gcrypt hash"))))) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index fb0677de28..1916f3b9d7 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -41,7 +41,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages base) #:autoload (gnu packages package-management) (guix) - #:autoload (gnu packages gnupg) (libgcrypt) + #:autoload (gnu packages gnupg) (guile-gcrypt) #:autoload (gnu packages guile) (guile2.0-json guile-json) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) @@ -95,10 +95,12 @@ found." (('gnu _ ...) #t) (_ #f))) -(define guile-sqlite3&co - ;; Guile-SQLite3 and its propagated inputs. - (cons guile-sqlite3 - (package-transitive-propagated-inputs guile-sqlite3))) +(define gcrypt-sqlite3&co + ;; Guile-Gcrypt, Guile-SQLite3, and their propagated inputs. + (append-map (lambda (package) + (cons package + (package-transitive-propagated-inputs package))) + (list guile-gcrypt guile-sqlite3))) (define* (self-contained-tarball name profile #:key target @@ -124,16 +126,14 @@ added to the pack." "guix/store/schema.sql")))) (define build - (with-imported-modules `(((guix config) - => ,(make-config.scm - #:libgcrypt libgcrypt)) + (with-imported-modules `(((guix config) => ,(make-config.scm)) ,@(source-module-closure `((guix build utils) (guix build union) (guix build store-copy) (gnu build install)) #:select? not-config?)) - (with-extensions guile-sqlite3&co + (with-extensions gcrypt-sqlite3&co #~(begin (use-modules (guix build utils) ((guix build union) #:select (relative-file-name)) @@ -251,22 +251,14 @@ points for virtual file systems (like procfs), and optional symlinks. SYMLINKS must be a list of (SOURCE -> TARGET) tuples denoting symlinks to be added to the pack." - (define libgcrypt - ;; XXX: Not strictly needed, but pulled by (guix store database). - (module-ref (resolve-interface '(gnu packages gnupg)) - 'libgcrypt)) - - (define build - (with-imported-modules `(((guix config) - => ,(make-config.scm - #:libgcrypt libgcrypt)) + (with-imported-modules `(((guix config) => ,(make-config.scm)) ,@(source-module-closure '((guix build utils) (guix build store-copy) (gnu build install)) #:select? not-config?)) - (with-extensions guile-sqlite3&co + (with-extensions gcrypt-sqlite3&co #~(begin (use-modules (guix build utils) (gnu build install) @@ -349,32 +341,12 @@ must a be a GNU triplet and it is used to derive the architecture metadata in the image." (define defmod 'define-module) ;trick Geiser - (define config - ;; (guix config) module for consumption by (guix gcrypt). - (scheme-file "gcrypt-config.scm" - #~(begin - (#$defmod (guix config) - #:export (%libgcrypt)) - - ;; XXX: Work around . - (eval-when (expand load eval) - (define %libgcrypt - #+(file-append libgcrypt "/lib/libgcrypt")))))) - - (define json - ;; Pick the guile-json package that corresponds to the Guile used to build - ;; derivations. - (if (string-prefix? "2.0" (package-version (default-guile))) - guile2.0-json - guile-json)) - (define build - ;; Guile-JSON is required by (guix docker). - (with-extensions (list json) - (with-imported-modules `(,@(source-module-closure '((guix docker) - (guix build store-copy)) - #:select? not-config?) - ((guix config) => ,config)) + ;; Guile-JSON and Guile-Gcrypt are required by (guix docker). + (with-extensions (list guile-json guile-gcrypt) + (with-imported-modules (source-module-closure '((guix docker) + (guix build store-copy)) + #:select? not-config?) #~(begin (use-modules (guix docker) (srfi srfi-19) (guix build store-copy)) diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index b5dfdab32f..c5326b33da 100644 --- a/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm @@ -44,9 +44,9 @@ #:use-module (guix base64) #:use-module (guix config) #:use-module (guix derivations) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix pki) - #:use-module (guix pk-crypto) + #:use-module (gcrypt pk-crypto) #:use-module (guix workers) #:use-module (guix store) #:use-module ((guix serialization) #:select (write-file)) diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index a8fe993e33..bcc23bd39c 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -23,7 +23,7 @@ (define-module (guix scripts refresh) #:use-module (guix ui) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix scripts) #:use-module (guix store) #:use-module (guix utils) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 7634bb37f6..cd300195d8 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -26,11 +26,11 @@ #:use-module (guix config) #:use-module (guix records) #:use-module ((guix serialization) #:select (restore-file)) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix base32) #:use-module (guix base64) #:use-module (guix cache) - #:use-module (guix pk-crypto) + #:use-module (gcrypt pk-crypto) #:use-module (guix pki) #:use-module ((guix build utils) #:select (mkdir-p dump-port)) #:use-module ((guix build download) diff --git a/guix/self.scm b/guix/self.scm index 81f9b0cfd5..126116e08a 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -83,8 +83,8 @@ GUILE-VERSION (\"2.0\" or \"2.2\"), or #f if none of the packages matches." ("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) 'gnutls)) - ("libgcrypt" (ref '(gnu packages gnupg) 'libgcrypt)) ("zlib" (ref '(gnu packages compression) 'zlib)) ("gzip" (ref '(gnu packages compression) 'gzip)) ("bzip2" (ref '(gnu packages compression) 'bzip2)) @@ -454,7 +454,6 @@ assumed to be part of MODULES." (name (string-append "guix-" version)) (guile-version (effective-version)) (guile-for-build (guile-for-build guile-version)) - (libgcrypt (specification->package "libgcrypt")) (zlib (specification->package "zlib")) (gzip (specification->package "gzip")) (bzip2 (specification->package "bzip2")) @@ -481,6 +480,10 @@ assumed to be part of MODULES." "guile-sqlite3" "guile2.0-sqlite3")) + (define guile-gcrypt + (package-for-guile guile-version + "guile-gcrypt")) + (define gnutls (package-for-guile guile-version "gnutls" "guile2.0-gnutls")) @@ -489,7 +492,7 @@ assumed to be part of MODULES." (match (append-map (lambda (package) (cons (list "x" package) (package-transitive-propagated-inputs package))) - (list gnutls guile-git guile-json + (list guile-gcrypt gnutls guile-git guile-json guile-ssh guile-sqlite3)) (((labels packages _ ...) ...) packages))) @@ -513,10 +516,7 @@ assumed to be part of MODULES." ;; rebuilt when the version changes, which in turn means we ;; can have substitutes for it. #:extra-modules - `(((guix config) - => ,(make-config.scm #:libgcrypt - (specification->package - "libgcrypt")))) + `(((guix config) => ,(make-config.scm))) ;; (guix man-db) is needed at build-time by (guix profiles) ;; but we don't need to compile it; not compiling it allows @@ -526,6 +526,7 @@ assumed to be part of MODULES." ("guix/store/schema.sql" ,(local-file "../guix/store/schema.sql"))) + #:extensions (list guile-gcrypt) #:guile-for-build guile-for-build)) (define *extra-modules* @@ -600,8 +601,7 @@ assumed to be part of MODULES." '() #:extra-modules `(((guix config) - => ,(make-config.scm #:libgcrypt libgcrypt - #:zlib zlib + => ,(make-config.scm #:zlib zlib #:gzip gzip #:bzip2 bzip2 #:xz xz @@ -684,7 +684,7 @@ assumed to be part of MODULES." (define %dependency-variables ;; (guix config) variables corresponding to dependencies. - '(%libgcrypt %libz %xz %gzip %bzip2)) + '(%libz %xz %gzip %bzip2)) (define %persona-variables ;; (guix config) variables that define Guix's persona. @@ -703,7 +703,7 @@ assumed to be part of MODULES." (variables rest ...)))))) (variables %localstatedir %storedir %sysconfdir %system))) -(define* (make-config.scm #:key libgcrypt zlib gzip xz bzip2 +(define* (make-config.scm #:key zlib gzip xz bzip2 (package-name "GNU Guix") (package-version "0") (bug-report-address "bug-guix@gnu.org") @@ -723,7 +723,6 @@ assumed to be part of MODULES." %state-directory %store-database-directory %config-directory - %libgcrypt %libz %gzip %bzip2 @@ -766,9 +765,6 @@ assumed to be part of MODULES." (define %xz #+(and xz (file-append xz "/bin/xz"))) - (define %libgcrypt - #+(and libgcrypt - (file-append libgcrypt "/lib/libgcrypt"))) (define %libz #+(and zlib (file-append zlib "/lib/libz")))) diff --git a/guix/store.scm b/guix/store.scm index f41a1e2690..af7f6980cf 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -25,7 +25,7 @@ #:use-module (guix monads) #:use-module (guix base16) #:use-module (guix base32) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix profiling) #:autoload (guix build syscalls) (terminal-columns) #:use-module (rnrs bytevectors) diff --git a/guix/store/deduplication.scm b/guix/store/deduplication.scm index 8c19d7309e..53810c680f 100644 --- a/guix/store/deduplication.scm +++ b/guix/store/deduplication.scm @@ -21,7 +21,7 @@ ;;; timestamps, deduplicating, etc. (define-module (guix store deduplication) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix build utils) #:use-module (guix base16) #:use-module (srfi srfi-11) diff --git a/guix/tests.scm b/guix/tests.scm index 34e3e0fc2a..06e9f8da0b 100644 --- a/guix/tests.scm +++ b/guix/tests.scm @@ -22,7 +22,7 @@ #:use-module (guix packages) #:use-module (guix base32) #:use-module (guix serialization) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix build-system gnu) #:use-module (gnu packages bootstrap) #:use-module (srfi srfi-34) diff --git a/m4/guix.m4 b/m4/guix.m4 index a6897be961..da3c65f8f7 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -18,24 +18,6 @@ dnl dnl You should have received a copy of the GNU General Public License dnl along with GNU Guix. If not, see . -dnl GUIX_ASSERT_LIBGCRYPT_USABLE -dnl -dnl Assert that GNU libgcrypt is usable from Guile. -AC_DEFUN([GUIX_ASSERT_LIBGCRYPT_USABLE], - [AC_CACHE_CHECK([whether $LIBGCRYPT can be dynamically loaded], - [guix_cv_libgcrypt_usable_p], - [GUILE_CHECK([retval], - [(dynamic-func \"gcry_md_hash_buffer\" (dynamic-link \"$LIBGCRYPT\"))]) - if test "$retval" = 0; then - guix_cv_libgcrypt_usable_p="yes" - else - guix_cv_libgcrypt_usable_p="no" - fi]) - - if test "x$guix_cv_libgcrypt_usable_p" != "xyes"; then - AC_MSG_ERROR([GNU libgcrypt does not appear to be usable; see `--with-libgcrypt-prefix' and `README'.]) - fi]) - dnl GUIX_SYSTEM_TYPE dnl dnl Determine the Guix host system type, and store it in the diff --git a/tests/base32.scm b/tests/base32.scm index 194f8da96b..134e578633 100644 --- a/tests/base32.scm +++ b/tests/base32.scm @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (test-base32) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix base32) #:use-module (guix utils) #:use-module (srfi srfi-1) diff --git a/tests/builders.scm b/tests/builders.scm index bb9e0fa85b..8b8ef013e7 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -25,7 +25,7 @@ #:use-module (guix utils) #:use-module (guix base32) #:use-module (guix derivations) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix tests) #:use-module ((guix packages) #:select (package-derivation package-native-search-paths)) diff --git a/tests/challenge.scm b/tests/challenge.scm index 387d205a64..4b13ec278e 100644 --- a/tests/challenge.scm +++ b/tests/challenge.scm @@ -18,7 +18,7 @@ (define-module (test-challenge) #:use-module (guix tests) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix store) #:use-module (guix monads) #:use-module (guix derivations) diff --git a/tests/cpan.scm b/tests/cpan.scm index 396744e529..189dd027e6 100644 --- a/tests/cpan.scm +++ b/tests/cpan.scm @@ -20,7 +20,7 @@ (define-module (test-cpan) #:use-module (guix import cpan) #:use-module (guix base32) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix tests) #:use-module (guix grafts) #:use-module (srfi srfi-64) diff --git a/tests/crate.scm b/tests/crate.scm index eb93822bbb..a1dcfd5e52 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -21,7 +21,7 @@ #:use-module (guix import crate) #:use-module (guix base32) #:use-module (guix build-system cargo) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix tests) #:use-module (ice-9 iconv) #:use-module (ice-9 match) diff --git a/tests/derivations.scm b/tests/derivations.scm index 5d83529183..159a6971b3 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -23,7 +23,7 @@ #:use-module (guix grafts) #:use-module (guix store) #:use-module (guix utils) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix base32) #:use-module (guix tests) #:use-module (guix tests http) diff --git a/tests/gem.scm b/tests/gem.scm index 4220170ff0..a12edb294c 100644 --- a/tests/gem.scm +++ b/tests/gem.scm @@ -21,7 +21,7 @@ (define-module (test-gem) #:use-module (guix import gem) #:use-module (guix base32) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix tests) #:use-module ((guix build utils) #:select (delete-file-recursively)) #:use-module (srfi srfi-41) diff --git a/tests/hash.scm b/tests/hash.scm deleted file mode 100644 index 47dff3915b..0000000000 --- a/tests/hash.scm +++ /dev/null @@ -1,128 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2017, 2018 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 (test-hash) - #:use-module (guix hash) - #:use-module (guix base16) - #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) - #:use-module (srfi srfi-64) - #:use-module (rnrs bytevectors) - #:use-module (rnrs io ports)) - -;; Test the (guix hash) module. - -(define %empty-sha256 - ;; SHA256 hash of the empty string. - (base16-string->bytevector - "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) - -(define %hello-sha256 - ;; SHA256 hash of "hello world" - (base16-string->bytevector - "b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9")) - - -(test-begin "hash") - -(test-equal "sha1, empty" - (base16-string->bytevector "da39a3ee5e6b4b0d3255bfef95601890afd80709") - (sha1 #vu8())) - -(test-equal "sha1, hello" - (base16-string->bytevector "2aae6c35c94fcfb415dbe95f408b9ce91ee846ed") - (sha1 (string->utf8 "hello world"))) - -(test-equal "sha256, empty" - %empty-sha256 - (sha256 #vu8())) - -(test-equal "sha256, hello" - %hello-sha256 - (sha256 (string->utf8 "hello world"))) - -(test-equal "open-sha256-port, empty" - %empty-sha256 - (let-values (((port get) - (open-sha256-port))) - (close-port port) - (get))) - -(test-equal "open-sha256-port, hello" - (list %hello-sha256 (string-length "hello world")) - (let-values (((port get) - (open-sha256-port))) - (put-bytevector port (string->utf8 "hello world")) - (force-output port) - (list (get) (port-position port)))) - -(test-assert "port-sha256" - (let* ((file (search-path %load-path "ice-9/psyntax.scm")) - (size (stat:size (stat file))) - (contents (call-with-input-file file get-bytevector-all))) - (equal? (sha256 contents) - (call-with-input-file file port-sha256)))) - -(test-equal "open-sha256-input-port, empty" - `("" ,%empty-sha256) - (let-values (((port get) - (open-sha256-input-port (open-string-input-port "")))) - (let ((str (get-string-all port))) - (list str (get))))) - -(test-equal "open-sha256-input-port, hello" - `("hello world" ,%hello-sha256) - (let-values (((port get) - (open-sha256-input-port - (open-bytevector-input-port - (string->utf8 "hello world"))))) - (let ((str (get-string-all port))) - (list str (get))))) - -(test-equal "open-sha256-input-port, hello, one two" - (list (string->utf8 "hel") (string->utf8 "lo") - (base16-string->bytevector ; echo -n hello | sha256sum - "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824") - " world") - (let-values (((port get) - (open-sha256-input-port - (open-bytevector-input-port (string->utf8 "hello world"))))) - (let* ((one (get-bytevector-n port 3)) - (two (get-bytevector-n port 2)) - (hash (get)) - (three (get-string-all port))) - (list one two hash three)))) - -(test-equal "open-sha256-input-port, hello, read from wrapped port" - (list (string->utf8 "hello") - (base16-string->bytevector ; echo -n hello | sha256sum - "2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824") - " world") - (let*-values (((wrapped) - (open-bytevector-input-port (string->utf8 "hello world"))) - ((port get) - (open-sha256-input-port wrapped))) - (let* ((hello (get-bytevector-n port 5)) - (hash (get)) - - ;; Now read from WRAPPED to make sure its current position is - ;; correct. - (world (get-string-all wrapped))) - (list hello hash world)))) - -(test-end) diff --git a/tests/nar.scm b/tests/nar.scm index 9b5fb984b4..d610ea53f7 100644 --- a/tests/nar.scm +++ b/tests/nar.scm @@ -21,7 +21,7 @@ #:use-module (guix nar) #:use-module (guix serialization) #:use-module (guix store) - #:use-module ((guix hash) + #:use-module ((gcrypt hash) #:select (open-sha256-port open-sha256-input-port)) #:use-module ((guix packages) #:select (base32)) diff --git a/tests/opam.scm b/tests/opam.scm index 26832174a8..a1320abfdc 100644 --- a/tests/opam.scm +++ b/tests/opam.scm @@ -19,7 +19,7 @@ (define-module (test-opam) #:use-module (guix import opam) #:use-module (guix base32) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix tests) #:use-module ((guix build utils) #:select (delete-file-recursively mkdir-p which)) #:use-module (srfi srfi-64) diff --git a/tests/packages.scm b/tests/packages.scm index 65ccb14889..237feb7aba 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -28,7 +28,7 @@ #:renamer (lambda (name) (cond ((eq? name 'location) 'make-location) (else name)))) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix derivations) #:use-module (guix packages) #:use-module (guix grafts) diff --git a/tests/pk-crypto.scm b/tests/pk-crypto.scm deleted file mode 100644 index fe33a6f7b5..0000000000 --- a/tests/pk-crypto.scm +++ /dev/null @@ -1,290 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2017 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 (test-pk-crypto) - #:use-module (guix pk-crypto) - #:use-module (guix utils) - #:use-module (guix base16) - #:use-module (guix hash) - #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) - #:use-module (srfi srfi-26) - #:use-module (srfi srfi-64) - #:use-module (rnrs bytevectors) - #:use-module (rnrs io ports) - #:use-module (ice-9 match)) - -;; Test the (guix pk-crypto) module. - -(define %key-pair - ;; RSA key pair that was generated with: - ;; (generate-key (string->canonical-sexp "(genkey (rsa (nbits 4:1024)))")) - ;; which takes a bit of time. - "(key-data - (public-key - (rsa - (n #00C1F764069F54FFE93A126B02328903E984E4AE3AF6DF402B5B6B3907911B88C385F1BA76A002EC9DEA109A5228EF0E62EE31A06D1A5861CAB474F6C857AC66EB65A1905F25BBA1869579E73A3B7FED13AF5A1667326F88CDFC2FF24B03C14FD1384AA7E73CA89572880B606E3A974E15347963FC7B6378574936A47580DBCB45#) - (e #010001#))) - (private-key - (rsa - (n #00C1F764069F54FFE93A126B02328903E984E4AE3AF6DF402B5B6B3907911B88C385F1BA76A002EC9DEA109A5228EF0E62EE31A06D1A5861CAB474F6C857AC66EB65A1905F25BBA1869579E73A3B7FED13AF5A1667326F88CDFC2FF24B03C14FD1384AA7E73CA89572880B606E3A974E15347963FC7B6378574936A47580DBCB45#) - (e #010001#) - (d #58CAD84653D0046A8EC3F9AA82D9C829B145422109FC3F12DA01A694B92FA296E70D366FB166454D30E632CEE3A033B4C41781BA10325F69FCDC0250CA19C8EEB352FA085992494098DB133E682ED38A931701F0DED1A1E508F4341A4FB446A04F019427C7CB3C44F251EEA9D386100DA80F125E0FD5CE1B0DFEC6D21516EACD#) - (p #00D47F185147EC39393CCDA4E7323FFC20FC8B8073E2A54DD63BA392A66975E4204CA48572496A9DFD7522436B852C07472A5AB25B7706F7C14E6F33FBC420FF3B#) - (q #00E9AD22F158060BC9AE3601DA623AFC60FFF3058795802CA92371C00097335CF9A23D7782DE353C9DBA93D7BB99E6A24A411107605E722481C5C191F80D7EB77F#) - (u #59B45B95AE01A7A7370FAFDB08FE73A4793CE37F228961B09B1B1E7DDAD9F8D3E28F5C5E8B4B067E6B8E0BBF3F690B42991A79E46108DDCDA2514323A66964DE#))))") - -(define %ecc-key-pair - ;; Ed25519 key pair generated with: - ;; (generate-key (string->canonical-sexp "(genkey (ecdsa (curve Ed25519) (flags rfc6979 transient)))")) - "(key-data - (public-key - (ecc - (curve Ed25519) - (q #94869C1B9E69DB8DD910B7F7F4D6E56A63A964A59AE8F90F6703ACDDF6F50C81#))) - (private-key - (ecc - (curve Ed25519) - (q #94869C1B9E69DB8DD910B7F7F4D6E56A63A964A59AE8F90F6703ACDDF6F50C81#) - (d #6EFB32D0B4EC6B3237B523539F1979379B82726AAA605EB2FBA6775B2B777B78#))))") - -(test-begin "pk-crypto") - -(test-assert "version" - (gcrypt-version)) - -(let ((sexps '("(foo bar)" - - ;; In Libgcrypt 1.5.3 the following integer is rendered as - ;; binary, whereas in 1.6.0 it's rendered as is (hexadecimal.) - ;;"#C0FFEE#" - - "(genkey \n (rsa \n (nbits \"1024\")\n )\n )"))) - (test-equal "string->canonical-sexp->string" - sexps - (let ((sexps (map string->canonical-sexp sexps))) - (and (every canonical-sexp? sexps) - (map (compose string-trim-both canonical-sexp->string) sexps))))) - -(gc) ; stress test! - -(let ((sexps `(("(foo bar)" foo -> "(foo bar)") - ("(foo (bar (baz 3:123)))" baz -> "(baz \"123\")") - ("(foo (bar 3:123))" baz -> #f)))) - (test-equal "find-sexp-token" - (map (match-lambda - ((_ _ '-> expected) - expected)) - sexps) - (map (match-lambda - ((input token '-> _) - (let ((sexp (find-sexp-token (string->canonical-sexp input) token))) - (and sexp - (string-trim-both (canonical-sexp->string sexp)))))) - sexps))) - -(gc) - -(test-equal "canonical-sexp-length" - '(0 1 2 4 0 0) - (map (compose canonical-sexp-length string->canonical-sexp) - '("()" "(a)" "(a b)" "(a #616263# b #C001#)" "a" "#123456#"))) - -(test-equal "canonical-sexp-list?" - '(#t #f #t #f) - (map (compose canonical-sexp-list? string->canonical-sexp) - '("()" "\"abc\"" "(a b c)" "#123456#"))) - -(gc) - -(test-equal "canonical-sexp-car + cdr" - '("(b \n (c xyz)\n )") - (let ((lst (string->canonical-sexp "(a (b (c xyz)))"))) - (map (lambda (sexp) - (and sexp (string-trim-both (canonical-sexp->string sexp)))) - ;; Note: 'car' returns #f when the first element is an atom. - (list (canonical-sexp-car (canonical-sexp-cdr lst)))))) - -(gc) - -(test-equal "canonical-sexp-nth" - '("(b pqr)" "(c \"456\")" "(d xyz)" #f #f) - - (let ((lst (string->canonical-sexp "(a (b 3:pqr) (c 3:456) (d 3:xyz))"))) - ;; XXX: In Libgcrypt 1.5.3, (canonical-sexp-nth lst 0) returns LST, whereas in - ;; 1.6.0 it returns #f. - (map (lambda (sexp) - (and sexp (string-trim-both (canonical-sexp->string sexp)))) - (unfold (cut > <> 5) - (cut canonical-sexp-nth lst <>) - 1+ - 1)))) - -(gc) - -(test-equal "canonical-sexp-nth-data" - `(Name Otto Meier #f ,(base16-string->bytevector "123456") #f) - (let ((lst (string->canonical-sexp - "(Name Otto Meier (address Burgplatz) #123456#)"))) - (unfold (cut > <> 5) - (cut canonical-sexp-nth-data lst <>) - 1+ - 0))) - -(let ((bv (base16-string->bytevector - "5eff0b55c9c5f5e87b4e34cd60a2d5654ca1eb78c7b3c67c3179fed1cff07b4c"))) - (test-equal "hash corrupt due to restrictive locale encoding" - bv - - ;; In Guix up to 0.6 included this test would fail because at some point - ;; the hash value would be cropped to ASCII. In practice 'guix - ;; authenticate' would produce invalid signatures that would fail - ;; signature verification. See . - (let ((locale (setlocale LC_ALL))) - (dynamic-wind - (lambda () - (setlocale LC_ALL "C")) - (lambda () - (hash-data->bytevector - (string->canonical-sexp - (canonical-sexp->string - (bytevector->hash-data bv "sha256"))))) - (lambda () - (setlocale LC_ALL locale)))))) - -(gc) - -;; XXX: The test below is typically too long as it needs to gather enough entropy. - -;; (test-assert "generate-key" -;; (let ((key (generate-key (string->canonical-sexp -;; "(genkey (rsa (nbits 3:128)))")))) -;; (and (canonical-sexp? key) -;; (find-sexp-token key 'key-data) -;; (find-sexp-token key 'public-key) -;; (find-sexp-token key 'private-key)))) - -(test-assert "bytevector->hash-data->bytevector" - (let* ((bv (sha256 (string->utf8 "Hello, world."))) - (data (bytevector->hash-data bv "sha256"))) - (and (canonical-sexp? data) - (let-values (((value algo) (hash-data->bytevector data))) - (and (string=? algo "sha256") - (bytevector=? value bv)))))) - -(test-equal "key-type" - '(rsa ecc) - (map (compose key-type - (cut find-sexp-token <> 'public-key) - string->canonical-sexp) - (list %key-pair %ecc-key-pair))) - -(test-assert "sign + verify" - (let* ((pair (string->canonical-sexp %key-pair)) - (secret (find-sexp-token pair 'private-key)) - (public (find-sexp-token pair 'public-key)) - (data (bytevector->hash-data - (sha256 (string->utf8 "Hello, world.")) - #:key-type (key-type public))) - (sig (sign data secret))) - (and (verify sig data public) - (not (verify sig - (bytevector->hash-data - (sha256 (string->utf8 "Hi!")) - #:key-type (key-type public)) - public))))) - -;; Ed25519 appeared in libgcrypt 1.6.0. -(test-skip (if (version>? (gcrypt-version) "1.6.0") 0 1)) -(test-assert "sign + verify, Ed25519" - (let* ((pair (string->canonical-sexp %ecc-key-pair)) - (secret (find-sexp-token pair 'private-key)) - (public (find-sexp-token pair 'public-key)) - (data (bytevector->hash-data - (sha256 (string->utf8 "Hello, world.")))) - (sig (sign data secret))) - (and (verify sig data public) - (not (verify sig - (bytevector->hash-data - (sha256 (string->utf8 "Hi!"))) - public))))) - -(gc) - -(test-equal "canonical-sexp->sexp" - `((data - (flags pkcs1) - (hash sha256 - ,(base16-string->bytevector - "2749f0ea9f26c6c7be746a9cff8fa4c2f2a02b000070dba78429e9a11f87c6eb"))) - - (public-key - (rsa - (n ,(base16-string->bytevector - (string-downcase - "00C1F764069F54FFE93A126B02328903E984E4AE3AF6DF402B5B6B3907911B88C385F1BA76A002EC9DEA109A5228EF0E62EE31A06D1A5861CAB474F6C857AC66EB65A1905F25BBA1869579E73A3B7FED13AF5A1667326F88CDFC2FF24B03C14FD1384AA7E73CA89572880B606E3A974E15347963FC7B6378574936A47580DBCB45"))) - (e ,(base16-string->bytevector - "010001"))))) - - (list (canonical-sexp->sexp - (string->canonical-sexp - "(data - (flags pkcs1) - (hash \"sha256\" - #2749f0ea9f26c6c7be746a9cff8fa4c2f2a02b000070dba78429e9a11f87c6eb#))")) - - (canonical-sexp->sexp - (find-sexp-token (string->canonical-sexp %key-pair) - 'public-key)))) - - -(let ((lst - `((data - (flags pkcs1) - (hash sha256 - ,(base16-string->bytevector - "2749f0ea9f26c6c7be746a9cff8fa4c2f2a02b000070dba78429e9a11f87c6eb"))) - - (public-key - (rsa - (n ,(base16-string->bytevector - (string-downcase - "00C1F764069F54FFE93A126B02328903E984E4AE3AF6DF402B5B6B3907911B88C385F1BA76A002EC9DEA109A5228EF0E62EE31A06D1A5861CAB474F6C857AC66EB65A1905F25BBA1869579E73A3B7FED13AF5A1667326F88CDFC2FF24B03C14FD1384AA7E73CA89572880B606E3A974E15347963FC7B6378574936A47580DBCB45"))) - (e ,(base16-string->bytevector - "010001")))) - - ,(base16-string->bytevector - "2749f0ea9f26c6c7be746a9cff8fa4c2f2a02b000070dba78429e9a11f87c6eb")))) - (test-equal "sexp->canonical-sexp->sexp" - lst - (map (compose canonical-sexp->sexp sexp->canonical-sexp) - lst))) - -(let ((sexp `(signature - (public-key - (rsa - (n ,(make-bytevector 1024 1)) - (e ,(base16-string->bytevector "010001"))))))) - (test-equal "https://bugs.g10code.com/gnupg/issue1594" - ;; The gcrypt bug above was primarily affecting our uses in - ;; 'canonical-sexp->sexp', typically when applied to a signature sexp (in - ;; 'guix authenticate -verify') with a "big" RSA key, such as 4096 bits. - sexp - (canonical-sexp->sexp (sexp->canonical-sexp sexp)))) - -(test-end) diff --git a/tests/pki.scm b/tests/pki.scm index 876ad98d73..d6a6b476c7 100644 --- a/tests/pki.scm +++ b/tests/pki.scm @@ -18,8 +18,8 @@ (define-module (test-pki) #:use-module (guix pki) - #:use-module (guix pk-crypto) - #:use-module (guix hash) + #:use-module (gcrypt pk-crypto) + #:use-module (gcrypt hash) #:use-module (rnrs io ports) #:use-module (srfi srfi-64)) diff --git a/tests/publish.scm b/tests/publish.scm index 1ed8308076..0e793c1ee5 100644 --- a/tests/publish.scm +++ b/tests/publish.scm @@ -25,7 +25,7 @@ #:use-module (guix tests) #:use-module (guix config) #:use-module (guix utils) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix store) #:use-module (guix derivations) #:use-module (guix gexp) @@ -33,7 +33,7 @@ #:use-module (guix base64) #:use-module ((guix records) #:select (recutils->alist)) #:use-module ((guix serialization) #:select (restore-file)) - #:use-module (guix pk-crypto) + #:use-module (gcrypt pk-crypto) #:use-module ((guix pki) #:select (%public-key-file %private-key-file)) #:use-module (guix zlib) #:use-module (web uri) diff --git a/tests/pypi.scm b/tests/pypi.scm index 310c6c8f29..616ec191f5 100644 --- a/tests/pypi.scm +++ b/tests/pypi.scm @@ -20,7 +20,7 @@ (define-module (test-pypi) #:use-module (guix import pypi) #:use-module (guix base32) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix tests) #:use-module (guix build-system python) #:use-module ((guix build utils) #:select (delete-file-recursively which)) diff --git a/tests/store-deduplication.scm b/tests/store-deduplication.scm index 4ca2ec0f61..e438aa84c6 100644 --- a/tests/store-deduplication.scm +++ b/tests/store-deduplication.scm @@ -19,7 +19,7 @@ (define-module (test-store-deduplication) #:use-module (guix tests) #:use-module (guix store deduplication) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module ((guix utils) #:select (call-with-temporary-directory)) #:use-module (guix build utils) #:use-module (rnrs bytevectors) diff --git a/tests/store.scm b/tests/store.scm index 47fab0df18..71ac57580e 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -21,7 +21,7 @@ #:use-module (guix store) #:use-module (guix utils) #:use-module (guix monads) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix base32) #:use-module (guix packages) #:use-module (guix derivations) diff --git a/tests/substitute.scm b/tests/substitute.scm index 0ad6247954..964a57f30b 100644 --- a/tests/substitute.scm +++ b/tests/substitute.scm @@ -20,9 +20,9 @@ (define-module (test-substitute) #:use-module (guix scripts substitute) #:use-module (guix base64) - #:use-module (guix hash) + #:use-module (gcrypt hash) #:use-module (guix serialization) - #:use-module (guix pk-crypto) + #:use-module (gcrypt pk-crypto) #:use-module (guix pki) #:use-module (guix config) #:use-module (guix base32) -- cgit v1.2.3 From 95681e55862991a5303449a4eb3961441b337033 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 4 Sep 2018 15:08:13 -0400 Subject: gnu: Zsh: Update to 5.6 [fixes CVE-2018-{0502,13259}]. * gnu/packages/shells.scm (zsh): Update to 5.6. [arguments]: Skip some tests. --- gnu/packages/shells.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 6dbe1c4db7..c3647221aa 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -292,7 +292,7 @@ history mechanism, job control and a C-like syntax.") (define-public zsh (package (name "zsh") - (version "5.5.1") + (version "5.6") (source (origin (method url-fetch) (uri (list (string-append @@ -303,7 +303,7 @@ history mechanism, job control and a C-like syntax.") ".tar.xz"))) (sha256 (base32 - "105aqkdfsdxc4531anrj2zis2ywz6icagjam9lsc235yzh48ihz1")))) + "1mp6h2452z2029n12mxipjv4b0cc8i8sb72g8p8jklg8275iysvl")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") #:phases @@ -336,6 +336,11 @@ history mechanism, job control and a C-like syntax.") (("command -pv") "command -v") (("command -p") "command ") (("'command' -p") "'command' ")) + ;; Several of these tests fail spuriously in the Guix + ;; build environment due to assumptions about PATH and + ;; the location of the test files. It was easier to just + ;; skip them than try to make them work. + (delete-file "Test/A05execution.ztst") #t))))) (native-inputs `(("autoconf" ,autoconf))) (inputs `(("ncurses" ,ncurses) -- cgit v1.2.3 From fcf4841c0ee16631e8330d797cf3788dac0eca05 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 4 Sep 2018 18:33:06 -0400 Subject: gnu: Zsh: Patch some tests that began failing in 5.6. * gnu/packages/shells.scm (zsh)[arguments]: Patch the tests rather than deleting them. --- gnu/packages/shells.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index c3647221aa..900c8ec686 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -336,11 +336,19 @@ history mechanism, job control and a C-like syntax.") (("command -pv") "command -v") (("command -p") "command ") (("'command' -p") "'command' ")) - ;; Several of these tests fail spuriously in the Guix - ;; build environment due to assumptions about PATH and - ;; the location of the test files. It was easier to just - ;; skip them than try to make them work. - (delete-file "Test/A05execution.ztst") + ;; This file is ISO-8859-1 encoded. + (with-fluids ((%default-port-encoding #f)) + (substitute* "Test/A05execution.ztst" + ;; Help it find `sh` + (("PATH=/bin:\\$\\{ZTST_testdir\\}/command.tmp/ tstcmd-slashless") + (string-append "PATH=/bin:" + (assoc-ref %build-inputs "bash") "/bin:" + "${ZTST_testdir}/command.tmp/ tstcmd-slashless")) + ;; Help it find `echo` + (("PATH=/bin:\\$\\{ZTST_testdir\\}/command.tmp tstcmd-arg") + (string-append "PATH=/bin:" + (assoc-ref %build-inputs "coreutils") "/bin:" + "PATH=/bin:${ZTST_testdir}/command.tmp tstcmd-arg")))) #t))))) (native-inputs `(("autoconf" ,autoconf))) (inputs `(("ncurses" ,ncurses) -- cgit v1.2.3 From fefe17b0888b467383ea91fed73a9586295c49f0 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 5 Sep 2018 10:19:25 +0200 Subject: gnu: dolphin-emu: Update to commit 5f0d825. * gnu/packages/emulators.scm (dolphin-emu): Update to commit 5f0d825. --- gnu/packages/emulators.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 8e68c676ef..e02339af62 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -117,8 +117,8 @@ ;; Building from recent Git because the official 5.0 release no longer builds. (define-public dolphin-emu - (let ((commit "806c1ee8f0ed824008185212bfab2658d400b576") - (revision "2")) + (let ((commit "5f0d825f40b8aabe13eaef32d44ab667ff8e8c28") + (revision "3")) (package (name "dolphin-emu") (version (git-version "5.0" revision commit)) @@ -144,7 +144,7 @@ #t)) (sha256 (base32 - "1sdc7rh6z7gjx4kxg18jrv7srfpx1vgf936zg5y43radnlscrh1j")))) + "0dh7mih16aif9ynbgcsn7n10f89g8d232i86xqfp2rijsdggcmzl")))) (build-system cmake-build-system) (arguments '(#:tests? #f -- cgit v1.2.3 From ca1dc4c76a81d289360c0601fed16a7852833d9b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 11:44:15 +0200 Subject: gnu: nss-pam-ldapd: Update to 0.9.10. * gnu/packages/openldap.scm (nss-pam-ldapd): Update to 0.9.10. --- 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 12964e302a..4b615b5d32 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -108,14 +108,14 @@ (define-public nss-pam-ldapd (package (name "nss-pam-ldapd") - (version "0.9.9") + (version "0.9.10") (source (origin (method url-fetch) (uri (string-append "https://arthurdejong.org/nss-pam-ldapd/" "nss-pam-ldapd-" version ".tar.gz")) (sha256 (base32 - "1lj7qkjlg3bshwdc5x5r1ny37rly4wgm1c8b6w6b5f4wa11nmji0")))) + "1cqamcr6qpgwxijlr6kg7jspjamjra8w0haan0qssn0yxn95d7c0")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 0d7974c376c4b84dd26096ba0c53ed2535afcbc9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 11:07:26 +0200 Subject: gnu: libbigwig: Update to 0.4.2. * gnu/packages/bioinformatics.scm (libbigwig): Update to 0.4.2. [source]: Fetch from git. [arguments]: Disable tests; remove build phases "disable-curl-test" and "create-target-dirs". [native-inputs]: Add python-2. --- gnu/packages/bioinformatics.scm | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f60fc4c84c..7f865ae878 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1887,42 +1887,33 @@ other types of unwanted sequence from high-throughput sequencing reads.") (define-public libbigwig (package (name "libbigwig") - (version "0.1.4") + (version "0.4.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dpryan79/libBigWig/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dpryan79/libBigWig.git") + (commit version))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "098rjh35pi4a9q83n8wiwvyzykjqj6l8q189p1xgfw4ghywdlvw1")))) + "0h2smg24v5srdcqzrmz2g23cmlp4va465mgx8r2z571sfz8pv454")))) (build-system gnu-build-system) (arguments `(#:test-target "test" + #:tests? #f ; tests require access to the web #:make-flags (list "CC=gcc" (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure) - (add-before 'check 'disable-curl-test - (lambda _ - (substitute* "Makefile" - (("./test/testRemote.*") "")) - #t)) - ;; This has been fixed with the upstream commit 4ff6959cd8a0, but - ;; there has not yet been a release containing this change. - (add-before 'install 'create-target-dirs - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/lib")) - (mkdir-p (string-append out "/include")) - #t)))))) + (delete 'configure)))) (inputs `(("zlib" ,zlib) ("curl" ,curl))) (native-inputs - `(("doxygen" ,doxygen))) + `(("doxygen" ,doxygen) + ;; Need for tests + ("python" ,python-2))) (home-page "https://github.com/dpryan79/libBigWig") (synopsis "C library for handling bigWig files") (description -- cgit v1.2.3 From 8afdeb87518f09383d93cf0dc9b86bde237ba561 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 11:08:25 +0200 Subject: gnu: python-pybigwig: Update to 0.3.12. * gnu/packages/bioinformatics.scm (python-pybigwig): Update to 0.3.12. [propagated-inputs]: Add python-numpy. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7f865ae878..05d516165e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1924,13 +1924,13 @@ files.") (define-public python-pybigwig (package (name "python-pybigwig") - (version "0.2.5") + (version "0.3.12") (source (origin (method url-fetch) (uri (pypi-uri "pyBigWig" version)) (sha256 (base32 - "0yrpdxg3y0sny25x4w22lv1k47jzccqjmg7j4bp0hywklvp0hg7d")) + "00w4kfnm2c5l7wdwr2nj1z5djv8kzgf7h1zhsgv6njff1rwr26g0")) (modules '((guix build utils))) (snippet '(begin @@ -1946,6 +1946,8 @@ files.") (substitute* "setup.py" (("libs=\\[") "libs=[\"BigWig\", ")) #t))))) + (propagated-inputs + `(("python-numpy" ,python-numpy))) (inputs `(("libbigwig" ,libbigwig) ("zlib" ,zlib) -- cgit v1.2.3 From 4fd2622df8615ce3e4d081124bee824315f00f85 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 11:09:01 +0200 Subject: gnu: python-tables: Update to 3.4.4. * gnu/packages/python.scm (python-tables): Update to 3.4.4. --- 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 8cf5550f81..8c7c9d3c33 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6297,14 +6297,14 @@ printing of sub-tables by specifying a row range.") (define-public python-tables (package (name "python-tables") - (version "3.2.2") + (version "3.4.4") (source (origin (method url-fetch) (uri (pypi-uri "tables" version)) (sha256 (base32 - "117s6w7s3yxafpmf3zz3svana7xfrsviw01va1xp7h8ylx8v6r1m")) + "0affz7k8babh8wdmsgrz5jxrd569by2w8ffimcxs9wiaf5rw1idx")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 030f1367f055720034cb178e50fd5d4c6ff371b1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Sep 2018 10:35:43 +0200 Subject: channels: Add 'latest-channel-derivation' convenience procedure. * guix/channels.scm (latest-channel-derivations): Remove. (latest-channel-instances*, latest-channel-derivation): New procedures. --- guix/channels.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index ec3e05eaf5..794383fe22 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -48,7 +48,7 @@ latest-channel-instances channel-instance-derivations - latest-channel-derivations + latest-channel-derivation channel-instances->manifest)) ;;; Commentary: @@ -216,14 +216,6 @@ INSTANCES." (list core)))) instances))) -(define latest-channel-derivations - (let ((latest-channel-instances (store-lift latest-channel-instances))) - (lambda (channels) - "Return, as a monadic value, the list of derivations for the latest -instances of CHANNELS." - (mlet %store-monad ((instances (latest-channel-instances channels))) - (channel-instance-derivations instances))))) - (define (whole-package-for-legacy name modules) "Return a full-blown Guix package for MODULES, a derivation that builds Guix modules in the old ~/.config/guix/latest style." @@ -290,3 +282,14 @@ channel instances." (entries (mapm %store-monad instance->entry (zip instances derivations)))) (return (manifest entries)))) + +(define latest-channel-instances* + (store-lift latest-channel-instances)) + +(define* (latest-channel-derivation #:optional (channels %default-channels)) + "Return as a monadic value the derivation that builds the profile for the +latest instances of CHANNELS." + (mlet* %store-monad ((instances ((store-lift latest-channel-instances) + channels)) + (manifest (channel-instances->manifest instances))) + (profile-derivation manifest))) -- cgit v1.2.3 From 185948b8a83f583135de050698cff983e46c8145 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Sep 2018 13:57:43 +0200 Subject: gnu: xorg: Fix typo. * gnu/packages/xorg.scm: Fix typo in Benjamin's email address. --- gnu/packages/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c89661272b..30e46fac7c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2018 Oleg Pykhalov -;;; Copyright © 2018 Benjamin Slade +;;; Copyright © 2018 Benjamin Slade ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 3d43017026f9995ad128915db8ca5eafe061bf75 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Sep 2018 13:58:07 +0200 Subject: tests: Adjust 'add-file-tree-to-store' test for lack of /bin/sh. * tests/store.scm (%shell): New variable. ("add-file-tree-to-store"): Use it instead of "/bin/sh". This fixes builds in the chroot build environment. --- tests/store.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/store.scm b/tests/store.scm index 71ac57580e..2858369706 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -45,6 +45,9 @@ (define %store (open-connection-for-tests)) +(define %shell + (or (getenv "SHELL") (getenv "CONFIG_SHELL"))) + (test-begin "store") @@ -220,7 +223,8 @@ ("./foo/c" directory #t) ("./foo/c/p" regular "file p") ("./foo/c/q" directory #t) - ("./foo/c/q/x" regular "#!/bin/sh\nexit 42") + ("./foo/c/q/x" regular + ,(string-append "#!" %shell "\nexit 42")) ("./foo/c/q/y" symlink "..") ("./foo/c/q/z" directory #t)) (let* ((tree `("file-tree" directory @@ -231,7 +235,7 @@ ("p" regular (data ,(string->utf8 "file p"))) ("q" directory ("x" executable - (data "#!/bin/sh\nexit 42")) + (data ,(string-append "#!" %shell "\nexit 42"))) ("y" symlink "..") ("z" directory)))) ("bar" directory))) -- cgit v1.2.3 From 53166aec987957efba917c83f093817d6cf6e943 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Sep 2018 14:31:48 +0200 Subject: gnu: guix: Update to 3d43017. * gnu/packages/package-management.scm (guix): Update to 3d43017. --- 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 e40a94a844..b0941b50de 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -101,8 +101,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.15.0") - (commit "8bbb79cf95a07a40950448a8a09d888254404ed4") - (revision 2)) + (commit "3d43017026f9995ad128915db8ca5eafe061bf75") + (revision 3)) (package (name "guix") @@ -118,7 +118,7 @@ (commit commit))) (sha256 (base32 - "0h83l91v2cg9bb78c7vqx9wj71ckz22jbjmm2fy4vqs9216jnvc0")) + "167rzz2h33xmmchkplwzfq94s5jwdn5nabsq2lb84s54ps0sm89m")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 998100e6e8be64d4cc14e6509f744d3f5c37cf27 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Wed, 5 Sep 2018 02:10:48 +0800 Subject: gnu: eyed3: Update home page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mp3.scm (eyed3)[home-page]: Update to redirected HTTPS URL. Signed-off-by: 宋文武 --- gnu/packages/mp3.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 579127d06e..fb919c6e6c 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -491,7 +491,7 @@ specifically mp3 files containing ID3 metadata (i.e. song info). It provides a command-line tool (eyeD3) and a Python library (import eyed3) that can be used to write your own applications or plugins that are callable from the command-line tool.") - (home-page "http://eyed3.nicfit.net/") + (home-page "https://eyed3.readthedocs.io/en/latest/") (license license:gpl2+))) (define-public chromaprint -- cgit v1.2.3 From 296f091b4879679cf970e1526d919c671c80a473 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Wed, 5 Sep 2018 02:16:53 +0800 Subject: gnu: packages: mp3: Use HTTPS where possible. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mp3.scm (libmad)[home-page]: Use HTTPS. (libid3tag)[home-page]: Likewise. (mp3info)[source, home-page]: Likewise. (mpg123)[source]: Likewise. (libmpcdec)[source, home-page]: Likewise. Signed-off-by: 宋文武 --- gnu/packages/mp3.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index fb919c6e6c..c9effbafa3 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -84,7 +84,7 @@ fully implemented. This package contains the library.") (license license:gpl2+) - (home-page "http://www.underbit.com/products/mad/"))) + (home-page "https://www.underbit.com/products/mad/"))) (define-public libid3tag (package @@ -105,7 +105,7 @@ This package contains the library.") "Libid3tag is a library for reading ID3 tags, both ID3v1 and the various versions of ID3v2.") (license license:gpl2+) - (home-page "http://www.underbit.com/products/mad/"))) + (home-page "https://www.underbit.com/products/mad/"))) (define-public id3lib (package @@ -184,7 +184,7 @@ Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files.") (source (origin (method url-fetch) (uri (string-append - "http://ibiblio.org" + "https://ibiblio.org" "/pub/linux/apps/sound/mp3-utils/mp3info/mp3info-" version ".tgz")) (sha256 @@ -231,7 +231,7 @@ Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files.") (inputs `(("gtk+" ,gtk+-2) ("ncurses" ,ncurses))) - (home-page "http://www.ibiblio.org/mp3info/") + (home-page "https://www.ibiblio.org/mp3info/") (synopsis "MP3 technical info viewer and ID3 1.x tag editor") (description "MP3Info is a little utility used to read and modify the ID3 tags of MP3 @@ -309,7 +309,7 @@ This package contains the binary.") (uri (list (string-append "mirror://sourceforge/mpg123/mpg123/" version "/mpg123-" version ".tar.bz2") (string-append - "http://www.mpg123.org/download/mpg123-" + "https://www.mpg123.org/download/mpg123-" version ".tar.bz2"))) (sha256 (base32 @@ -413,7 +413,7 @@ for album and track information.") (source (origin (method url-fetch) (uri (string-append - "http://files.musepack.net/source/libmpcdec-" + "https://files.musepack.net/source/libmpcdec-" version ".tar.bz2")) (sha256 (base32 @@ -424,7 +424,7 @@ for album and track information.") "This library supports decoding of the Musepack (MPC) audio compression format.") (license license:bsd-3) - (home-page "http://musepack.net"))) + (home-page "https://musepack.net"))) (define-public mpc123 (package -- cgit v1.2.3 From b26e4f26ff0bfede3dc17db48dce2936ecd0c129 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 31 Jul 2018 11:04:19 -0500 Subject: gnu: Add SUNDIALS. * gnu/packages/maths.scm (sundials, sundials-openmpi): New variables. --- gnu/packages/maths.scm | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 42136f65ea..c6bcec844b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4042,3 +4042,80 @@ terminal do calculations simply and quickly. The formula to be calculated can be fed to @command{tcalc} through the command line.") (home-page "https://sites.google.com/site/mohammedisam2000/tcalc") (license license:gpl3+))) + +(define-public sundials + (package + (name "sundials") + (version "3.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://computation.llnl.gov/projects/sundials/download/" + "sundials-" version ".tar.gz")) + (sha256 + (base32 + "090s8ymhd0g1s1d44fa73r5yi32hb4biwahhbfi327zd64yn8kd2")))) + (build-system cmake-build-system) + (native-inputs + `(("python" ,python-2))) ;for tests; syntax incompatible with python 3 + (inputs + `(("fortran" ,gfortran) ;for fcmix + ("blas" ,openblas) + ("suitesparse" ,suitesparse))) ;TODO: Add hypre + (arguments + `(#:configure-flags `("-DEXAMPLES_ENABLE_C:BOOL=ON" + "-DEXAMPLES_ENABLE_CXX:BOOL=ON" + "-DEXAMPLES_ENABLE_F77:BOOL=ON" + "-DEXAMPLES_ENABLE_F90:BOOL=ON" + "-DEXAMPLES_INSTALL:BOOL=OFF" + + "-DFCMIX_ENABLE:BOOL=ON" + + "-DKLU_ENABLE:BOOL=ON" + ,(string-append "-DKLU_INCLUDE_DIR=" + (assoc-ref %build-inputs "suitesparse") + "/include") + ,(string-append "-DKLU_LIBRARY_DIR=" + (assoc-ref %build-inputs "suitesparse") + "/lib")))) + (home-page "https://computation.llnl.gov/projects/sundials") + (synopsis "Suite of nonlinear and differential/algebraic equation solvers") + (description "SUNDIALS is a family of software packages implemented with +the goal of providing robust time integrators and nonlinear solvers that can +easily be incorporated into existing simulation codes.") + (license license:bsd-3))) + +(define-public sundials-openmpi + (package (inherit sundials) + (name "sundials-openmpi") + (inputs + `(("mpi" ,openmpi) + ("petsc" ,petsc-openmpi) ;support in SUNDIALS requires MPI + ,@(package-inputs sundials))) + (arguments + (substitute-keyword-arguments (package-arguments sundials) + ((#:configure-flags flags '()) + `(cons* "-DMPI_ENABLE:BOOL=ON" + "-DPETSC_ENABLE:BOOL=ON" + (string-append "-DPETSC_INCLUDE_DIR=" + (assoc-ref %build-inputs "petsc") + "/include") + (string-append "-DPETSC_LIBRARY_DIR=" + (assoc-ref %build-inputs "petsc") + "/lib") + ,flags)) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'set-test-environment + (lambda _ + ;; By default, running the test suite would fail because 'ssh' + ;; could not be found in $PATH. Define this variable to + ;; placate Open MPI without adding a dependency on OpenSSH (the + ;; agent isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) + ;; Allow oversubscription in case there are less + ;; physical cores available in the build environment + ;; than SUNDIALS wants while testing. + (setenv "OMPI_MCA_rmaps_base_oversubscribe" "yes") + #t)))))) + (synopsis "SUNDIALS with OpenMPI support"))) -- cgit v1.2.3 From a3a99e27bb727b0407da13955ef47566a1919629 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 31 Jul 2018 11:31:59 -0500 Subject: petsc: Move example code to "examples" output. * gnu/packages/maths.scm (petsc)[arguments]: New 'move-examples' phase. --- gnu/packages/maths.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c6bcec844b..ba39531bdb 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1589,6 +1589,8 @@ September 2004}") "petsc-lite-" version ".tar.gz")) (sha256 (base32 "1lajbk3c29hnh83v6cbmm3a8wv6bdykh0p70kwrr4vrnizalk88s")))) + (outputs '("out" ;libraries and headers + "examples")) ;~24MiB of examples (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) @@ -1662,6 +1664,15 @@ September 2004}") "PETScBuildInternal.cmake" ;; Once installed, should uninstall with Guix "uninstall.py")) + #t))) + (add-after 'install 'move-examples + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (examples (assoc-ref outputs "examples")) + (exdir (string-append out "/share/petsc/examples")) + (exdir' (string-append examples "/share/petsc/examples"))) + (copy-recursively exdir exdir') + (delete-file-recursively exdir) #t)))))) (home-page "http://www.mcs.anl.gov/petsc") (synopsis "Library to solve PDEs") -- cgit v1.2.3 From c15be1280e103c781f8c57bb621e92124e8e2cc5 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 31 Jul 2018 11:32:57 -0500 Subject: petsc: Upgrade to 3.9.3. * gnu/packages/maths.scm (petsc): Upgrade to 3.9.3. [arguments]: Remove unnecessary configure flags. --- gnu/packages/maths.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ba39531bdb..ef20f239e5 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1580,7 +1580,7 @@ September 2004}") (define-public petsc (package (name "petsc") - (version "3.8.0") + (version "3.9.3") (source (origin (method url-fetch) @@ -1588,9 +1588,9 @@ September 2004}") (uri (string-append "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/" "petsc-lite-" version ".tar.gz")) (sha256 - (base32 "1lajbk3c29hnh83v6cbmm3a8wv6bdykh0p70kwrr4vrnizalk88s")))) + (base32 "1fwkbwv4g7zf2lc8fw865xd0bl9anb6jaczfis5dff7h449gwa48")))) (outputs '("out" ;libraries and headers - "examples")) ;~24MiB of examples + "examples")) ;~30MiB of examples (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) @@ -1607,11 +1607,7 @@ September 2004}") #:configure-flags `("--with-mpi=0" "--with-openmp=1" - "--with-superlu=1" - ,(string-append "--with-superlu-include=" - (assoc-ref %build-inputs "superlu") "/include") - ,(string-append "--with-superlu-lib=" - (assoc-ref %build-inputs "superlu") "/lib/libsuperlu.a")) + "--with-superlu=1") #:make-flags ;; Honor (parallel-job-count) for build. Do not use --with-make-np, ;; whose value is dumped to $out/lib/petsc/conf/petscvariables. -- cgit v1.2.3 From 3f5e6ccf9be46381b21f63638f89853ee81bfb64 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 31 Jul 2018 12:14:54 -0500 Subject: slepc: Upgrade to 3.9.2. * gnu/packages/maths.scm (slepc): Upgrade to 3.9.2. --- 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 ef20f239e5..d2b9df01a7 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1760,7 +1760,7 @@ savings are consistently > 5x.") (define-public slepc (package (name "slepc") - (version "3.8.2") + (version "3.9.2") (source (origin (method url-fetch) @@ -1768,7 +1768,7 @@ savings are consistently > 5x.") version ".tar.gz")) (sha256 (base32 - "04zd48p43rnvg68p6cp28zll0px5whglc5v0sc3s6vdj1v920z8y")))) + "0gmhdqac8zm3jx43h935z7bflazjnpvqxjv4jh5za2y1z2rqax94")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) -- cgit v1.2.3 From 5e3082df1c8eb07f7c7cd02f118cd9975eb32bb8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Sep 2018 15:33:25 +0200 Subject: gnu: guile-fibers: Install .go files to "…/site-ccache". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile.scm (guile-fibers)[arguments]: New field. --- gnu/packages/guile.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index a585dd6dc8..f594cd13ed 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1817,6 +1817,20 @@ Note that 8sync is only available for Guile 2.2.") (base32 "0vjkg72ghgdgphzbjz9ig8al8271rq8974viknb2r1rg4lz92ld0")))) (build-system gnu-build-system) + (arguments + '(#: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". + ;; This phase moves them to "…/site-ccache". + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/guile")) + (old (car (find-files lib "^ccache$" + #:directories? #t))) + (new (string-append (dirname old) + "/site-ccache"))) + (rename-file old new) + #t)))))) (native-inputs `(("texinfo" ,texinfo) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 7903f00a74871ac4ecd41878ac9846fdae91e276 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Sep 2018 14:46:28 +0200 Subject: gnu: cuirass: Add dependency on Guile-Gcrypt. This is a followup to 53166aec987957efba917c83f093817d6cf6e943, which added a hard dependency of Guix on Guile-Gcrypt. * gnu/packages/ci.scm (cuirass)[inputs]: Add GUILE-GCRYPT. [arguments]: In 'wrap-program' phase, use 'string-join' to compute 'mods'. Define 'objs' for use in GUILE_LOAD_COMPILED_PATH, and take objects from lib/guile/X.Y/site-ccache. --- gnu/packages/ci.scm | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index e26983da3b..067a288004 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages guile) + #:use-module (gnu packages gnupg) #:use-module (gnu packages mail) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) @@ -223,39 +224,42 @@ their dependencies.") (lambda* (#:key inputs outputs #:allow-other-keys) ;; Wrap the 'cuirass' command to refer to the right modules. (let* ((out (assoc-ref outputs "out")) + (gcrypt (assoc-ref inputs "guile-gcrypt")) (json (assoc-ref inputs "guile-json")) (sqlite (assoc-ref inputs "guile-sqlite3")) (git (assoc-ref inputs "guile-git")) (bytes (assoc-ref inputs "guile-bytestructures")) (fibers (assoc-ref inputs "guile-fibers")) (guix (assoc-ref inputs "guix")) + (deps (list gcrypt json sqlite git bytes fibers guix)) (guile (assoc-ref %build-inputs "guile")) (effective (read-line (open-pipe* OPEN_READ (string-append guile "/bin/guile") "-c" "(display (effective-version))"))) - (mods (string-append json "/share/guile/site/" - effective ":" - git "/share/guile/site/" - effective ":" - bytes "/share/guile/site/" - effective ":" - sqlite "/share/guile/site/" - effective ":" - fibers "/share/guile/site/" - effective ":" - guix "/share/guile/site/" - effective))) + (mods (string-drop-right ;drop trailing colon + (string-join deps + (string-append "/share/guile/site/" + effective ":") + 'suffix) + 1)) + (objs (string-drop-right + (string-join deps + (string-append "/lib/guile/" effective + "/site-ccache:") + 'suffix) + 1))) ;; Make sure 'cuirass' can find the 'evaluate' command, as ;; well as the relevant Guile modules. (wrap-program (string-append out "/bin/cuirass") `("PATH" ":" prefix (,(string-append out "/bin"))) `("GUILE_LOAD_PATH" ":" prefix (,mods)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,mods))) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))) #t)))))) (inputs `(("guile" ,guile-2.2) ("guile-fibers" ,guile-fibers) + ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json) ("guile-sqlite3" ,guile-sqlite3) ("guile-git" ,guile-git) -- cgit v1.2.3 From 3b0153bd828f68804f7226ca655d26aaa1a0c065 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Sep 2018 15:48:04 +0200 Subject: gnu: guix-daemon: Add dependency on Guile-Gcrypt. This is a followup to 53166aec987957efba917c83f093817d6cf6e943, which made Guile-Gcrypt a hard dependency. * gnu/packages/package-management.scm (guix-daemon)[inputs]: Add GUILE-GCRYPT. --- gnu/packages/package-management.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b0941b50de..529d2943c4 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -317,6 +317,7 @@ the Nix package manager.") (inputs `(("gnutls" ,gnutls) ("guile-git" ,guile-git) + ("guile-gcrypt" ,guile-gcrypt) ,@(fold alist-delete (package-inputs guix) '("boot-guile" "boot-guile/i686" "util-linux")))) -- cgit v1.2.3 From 356230da4a77eef1345e4b2079db7020df98cdc6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 12:26:56 +0200 Subject: gnu: Add r-fansi. * gnu/packages/cran.scm (r-fansi): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 016d1b1e41..be64aa3a98 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4424,6 +4424,27 @@ packages. It contains also functions for simplifying some clustering analysis steps and provides ggplot2-based elegant data visualization.") (license license:gpl2))) +(define-public r-fansi + (package + (name "r-fansi") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "fansi" version)) + (sha256 + (base32 + "135qj7bcc3mwn0vg55hiiadf66lx6zaxvkicfmfw9x0zr7ah2r6x")))) + (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) ; for vignettes + (home-page "https://github.com/brodieG/fansi") + (synopsis "ANSI control sequence aware string functions") + (description + "This package provides counterparts to R string manipulation functions +that account for the effects of ANSI text formatting control sequences.") + (license license:gpl2+))) + (define-public r-nbclust (package (name "r-nbclust") -- cgit v1.2.3 From 53718658d20388f47fcf3747264f454c944c451e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 12:56:40 +0200 Subject: gnu: Add r-polynom. * gnu/packages/cran.scm (r-polynom): New variable. --- gnu/packages/cran.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index be64aa3a98..a142e9f1c7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4516,6 +4516,25 @@ patterned after functions in the Python @code{itertools} module, and others patterned after functions in the snow package.") (license license:gpl2))) +(define-public r-polynom + (package + (name "r-polynom") + (version "1.3-9") + (source + (origin + (method url-fetch) + (uri (cran-uri "polynom" version)) + (sha256 + (base32 + "1s4xxv5rvpigawknvq27v9vzvs83phfsj5h8mim2lmf5bj950nnk")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/polynom/") + (synopsis "Functions for univariate polynomial manipulations") + (description + "This package provides a collection of functions to implement a class for +univariate polynomial manipulations.") + (license license:gpl2))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From dd954dd7436b47494c8708cefd0856bf6719ac68 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:38:39 +0200 Subject: gnu: Add r-gbrd. * gnu/packages/cran.scm (r-gbrd): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a142e9f1c7..64dba2c9de 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4535,6 +4535,27 @@ patterned after functions in the snow package.") univariate polynomial manipulations.") (license license:gpl2))) +(define-public r-gbrd + (package + (name "r-gbrd") + (version "0.4-11") + (source + (origin + (method url-fetch) + (uri (cran-uri "gbRd" version)) + (sha256 + (base32 + "06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82")))) + (properties `((upstream-name . "gbRd"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/gbRd/") + (synopsis "Utilities for processing Rd objects and files") + (description + "This package provides utilities for processing Rd objects and files. +Extract argument descriptions and other parts of the help pages of +functions.") + (license license:gpl2+))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From 6a8469755cd63a2fd9deb617962bff22f8542485 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:38:51 +0200 Subject: gnu: Add r-rdpack. * gnu/packages/cran.scm (r-rdpack): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 64dba2c9de..f09bdbd06f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4556,6 +4556,33 @@ Extract argument descriptions and other parts of the help pages of functions.") (license license:gpl2+))) +(define-public r-rdpack + (package + (name "r-rdpack") + (version "0.9-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "Rdpack" version)) + (sha256 + (base32 + "067w0w6kza0hkzcnx58danl83yfvl9yjacr47mnid2bg856gdd1b")))) + (properties `((upstream-name . "Rdpack"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bibtex" ,r-bibtex) + ("r-gbrd" ,r-gbrd))) + (home-page "https://github.com/GeoBosh/Rdpack") + (synopsis "Update and manipulate Rd documentation objects") + (description + "This package provides functions for manipulation of R documentation +objects, including functions @code{reprompt()} and @code{ereprompt()} for +updating Rd documentation for functions, methods and classes; it also includes +Rd macros for citations and import of references from bibtex files for use in +Rd files and roxygen2 comments, as well as many functions for manipulation of +references and Rd files.") + (license license:gpl2+))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From 88e4ed55d68ffeaf67e5dad128f0e762e5814d26 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:41:11 +0200 Subject: gnu: Add r-clipr. * gnu/packages/cran.scm (r-clipr): New variable. --- gnu/packages/cran.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f09bdbd06f..2082378aae 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -43,6 +43,25 @@ #:use-module (gnu packages tls) #:use-module (gnu packages web)) +(define-public r-clipr + (package + (name "r-clipr") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "clipr" version)) + (sha256 + (base32 + "061x84ildc7g1p91yw5iyj8lpqdf4hqv36as85lw8c6qv9ywbsqv")))) + (build-system r-build-system) + (home-page "https://github.com/mdlincoln/clipr") + (synopsis "Read and write from the system clipboard") + (description + "This package provides simple utility functions to read from and write to +the system clipboards.") + (license license:gpl3))) + (define-public r-tidyverse (package (name "r-tidyverse") -- cgit v1.2.3 From 65050163e01d40d197f57748dc82072026676445 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:42:00 +0200 Subject: gnu: r-chippeakanno: Update to 3.14.1. * gnu/packages/bioconductor.scm (r-chippeakanno): Update to 3.14.1. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7e993189d6..1ff86779e8 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -363,14 +363,14 @@ expressed genes in DNA microarray experiments.") (define-public r-chippeakanno (package (name "r-chippeakanno") - (version "3.14.0") + (version "3.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPpeakAnno" version)) (sha256 (base32 - "1kcnc3cnmrhdk1x7q3y6zsz09pgd3xn9xy1hfbxz48cajlb18ad0")))) + "1cn1hfc3nvsf2n3563lkmvwjxfbiygx7f84zk683p89gy7zi1gyj")))) (properties `((upstream-name . "ChIPpeakAnno"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ce0e762bf926bcd6f126466c3556a820833621ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:44:42 +0200 Subject: gnu: r-annotationforge: Update to 1.22.2. * gnu/packages/bioinformatics.scm (r-annotationforge): Update to 1.22.2. --- 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 05d516165e..6028311b3c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6371,14 +6371,14 @@ exploration of the results.") (define-public r-annotationforge (package (name "r-annotationforge") - (version "1.22.0") + (version "1.22.2") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationForge" version)) (sha256 (base32 - "12ffj7h95adiya5mzyjxazqn1qgr434ajpabfcyhrj5v83s4vk65")))) + "17kmy7nvpyyj6w5jyrjciw87rydmmmc8q6cnwqjv1j7li9bp09gr")))) (properties `((upstream-name . "AnnotationForge"))) (build-system r-build-system) -- cgit v1.2.3 From 3c0437561401986d90de358a8d5fae50d6593261 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:46:03 +0200 Subject: gnu: r-biocviews: Update to 1.48.3. * gnu/packages/bioinformatics.scm (r-biocviews): Update to 1.48.3. --- 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 6028311b3c..e900bd6194 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6957,13 +6957,13 @@ Bioconductor, CRAN, and Github.") (define-public r-biocviews (package (name "r-biocviews") - (version "1.48.2") + (version "1.48.3") (source (origin (method url-fetch) (uri (bioconductor-uri "biocViews" version)) (sha256 (base32 - "01yiafayl1m5704xdd2cn3zjc78rs10dqyz66lr3qkf6d8w66938")))) + "1rxvwikqivsgxjjcazlszy8xgz346lfh5rw4llxw6fz38fjgb0k5")))) (properties `((upstream-name . "biocViews"))) (build-system r-build-system) -- cgit v1.2.3 From 5728d9c6c081b7a0eeb6d29ec221d4638f6dd083 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:46:20 +0200 Subject: gnu: r-iranges: Update to 2.14.11. * gnu/packages/bioinformatics.scm (r-iranges): Update to 2.14.11. --- 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 e900bd6194..5aec3cc6ae 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7176,13 +7176,13 @@ utilities for sequence data management under the ACNUC system.") (define-public r-iranges (package (name "r-iranges") - (version "2.14.10") + (version "2.14.11") (source (origin (method url-fetch) (uri (bioconductor-uri "IRanges" version)) (sha256 (base32 - "10ccw930vfmkskkrzbps14xglqlkxf588623dr7f1a9ckx7yr2p6")))) + "0wz63hysspyjihqadg91dbvllc5a61zzjrsz0b9498lihqc6m1la")))) (properties `((upstream-name . "IRanges"))) (build-system r-build-system) -- cgit v1.2.3 From 1adf4596a6d268c3d2a249d235569631f8df306f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:48:36 +0200 Subject: gnu: r-edger: Update to 3.22.3. * gnu/packages/bioinformatics.scm (r-edger): Update to 3.22.3. --- 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 5aec3cc6ae..b6b6e7267c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7256,13 +7256,13 @@ names in their natural, rather than lexicographic, order.") (define-public r-edger (package (name "r-edger") - (version "3.22.2") + (version "3.22.3") (source (origin (method url-fetch) (uri (bioconductor-uri "edgeR" version)) (sha256 (base32 - "07py2g6vg9jbflwhc1hnzr2silbinrjwxq3mkq30nzjgf0n0hrf3")))) + "0w3jv29n0kkaiig8dbbdqy2dkng8xfaihch82mj9ci5hphrx3nng")))) (properties `((upstream-name . "edgeR"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 33a103a54393f4e8994b2cb46f6be7d8942cc42e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:51:48 +0200 Subject: gnu: r-variantannotation: Update to 1.26.1. * gnu/packages/bioinformatics.scm (r-variantannotation): Update to 1.26.1. --- 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 b6b6e7267c..6efb6f1c1b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7284,13 +7284,13 @@ CAGE.") (define-public r-variantannotation (package (name "r-variantannotation") - (version "1.26.0") + (version "1.26.1") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantAnnotation" version)) (sha256 (base32 - "06bccdf57vja7m63chmgc4539lwng3q3b8zxn285fj8524l6mcn7")))) + "1r55ki951dj81qvy73knfcy69ik5vzkd56wnk3f6vvf9vngqb8jr")))) (properties `((upstream-name . "VariantAnnotation"))) (inputs -- cgit v1.2.3 From 688cb0852706d1e2d0cc03c707a04098ab59b98b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:52:03 +0200 Subject: gnu: r-limma: Update to 3.36.3. * gnu/packages/bioinformatics.scm (r-limma): Update to 3.36.3. --- 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 6efb6f1c1b..29558768c0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7322,13 +7322,13 @@ coding changes and predict coding outcomes.") (define-public r-limma (package (name "r-limma") - (version "3.36.1") + (version "3.36.3") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "1982g5v35ilfgxm2vkq1p3j1bbir795pjvfzx4nzam2rlqqymbqm")))) + "0iiifszr6hcqih6kszdsbkx3gacfg3d7v8hdx0lbjqnjqgqz7pwk")))) (build-system r-build-system) (home-page "http://bioinf.wehi.edu.au/limma") (synopsis "Package for linear models for microarray and RNA-seq data") -- cgit v1.2.3 From 1d56c79f86cd0c776e76a1bece26622f56c28f12 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:52:53 +0200 Subject: gnu: r-genomicranges: Update to 1.32.6. * gnu/packages/bioinformatics.scm (r-genomicranges): Update to 1.32.6. --- 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 29558768c0..2b467145d0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7377,13 +7377,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.") (define-public r-genomicranges (package (name "r-genomicranges") - (version "1.32.3") + (version "1.32.6") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicRanges" version)) (sha256 (base32 - "03gmka6rlz18vd4229796l5l3l6446v5cb90sn2nb5knjbp84hni")))) + "0p58yk2i5gqvjlkx548mnrr49wvs0xfcl06l9rqj2hi6hkkbvnp3")))) (properties `((upstream-name . "GenomicRanges"))) (build-system r-build-system) -- cgit v1.2.3 From a02340058c15a22cf8c942c96d0053b8e0881452 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:58:33 +0200 Subject: gnu: r-biocparallel: Update to 1.14.2. * gnu/packages/bioinformatics.scm (r-biocparallel): Update to 1.14.2. --- 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 2b467145d0..9d55198f4f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7488,13 +7488,13 @@ powerful online queries from gene annotation to database mining.") (define-public r-biocparallel (package (name "r-biocparallel") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocParallel" version)) (sha256 (base32 - "00qg1kg2l9qqpyjaw5q910cmf84vwfiw1fhsx3ig784gwinwgj6n")))) + "1llb5a62hn4yxpdgqdh2l7i5zd06mjkk8hagsna69cq65wv6iifm")))) (properties `((upstream-name . "BiocParallel"))) (build-system r-build-system) -- cgit v1.2.3 From 3e61c2a8b1dfbc03f9506aaf10df57651728a7d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:58:44 +0200 Subject: gnu: r-rsamtools: Update to 1.32.3. * gnu/packages/bioinformatics.scm (r-rsamtools): Update to 1.32.3. --- 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 9d55198f4f..c682399ace 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7539,13 +7539,13 @@ biological sequences or sets of sequences.") (define-public r-rsamtools (package (name "r-rsamtools") - (version "1.32.0") + (version "1.32.3") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsamtools" version)) (sha256 (base32 - "1s65y5wn4d0x8zsljg2kmhcl6r9884h95kr041j7hp49bmxg3an6")))) + "1hpjr22h33pf4fgv0sj83rqzv6l5l7s6fpmmqvchh45ikks1mnhq")))) (properties `((upstream-name . "Rsamtools"))) (build-system r-build-system) -- cgit v1.2.3 From aea1b6fb8a9b48b35139e146faffaf27463091b8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:59:06 +0200 Subject: gnu: r-delayedarray: Update to 0.6.5. * gnu/packages/bioinformatics.scm (r-delayedarray): Update to 0.6.5. --- 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 c682399ace..d9d70ea97b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7583,13 +7583,13 @@ files.") (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.6.1") + (version "0.6.5") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "0sjwszxdi0vkj2i2di5i46gh9chc660yr3gs5nk9qnqp77713zds")))) + "10b03zrnvz5isfh4z55hasya2m71lrfx10l5lm2sdmqs0gwkanrd")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) -- cgit v1.2.3 From f2e79823c697843afd880e79e7f810ad69411722 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:59:25 +0200 Subject: gnu: r-rtracklayer: Update to 1.40.6. * gnu/packages/bioinformatics.scm (r-rtracklayer): Update to 1.40.6. --- 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 d9d70ea97b..3610f823dc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7678,13 +7678,13 @@ alignments.") (define-public r-rtracklayer (package (name "r-rtracklayer") - (version "1.40.3") + (version "1.40.6") (source (origin (method url-fetch) (uri (bioconductor-uri "rtracklayer" version)) (sha256 (base32 - "0kvsjdaypn1jnxbnsxpycildwdyxwnjkigfq8qm8mlyfc4ahdgy3")))) + "1wxxxlyps19dw3i0pw4mlm3kinnswsc35rgvlnbwvpnpjbca6w4l")))) (build-system r-build-system) (arguments `(#:phases -- cgit v1.2.3 From ad2ed8d01fa3a5486072f0f484beb74129928796 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 13:59:44 +0200 Subject: gnu: r-genomicfeatures: Update to 1.32.2. * gnu/packages/bioinformatics.scm (r-genomicfeatures): Update to 1.32.2. --- 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 3610f823dc..0631d59651 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7725,13 +7725,13 @@ as well as query and modify the browser state, such as the current viewport.") (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.32.0") + (version "1.32.2") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "1cqcl72q0k5wylw1brn4g4h7xzys1v06piry19cvp0gjcvm5sp7a")))) + "0kfyyg1ib8fkq2hxraal10z4bx3rg8figdskw4yhn1mbh6l42q5f")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) -- cgit v1.2.3 From 48b21f8b6b7fcd6d0857fc1ac75dddb52bbabdf4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:00:00 +0200 Subject: gnu: r-seqminer: Update to 6.1. * gnu/packages/bioinformatics.scm (r-seqminer): Update to 6.1. --- 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 0631d59651..878f5723da 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9321,14 +9321,14 @@ unmodeled, or latent sources of noise.") (define-public r-seqminer (package (name "r-seqminer") - (version "6.0") + (version "6.1") (source (origin (method url-fetch) (uri (cran-uri "seqminer" version)) (sha256 (base32 - "057j1l6dip35l1aivilapl2zv9db677b3di2pb3sfgq2sxg0ps3l")))) + "15yhg4vfc7jg1jnqb3371j00pgbmbyc9l1xx63hq1l3p34lazq2l")))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) -- cgit v1.2.3 From 4ee8c37cca305dd7c581a7bf0fcf82fa351104a8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:00:56 +0200 Subject: gnu: r-maldiquant: Update to 1.18. * gnu/packages/bioinformatics.scm (r-maldiquant): Update to 1.18. --- 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 878f5723da..5b8a1a23b0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9375,14 +9375,14 @@ trait.") (define-public r-maldiquant (package (name "r-maldiquant") - (version "1.17") + (version "1.18") (source (origin (method url-fetch) (uri (cran-uri "MALDIquant" version)) (sha256 (base32 - "047s6007ydc38x8wm027mlb4mngz15n0d4238fr8h43wyll5zy0z")))) + "18nl214xjsxkcpbg79jkmw0yznwm5szyh2qb84n7ip46mm779ha6")))) (properties `((upstream-name . "MALDIquant"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/MALDIquant") -- cgit v1.2.3 From 07bd90ce90784eb6803c581a18d8b335ce49e1bd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:01:19 +0200 Subject: gnu: r-msnbase: Update to 2.6.3. * gnu/packages/bioinformatics.scm (r-msnbase): Update to 2.6.3. --- 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 5b8a1a23b0..01603d2937 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9619,14 +9619,14 @@ structure (pcaRes) to provide a common interface to the PCA results.") (define-public r-msnbase (package (name "r-msnbase") - (version "2.6.1") + (version "2.6.3") (source (origin (method url-fetch) (uri (bioconductor-uri "MSnbase" version)) (sha256 (base32 - "0zrpx9r93q5ca2zdak5rs2m9sjm0wjdra1xfj3d3sx6p5gzfyg6n")))) + "15jhqg02ypmznc0wxksw56yij02csy678vqy531fdv86fsmypwa0")))) (properties `((upstream-name . "MSnbase"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6f6aef80e3def1ffa7c8e4b0f75b22bd2ececc74 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:20:56 +0200 Subject: gnu: r-seurat: Update to 2.3.4. * gnu/packages/bioinformatics.scm (r-seurat): Update to 2.3.4. [source]: Remove snippet. [arguments]: Remove. [native-inputs]: Remove. [propagated-inputs]: Remove r-caret, r-diffusionmap, r-fnn, r-gdata, r-ranger, r-stringr, r-tclust, and rvgam; add r-httr. --- gnu/packages/bioinformatics.scm | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 01603d2937..c29122b0cf 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9701,58 +9701,31 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.") (define-public r-seurat (package (name "r-seurat") - (version "2.3.2") + (version "2.3.4") (source (origin (method url-fetch) (uri (cran-uri "Seurat" version)) (sha256 (base32 - "1sjpy5rrpvlpm6hs7qy7qpglgbp7zrgfybcsalpmjb51rhxhgcg1")) - ;; Delete pre-built jar. - (snippet - '(begin (delete-file "inst/java/ModularityOptimizer.jar") - #t)))) + "0l8bv4i9nzz26mirnva10mq6pimibj24vk7vpvfypgn7xk4942hd")))) (properties `((upstream-name . "Seurat"))) (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'build-jar - (lambda* (#:key inputs #:allow-other-keys) - (let ((classesdir "tmp-classes")) - (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) - (mkdir classesdir) - (with-output-to-file "manifest" - (lambda _ - (display "Manifest-Version: 1.0 -Main-Class: ModularityOptimizer\n"))) - (and (zero? (apply system* `("javac" "-d" ,classesdir - ,@(find-files "java" "\\.java$")))) - (zero? (system* "jar" - "-cmf" "manifest" - "inst/java/ModularityOptimizer.jar" - "-C" classesdir "."))))))))) - (native-inputs - `(("jdk" ,icedtea "jdk"))) (propagated-inputs `(("r-ape" ,r-ape) - ("r-caret" ,r-caret) ("r-cluster" ,r-cluster) ("r-cowplot" ,r-cowplot) - ("r-diffusionmap" ,r-diffusionmap) ("r-dosnow" ,r-dosnow) ("r-dplyr" ,r-dplyr) ("r-dtw" ,r-dtw) ("r-fitdistrplus" ,r-fitdistrplus) - ("r-fnn" ,r-fnn) ("r-foreach" ,r-foreach) ("r-fpc" ,r-fpc) - ("r-gdata" ,r-gdata) ("r-ggplot2" ,r-ggplot2) ("r-ggridges" ,r-ggridges) ("r-gplots" ,r-gplots) ("r-hdf5r" ,r-hdf5r) ("r-hmisc" ,r-hmisc) + ("r-httr" ,r-httr) ("r-ica" ,r-ica) ("r-igraph" ,r-igraph) ("r-irlba" ,r-irlba) @@ -9765,7 +9738,6 @@ Main-Class: ModularityOptimizer\n"))) ("r-pbapply" ,r-pbapply) ("r-plotly" ,r-plotly) ("r-png" ,r-png) - ("r-ranger" ,r-ranger) ("r-rann" ,r-rann) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-rcpp" ,r-rcpp) @@ -9776,11 +9748,8 @@ Main-Class: ModularityOptimizer\n"))) ("r-rocr" ,r-rocr) ("r-rtsne" ,r-rtsne) ("r-sdmtools" ,r-sdmtools) - ("r-stringr" ,r-stringr) - ("r-tclust" ,r-tclust) ("r-tidyr" ,r-tidyr) - ("r-tsne" ,r-tsne) - ("r-vgam" ,r-vgam))) + ("r-tsne" ,r-tsne))) (home-page "http://www.satijalab.org/seurat") (synopsis "Seurat is an R toolkit for single cell genomics") (description -- cgit v1.2.3 From c273bcdfce1f1cac53990e6c26455fb6a749763f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:22:33 +0200 Subject: gnu: r-diffusionmap: Update to 1.1-0.1. * gnu/packages/graph.scm (r-diffusionmap): Update to 1.1-0.1. --- gnu/packages/graph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index b393919e66..998e4ead46 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -130,14 +130,14 @@ more.") (define-public r-diffusionmap (package (name "r-diffusionmap") - (version "1.1-0") + (version "1.1-0.1") (source (origin (method url-fetch) (uri (cran-uri "diffusionMap" version)) (sha256 (base32 - "1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3")))) + "11l4kbciawvli5nlsi4qaf8afmgk5xgqiqpdyhvaqri5mx0zhk5j")))) (properties `((upstream-name . "diffusionMap"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From eb251fe524127e5490b26e86a4c826bb6c79003c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:22:44 +0200 Subject: gnu: r-igraph: Update to 1.2.2. * gnu/packages/graph.scm (r-igraph): Update to 1.2.2. --- gnu/packages/graph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 998e4ead46..3b222d6ee8 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -98,14 +98,14 @@ more.") (define-public r-igraph (package (name "r-igraph") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "igraph" version)) (sha256 (base32 - "1hcr6b1lz030lgay1bz8y8sxaf2j93ds8n8gsqr6qhssz141hd2m")))) + "1bggm7b8v3bh7q2589w26qvd7sgs69m4qiij7d0rbm0ykkgxm8lx")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 3c553046888943842d953012759aacde255c4e0c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:27:26 +0200 Subject: gnu: r-edaseq: Update to 2.14.1. * gnu/packages/bioinformatics.scm (r-edaseq): Update to 2.14.1. --- 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 c29122b0cf..0860d85bab 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9822,14 +9822,14 @@ distribution.") (define-public r-edaseq (package (name "r-edaseq") - (version "2.14.0") + (version "2.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "EDASeq" version)) (sha256 (base32 - "1832pb3jkim4vrqzb8lajwx9r482bhww5n9nz3s6crvyamlp2dj0")))) + "0970w9d5ddqw1qxqqafdidkxh6hmcv9j5djwgnpz3fgl05kmysg8")))) (properties `((upstream-name . "EDASeq"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ff7c7d62f464d0a8d5e91ef058579ad03247d817 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:29:51 +0200 Subject: gnu: r-keggrest: Update to 1.20.1. * gnu/packages/bioinformatics.scm (r-keggrest): Update to 1.20.1. --- 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 0860d85bab..eb7d2b840a 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9949,14 +9949,14 @@ microarrays or GRanges for sequencing data.") (define-public r-keggrest (package (name "r-keggrest") - (version "1.20.0") + (version "1.20.1") (source (origin (method url-fetch) (uri (bioconductor-uri "KEGGREST" version)) (sha256 (base32 - "1349vidgl9m10l1rbrp3pkwwgi2xcbsw9h9z2xqbvg97lmqc4r8j")))) + "1ss0xd5570x570v01r6lp64rr1apjrzp0j62520pvm3g8knjhfvs")))) (properties `((upstream-name . "KEGGREST"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 70daf9362b328079886ed7854e6afe4d96181323 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:30:16 +0200 Subject: gnu: r-biovizbase: Update to 1.28.2. * gnu/packages/bioinformatics.scm (r-biovizbase): Update to 1.28.2. [propagated-inputs]: Add r-rlang. --- gnu/packages/bioinformatics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index eb7d2b840a..f65dad5f96 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10169,14 +10169,14 @@ the fact that each of these packages implements a select methods.") (define-public r-biovizbase (package (name "r-biovizbase") - (version "1.28.0") + (version "1.28.2") (source (origin (method url-fetch) (uri (bioconductor-uri "biovizBase" version)) (sha256 (base32 - "0lkiqdr3ics6hgv47lwkykcy761823bbkhffbn4ykyfzyqwl4p67")))) + "0wc45j3hfn01i44bkkxjj3n8b8xzbkkcdv35mrkzb1f9yprkf8gq")))) (properties `((upstream-name . "biovizBase"))) (build-system r-build-system) (propagated-inputs @@ -10193,6 +10193,7 @@ the fact that each of these packages implements a select methods.") ("r-hmisc" ,r-hmisc) ("r-iranges" ,r-iranges) ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rlang" ,r-rlang) ("r-rsamtools" ,r-rsamtools) ("r-s4vectors" ,r-s4vectors) ("r-scales" ,r-scales) -- cgit v1.2.3 From 16527f1cbc8af73b1034ddce2edf9e2bce094564 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:31:06 +0200 Subject: gnu: r-ggbio: Update to 1.28.5. * gnu/packages/bioinformatics.scm (r-ggbio): Update to 1.28.5. [propagated-inputs]: Add r-rlang. --- gnu/packages/bioinformatics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f65dad5f96..9882356a08 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10211,14 +10211,14 @@ effort and encourages consistency.") (define-public r-ggbio (package (name "r-ggbio") - (version "1.28.0") + (version "1.28.5") (source (origin (method url-fetch) (uri (bioconductor-uri "ggbio" version)) (sha256 (base32 - "0wszh3w8yia5zw758h837i1q35k99sn444y2hahcxqbdmmlbf7in")))) + "19s2v40fycwf44fl3lm791y635xzw67b30sq2g0qq4a6phjik42d")))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) @@ -10241,6 +10241,7 @@ effort and encourages consistency.") ("r-iranges" ,r-iranges) ("r-organismdbi" ,r-organismdbi) ("r-reshape2" ,r-reshape2) + ("r-rlang" ,r-rlang) ("r-rsamtools" ,r-rsamtools) ("r-rtracklayer" ,r-rtracklayer) ("r-s4vectors" ,r-s4vectors) -- cgit v1.2.3 From e69c07e61a870861f5c9d9f114e2783cba213934 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:32:25 +0200 Subject: gnu: r-hdf5array: Update to 1.8.1. * gnu/packages/bioinformatics.scm (r-hdf5array): Update to 1.8.1. --- 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 9882356a08..53bf86180f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10696,14 +10696,14 @@ problems in genomics, brain imaging, astrophysics, and data mining.") (define-public r-hdf5array (package (name "r-hdf5array") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) (uri (bioconductor-uri "HDF5Array" version)) (sha256 (base32 - "1l0276qxkhgdxsfck3jmi8jvnsr20g10gjki53g0mqa45wnhm3ck")))) + "1s44zgm9jg82bk4b8k3dh7xw7mxychlfm3grs8516mxnw91zpvy5")))) (properties `((upstream-name . "HDF5Array"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 8e44ff0c0de2ee752ccaf9189d882735d3185c65 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:37:02 +0200 Subject: gnu: r-scater: Update to 1.8.4. * gnu/packages/bioinformatics.scm (r-scater): Update to 1.8.4. --- 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 53bf86180f..687cb131d2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10842,13 +10842,13 @@ libraries.") (define-public r-scater (package (name "r-scater") - (version "1.8.0") + (version "1.8.4") (source (origin (method url-fetch) (uri (bioconductor-uri "scater" version)) (sha256 (base32 - "0bhpikgz3b9f510dawsay4zry9rlp8vjx5n6zvwbcpwrd94p3903")))) + "173lfpas2fqsp4xxsw01wkxd4496c5p8himw9b4r9z4npxkfyv16")))) (build-system r-build-system) (propagated-inputs `(("r-beachmat" ,r-beachmat) -- cgit v1.2.3 From f0771741781ff75af42ea59027a592ac159bcf98 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:41:37 +0200 Subject: gnu: r-scran: Update to 1.8.4. * gnu/packages/bioinformatics.scm (r-scran): Update to 1.8.4. --- 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 687cb131d2..760b716408 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10886,14 +10886,14 @@ quality control.") (define-public r-scran (package (name "r-scran") - (version "1.8.2") + (version "1.8.4") (source (origin (method url-fetch) (uri (bioconductor-uri "scran" version)) (sha256 (base32 - "0nbn5x75gf9d0p18w7vpkbv30cpdqvp5bz8xvila0h7jla7xdyih")))) + "17vq9vb9ak7n4mcqpwnm9x3z91vmr7xnsgj8f45b8dbj7m0v126j")))) (build-system r-build-system) (propagated-inputs `(("r-beachmat" ,r-beachmat) -- cgit v1.2.3 From 1ec1989f8007d0b90cc3b5ac379bb2f7133e299f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:42:01 +0200 Subject: gnu: r-httpuv: Update to 1.4.5. * gnu/packages/web.scm (r-httpuv): Update to 1.4.5. [native-inputs]: Add pkg-config. --- 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 0d27fa0054..918548513d 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3823,15 +3823,17 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (define-public r-httpuv (package (name "r-httpuv") - (version "1.4.4.1") + (version "1.4.5") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "12kwq10xa8glrip7rai9xb4hnpysng00g2l0rw7swfzq5lk4z966")))) + "1ddpcarzf694h0gy5pdz7l5glqfv4hr9dmxb4vw7yqd0bga174gi")))) (build-system r-build-system) - (native-inputs `(("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-rcpp" ,r-rcpp) + ("pkg-config" ,pkg-config))) (propagated-inputs `(("r-bh" ,r-bh) ("r-later" ,r-later) -- cgit v1.2.3 From 4f8247b54b4bb95fc58b3c4f0c30d635909496e2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:46:33 +0200 Subject: gnu: Add r-pkgbuild. * gnu/packages/cran.scm (r-pkgbuild): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2082378aae..ae51844dab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -499,6 +499,33 @@ print, summary, plot, update, etc. processes. Most of its code is based on the @code{psutil} Python package.") (license license:bsd-3))) +(define-public r-pkgbuild + (package + (name "r-pkgbuild") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "pkgbuild" version)) + (sha256 + (base32 + "10iz8057mixl9j73pq2cbp4ib6dadfsgi3fcsjjm7l3wwb9issd9")))) + (build-system r-build-system) + (propagated-inputs + `(("r-callr" ,r-callr) + ("r-crayon" ,r-crayon) + ("r-desc" ,r-desc) + ("r-r6" ,r-r6) + ("r-rprojroot" ,r-rprojroot) + ("r-withr" ,r-withr))) + (home-page "https://github.com/r-pkgs/pkgbuild") + (synopsis "Find tools needed to build R packages") + (description + "This package provides functions used to build R packages. It locates +compilers needed to build R packages on various platforms and ensures the PATH +is configured appropriately so R can use them.") + (license license:gpl3))) + (define-public r-rcpp (package (name "r-rcpp") -- cgit v1.2.3 From e362be8e899707fa85e7ae3102cbb5013d51bb69 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:46:49 +0200 Subject: gnu: Add r-pkgload. * gnu/packages/cran.scm (r-pkgload): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ae51844dab..9d736d4d6e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -526,6 +526,33 @@ compilers needed to build R packages on various platforms and ensures the PATH is configured appropriately so R can use them.") (license license:gpl3))) +(define-public r-pkgload + (package + (name "r-pkgload") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "pkgload" version)) + (sha256 + (base32 + "1rjj229nq9fsl4ki4m75ybsavjgpqqhsr1zjzapwicsrxv6212px")))) + (build-system r-build-system) + (propagated-inputs + `(("r-desc" ,r-desc) + ("r-pkgbuild" ,r-pkgbuild) + ("r-rlang" ,r-rlang) + ("r-rprojroot" ,r-rprojroot) + ("r-rstudioapi" ,r-rstudioapi) + ("r-withr" ,r-withr))) + (home-page "https://github.com/r-lib/pkgload") + (synopsis "Simulate package installation and attach") + (description + "This package simulates the process of installing a package and then +attaching it. This is a key part of the @code{devtools} package as it allows +you to rapidly iterate while developing a package.") + (license license:gpl3))) + (define-public r-rcpp (package (name "r-rcpp") -- cgit v1.2.3 From 97c81cc174b31fe898263cf4e802e00e95f76ef3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:52:33 +0200 Subject: gnu: r-stringi: Update to 1.2.4. * gnu/packages/statistics.scm (r-stringi): Update to 1.2.4. --- 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 97246dc31d..1f03649fa5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -960,14 +960,14 @@ solution for sending email, including attachments, from within R.") (define-public r-stringi (package (name "r-stringi") - (version "1.2.3") + (version "1.2.4") (source (origin (method url-fetch) (uri (cran-uri "stringi" version)) (sha256 (base32 - "1sgg4krw03qkz1n4dwiya0djggk7giwd0w21qlp0pfjqi0rxq6qx")))) + "1y46xab7g1lsjmilp4hbl7pjad6pcxp66hdj8wnfdg9518h0lmq1")))) (build-system r-build-system) (inputs `(("icu4c" ,icu4c))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 3bf390279d9fce490fcfbab21330a0009a4d178c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:52:53 +0200 Subject: gnu: r-scales: Update to 1.0.0. * gnu/packages/statistics.scm (r-scales): Update to 1.0.0. [propagated-inputs]: Remove r-dichromat and r-plyr. --- gnu/packages/statistics.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1f03649fa5..35f89f2dc5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1033,19 +1033,17 @@ using just two functions: melt and dcast (or acast).") (define-public r-scales (package (name "r-scales") - (version "0.5.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "scales" version)) (sha256 - (base32 "0zg9wfzmsdjxpbld0nzv7hcpq5r0wazqxmn7grvvif2agj0w1z6v")))) + (base32 "0353dkh3d7x78463c6ds80hcml59lrqwr8rlv82a8dnkxla4l7qc")))) (build-system r-build-system) (propagated-inputs - `(("r-dichromat" ,r-dichromat) - ("r-labeling" ,r-labeling) + `(("r-labeling" ,r-labeling) ("r-munsell" ,r-munsell) - ("r-plyr" ,r-plyr) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-rcpp" ,r-rcpp) ("r-r6" ,r-r6) -- cgit v1.2.3 From 2a96a093ec9a812bf7ccb6e095b3377df81d75aa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:53:36 +0200 Subject: gnu: r-evaluate: Update to 0.11. * gnu/packages/statistics.scm (r-evaluate): Update to 0.11. --- 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 35f89f2dc5..09470fa0a0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1249,13 +1249,13 @@ for template use among CRAN packages.") (define-public r-evaluate (package (name "r-evaluate") - (version "0.10.1") + (version "0.11") (source (origin (method url-fetch) (uri (cran-uri "evaluate" version)) (sha256 (base32 - "070vvmnbdlp7sz2zhza7fhd2a6mlwiln8fn4hyzhsiizbn4n79y9")))) + "1k8vcd4vsgg0hf7kdz8rlqp1dx4ygvg35aj4n3ay50kdnpzhaj5h")))) (build-system r-build-system) (propagated-inputs `(("r-stringr" ,r-stringr))) -- cgit v1.2.3 From 3299bc1c5e43a146ba1ea380fc905b2c096f9174 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:53:49 +0200 Subject: gnu: r-yaml: Update to 2.2.0. * gnu/packages/statistics.scm (r-yaml): Update to 2.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 09470fa0a0..b7118b672a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1354,13 +1354,13 @@ syntax that can be converted to XHTML or other formats.") (define-public r-yaml (package (name "r-yaml") - (version "2.1.19") + (version "2.2.0") (source (origin (method url-fetch) (uri (cran-uri "yaml" version)) (sha256 (base32 - "04bzrnfgbpk0rhkvzwp3k3ip7jpq26bjxz71bx5mwxmcjdb07nz5")))) + "0in562nd0i23cg91a8kdbqgim656fgscykwi0icsnq53xj3srg2m")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/yaml/") (synopsis "Methods to convert R data to YAML and back") -- cgit v1.2.3 From 6b02569f1db9a3943305afcdea3f5970f80ecf74 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:54:02 +0200 Subject: gnu: r-dbplyr: Update to 1.2.2. * gnu/packages/statistics.scm (r-dbplyr): Update to 1.2.2. --- 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 b7118b672a..ac0d5d613c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1654,14 +1654,14 @@ database.") (define-public r-dbplyr (package (name "r-dbplyr") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "dbplyr" version)) (sha256 (base32 - "1nwrls9c3kc9q7405jp6b9sh23642sz13yw55iikgw134shffj5k")))) + "0j5w6a1qim972kv4vmvinp3j50yr4idmm9cd3w7y3zsz0nq0nhcx")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From 7f38b31ecbeab97f3efdc633504c4caa1a3a0621 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:54:19 +0200 Subject: gnu: r-xtable: Update to 1.8-3. * gnu/packages/statistics.scm (r-xtable): Update to 1.8-3. --- 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 ac0d5d613c..88b9ee6037 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1787,17 +1787,17 @@ and fast file reading.") (define-public r-xtable (package (name "r-xtable") - (version "1.8-2") + (version "1.8-3") (source (origin (method url-fetch) (uri (cran-uri "xtable" version)) (sha256 (base32 - "0398qkpvlw3dv0myz4mjcyqwpwc2m31l127r8vdzwc71wb6s28qn")))) + "09f311gq9g7dzf8jdvcx72j11xb7p00jlg066jjbpa6pz3zv1cjk")))) (build-system r-build-system) (native-inputs - `(("r-knitr" ,r-knitr))) + `(("r-knitr" ,r-knitr))) ; for vignettes (home-page "http://xtable.r-forge.r-project.org/") (synopsis "Export R tables to LaTeX or HTML") (description -- cgit v1.2.3 From 9b7e8df85bc8f06a662f0a9631231bd56939cfb2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:54:35 +0200 Subject: gnu: r-ade4: Update to 1.7-13. * gnu/packages/statistics.scm (r-ade4): Update to 1.7-13. --- 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 88b9ee6037..c74e198449 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1934,14 +1934,14 @@ chain.") (define-public r-ade4 (package (name "r-ade4") - (version "1.7-11") + (version "1.7-13") (source (origin (method url-fetch) (uri (cran-uri "ade4" version)) (sha256 (base32 - "0wm54wcpn87rdh6vyw04cr8vgba899y6jsl61f22bmlvx6d7kkac")))) + "16z9jk4qj35ghsk4lwmq241dgc770y8a70dlmp9q4gz6d8ssgl7m")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass))) -- cgit v1.2.3 From 2848c52c5ec537e9d4ee23bedd6658c610ff02fd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:54:52 +0200 Subject: gnu: r-roxygen2: Update to 6.1.0. * gnu/packages/statistics.scm (r-roxygen2): Update to 6.1.0. [propagated-inputs]: Add r-pkgload and r-purrr. [native-inputs]: Add r-knitr. --- gnu/packages/statistics.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c74e198449..43d0197395 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2235,24 +2235,28 @@ tables, autolinks and strikethrough text.") (define-public r-roxygen2 (package (name "r-roxygen2") - (version "6.0.1") + (version "6.1.0") (source (origin (method url-fetch) (uri (cran-uri "roxygen2" version)) (sha256 (base32 - "0xpzziminf225kjwhyl51kgkzhplyzhk5farhf5s822krl2xqbfj")))) + "0ji9k4s1bvfbl8wimfqj1lqr33h1claaz30vb5pgksxyg77j5xaa")))) (build-system r-build-system) (propagated-inputs `(("r-brew" ,r-brew) ("r-commonmark" ,r-commonmark) ("r-desc" ,r-desc) ("r-digest" ,r-digest) + ("r-pkgload" ,r-pkgload) + ("r-purrr" ,r-purrr) ("r-r6" ,r-r6) ("r-rcpp" ,r-rcpp) ("r-stringi" ,r-stringi) ("r-stringr" ,r-stringr) ("r-xml2" ,r-xml2))) + (native-inputs + `(("r-knitr" ,r-knitr))) ; for vignettes (home-page "https://github.com/klutometis/roxygen") (synopsis "In-source documentation system for R") (description -- cgit v1.2.3 From 19cb93be55e4cffab4b48542835d9b18ef74d949 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:58:00 +0200 Subject: gnu: r-git2r: Update to 0.23.0. * gnu/packages/statistics.scm (r-git2r): Update to 0.23.0. [native-inputs]: Add pkg-config. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 43d0197395..164e0b5851 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2322,13 +2322,13 @@ functions make it easy to control additional request components.") (define-public r-git2r (package (name "r-git2r") - (version "0.21.0") + (version "0.23.0") (source (origin (method url-fetch) (uri (cran-uri "git2r" version)) (sha256 (base32 - "11xgddmxzh9cy85k8fb90il43qswpvryz0h9r0j1gbclfg2f9004")))) + "01250jz255fnyy2ap90nskvzhd8nhlmbhwgpvb43mk1fax077lrz")))) (build-system r-build-system) ;; This R package contains modified sources of libgit2. This modified ;; version of libgit2 is built as the package is built. Hence libgit2 is @@ -2337,6 +2337,8 @@ functions make it easy to control additional request components.") `(("libssh2" ,libssh2) ("openssl" ,openssl) ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) (home-page "https://github.com/ropensci/git2r") (synopsis "Access Git repositories with R") (description -- cgit v1.2.3 From 41f6685388da9e2258ababbdb5e16be56993e949 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:58:39 +0200 Subject: gnu: r-rcpparmadillo: Update to 0.9.100.5.0. * gnu/packages/statistics.scm (r-rcpparmadillo): Update to 0.9.100.5.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 164e0b5851..2e8bfb33fa 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2518,13 +2518,13 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.8.500.0") + (version "0.9.100.5.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "1sh36dx6inmb56m40nigy94gxlgjva816qnlmjwg7y2bdvqj8vsi")))) + "1iyjqhfjip1nxrkllzh7r1m01jjnx7cahqkf3s557w34p987f2l1")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From 2aafa73a94daa2ea0399ba0873b87fdfb9d03ff0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:59:01 +0200 Subject: gnu: r-xml: Update to 3.98-1.16. * gnu/packages/statistics.scm (r-xml): Update to 3.98-1.16. --- 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 2e8bfb33fa..f02c40b43a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2803,13 +2803,13 @@ ldap, and also supports cookies, redirects, authentication, etc.") (define-public r-xml (package (name "r-xml") - (version "3.98-1.11") + (version "3.98-1.16") (source (origin (method url-fetch) (uri (cran-uri "XML" version)) (sha256 (base32 - "18izvlg2x9mzr6yb3yf02ghwbyn00frki3av4lpc44r22m4djnsh")))) + "0nl1kk354r8snhj6p9mc74m7awvqc6akmd4y3a46y78yv3g15njp")))) (properties `((upstream-name . "XML"))) (build-system r-build-system) -- cgit v1.2.3 From e926159eb3fd006c6c688729e03043741a456bf9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:59:24 +0200 Subject: gnu: r-e1071: Update to 1.7-0. * gnu/packages/statistics.scm (r-e1071): Update to 1.7-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 f02c40b43a..0bdf0783d0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3285,14 +3285,14 @@ Stochastic Neighbor Embedding using a Barnes-Hut implementation.") (define-public r-e1071 (package (name "r-e1071") - (version "1.6-8") + (version "1.7-0") (source (origin (method url-fetch) (uri (cran-uri "e1071" version)) (sha256 (base32 - "08n6i26nfckjpxjkzi8phhanc3ahsrirkv5rz38y2jcv7ds031pn")))) + "0fk4pw67cw1663d0n9rf1qfdqzz8k5nqkjgp3hi5jr422qp9lsck")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class))) -- cgit v1.2.3 From eefa7c7f3dc48a144e39d9167d3befa74f4f8645 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 14:59:45 +0200 Subject: gnu: r-r-utils: Update to 2.7.0. * gnu/packages/statistics.scm (r-r-utils): Update to 2.7.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 0bdf0783d0..9d03d5df1f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3463,13 +3463,13 @@ maintenance for package developers.") (define-public r-r-utils (package (name "r-r-utils") - (version "2.6.0") + (version "2.7.0") (source (origin (method url-fetch) (uri (cran-uri "R.utils" version)) (sha256 (base32 - "03j7hrs03kyj9qrjxyp5kqv4lpqqpk6xwbkzx6j15d8928yrjr2x")))) + "0cxhn14a57x4gcyrwpfz1d6dw4xh0jcpqkb33hx8imnr340blh7n")))) (properties `((upstream-name . "R.utils"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From e2a2c3378ecba09fc94ad2114c3e21df3460050e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:00:00 +0200 Subject: gnu: r-r-rsp: Update to 0.43.0. * gnu/packages/statistics.scm (r-r-rsp): Update to 0.43.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 9d03d5df1f..4b1001a0cd 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3511,13 +3511,13 @@ persistent (on the file system).") (define-public r-r-rsp (package (name "r-r-rsp") - (version "0.42.0") + (version "0.43.0") (source (origin (method url-fetch) (uri (cran-uri "R.rsp" version)) (sha256 (base32 - "1zcq0hzi0j7fvj2rs796a1i120wbr0387vck17rrd644awwbsbm0")))) + "0ax6781kfylx0acz0i3sqnpkxmrq73x29wwfic59ng7vj0ws0gyd")))) (properties `((upstream-name . "R.rsp"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 195eec737c13a871c39f9ebfeb3641a5e7b9d583 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:00:16 +0200 Subject: gnu: r-matrixstats: Update to 0.54.0. * gnu/packages/statistics.scm (r-matrixstats): Update to 0.54.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 4b1001a0cd..a5c44b485f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3562,13 +3562,13 @@ t-probabilities, quantiles, random deviates and densities.") (define-public r-matrixstats (package (name "r-matrixstats") - (version "0.53.1") + (version "0.54.0") (source (origin (method url-fetch) (uri (cran-uri "matrixStats" version)) (sha256 (base32 - "0bkiz5fm09d3512mfr2ymj9qsb1b8aic5l5m6fkaf5j7nsgvqw6z")))) + "0vx00ldsg2zvdrjn49jxczk2c9iaabgvzgpdka5j02ihh7hv83cg")))) (properties `((upstream-name . "matrixStats"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From 88cb7aa9e7d18db3c7266424f6efc356a575c0f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:00:41 +0200 Subject: gnu: r-plotly: Update to 4.8.0. * gnu/packages/statistics.scm (r-plotly): Update to 4.8.0. [propagated-inputs]: Add r-promises and r-rlang. --- gnu/packages/statistics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index a5c44b485f..68255ccf3a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3743,13 +3743,13 @@ features present in other programming languages.") (define-public r-plotly (package (name "r-plotly") - (version "4.7.1") + (version "4.8.0") (source (origin (method url-fetch) (uri (cran-uri "plotly" version)) (sha256 (base32 - "0wj9lw7w28z8w9ip9vadv6sydjhqyg65kfiai9m3bndzz50b1m3w")))) + "19p8pa03q9mw5vaan7r56xgd13d90ssiz0flbrkvpfrir2105ybq")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) @@ -3765,8 +3765,10 @@ features present in other programming languages.") ("r-jsonlite" ,r-jsonlite) ("r-lazyeval" ,r-lazyeval) ("r-magrittr" ,r-magrittr) + ("r-promises" ,r-promises) ("r-purrr" ,r-purrr) ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rlang" ,r-rlang) ("r-scales" ,r-scales) ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr) -- cgit v1.2.3 From 5dbe7aa92026ef7143d36036570e7e027ab85b64 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:01:09 +0200 Subject: gnu: r-googlesheets: Update to 0.3.0. * gnu/packages/statistics.scm (r-googlesheets): Update to 0.3.0. [propagated-inputs]: Add r-tibble. --- gnu/packages/statistics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 68255ccf3a..dd7494db49 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3850,14 +3850,14 @@ character vector.") (define-public r-googlesheets (package (name "r-googlesheets") - (version "0.2.2") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "googlesheets" version)) (sha256 (base32 - "18q0xmxn09b52rmky7gr5flp0awndcnsgb7zcvkzvkrkvmwad52b")))) + "11q07nxys72wkxx9mawmjyf20gvwvrb7h3gpa73h6lgh2vgrwnv8")))) (build-system r-build-system) (propagated-inputs `(("r-cellranger" ,r-cellranger) @@ -3867,6 +3867,7 @@ character vector.") ("r-purrr" ,r-purrr) ("r-readr" ,r-readr) ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr) ("r-xml2" ,r-xml2))) (home-page "https://github.com/jennybc/googlesheets") -- cgit v1.2.3 From c183fa26881d363c2c078dad534c9098e05456cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:12:31 +0200 Subject: gnu: Add r-officer. * gnu/packages/cran.scm (r-officer): New variable. --- gnu/packages/cran.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9d736d4d6e..a7a42573ae 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4656,6 +4656,41 @@ Rd files and roxygen2 comments, as well as many functions for manipulation of references and Rd files.") (license license:gpl2+))) +(define-public r-officer + (package + (name "r-officer") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "officer" version)) + (sha256 + (base32 + "14b6ii9h3fi5g8ja929mfhxps9r7x78flqjdy437y9aygkhmiz2i")))) + (build-system r-build-system) + (propagated-inputs + `(("r-base64enc" ,r-base64enc) + ("r-digest" ,r-digest) + ("r-htmltools" ,r-htmltools) + ("r-magrittr" ,r-magrittr) + ("r-r6" ,r-r6) + ("r-rcpp" ,r-rcpp) + ("r-uuid" ,r-uuid) + ("r-xml2" ,r-xml2) + ("r-zip" ,r-zip))) + (home-page "https://davidgohel.github.io/officer") + (synopsis "Manipulation of Word and PowerPoint documents") + (description + "This package provides tools to access and manipulate Word and PowerPoint +documents from R. The package focuses on tabular and graphical reporting from +R; it also provides two functions that let users get document content into +data objects. A set of functions lets add and remove images, tables and +paragraphs of text in new or existing documents. When working with PowerPoint +presentations, slides can be added or removed; shapes inside slides can also +be added or removed. When working with Word documents, a cursor can be used +to help insert or delete content at a specific location in the document.") + (license license:gpl3))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From bfee9ce88f3c6bd49a1dfc003128d1cb3b7aa421 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:12:47 +0200 Subject: gnu: Add r-snakecase. * gnu/packages/cran.scm (r-snakecase): New variable. --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a7a42573ae..e26deabd6e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4691,6 +4691,28 @@ be added or removed. When working with Word documents, a cursor can be used to help insert or delete content at a specific location in the document.") (license license:gpl3))) +(define-public r-snakecase + (package + (name "r-snakecase") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "snakecase" version)) + (sha256 + (base32 + "1g6xai53dl24ws0mwhqrkcv583ziaq505cv3z8v5dhjgy98kilyj")))) + (build-system r-build-system) + (propagated-inputs + `(("r-stringi" ,r-stringi) + ("r-stringr" ,r-stringr))) + (home-page "https://github.com/Tazinho/snakecase") + (synopsis "Convert strings into any case") + (description + "This package provides a consistent, flexible and easy to use tool to +parse and convert strings into cases like snake or camel among others.") + (license license:gpl3))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From de059e4bd3dce2937a4ac7853731f7f65e950475 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:12:57 +0200 Subject: gnu: Add r-prediction. * gnu/packages/cran.scm (r-prediction): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e26deabd6e..64156f5aa6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4713,6 +4713,30 @@ to help insert or delete content at a specific location in the document.") parse and convert strings into cases like snake or camel among others.") (license license:gpl3))) +(define-public r-prediction + (package + (name "r-prediction") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (cran-uri "prediction" version)) + (sha256 + (base32 + "19d7312f5lkqfglfvlgssnvyw7gl161s0xradcry44r1i6qp05j1")))) + (build-system r-build-system) + (propagated-inputs + `(("r-data-table" ,r-data-table))) + (home-page "https://github.com/leeper/prediction") + (synopsis "Tidy, type-safe prediction methods") + (description + "This package provides the @code{prediction()} function, a type-safe +alternative to @code{predict()} that always returns a data frame. The package +currently supports common model types (e.g., @code{\"lm\"}, @code{\"glm\"}) +from the @code{stats} package, as well as numerous other model classes from +other add-on packages.") + (license license:expat))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From cfc06314334933f0045e1851449722a612e28f5b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:14:17 +0200 Subject: gnu: Add r-sjlabelled. * gnu/packages/cran.scm (r-sjlabelled): New variable. --- gnu/packages/cran.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 64156f5aa6..bf942f03f6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4737,6 +4737,39 @@ from the @code{stats} package, as well as numerous other model classes from other add-on packages.") (license license:expat))) +(define-public r-sjlabelled + (package + (name "r-sjlabelled") + (version "1.0.13") + (source + (origin + (method url-fetch) + (uri (cran-uri "sjlabelled" version)) + (sha256 + (base32 + "0xizj7mrhnbn8kwjgm076si9w68a7lgrx4vj1sbqmv9jx055h8wv")))) + (build-system r-build-system) + (propagated-inputs + `(("r-broom" ,r-broom) + ("r-dplyr" ,r-dplyr) + ("r-haven" ,r-haven) + ("r-magrittr" ,r-magrittr) + ("r-prediction" ,r-prediction) + ("r-purrr" ,r-purrr) + ("r-rlang" ,r-rlang) + ("r-snakecase" ,r-snakecase) + ("r-tibble" ,r-tibble) + ("r-tidyselect" ,r-tidyselect))) + (home-page "https://github.com/strengejacke/sjlabelled") + (synopsis "Labelled data utility functions") + (description + "This package provides a collection of functions dealing with labelled +data, like reading and writing data between R and other statistical software +packages. This includes easy ways to get, set or change value and variable +label attributes, to convert labelled vectors into factors or numeric (and +vice versa), or to deal with multiple declared missing values.") + (license license:gpl3))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From 1f560b9cdb820569e796caa9949557d9a18f8549 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:14:33 +0200 Subject: gnu: Add r-sjmisc. * gnu/packages/cran.scm (r-sjmisc): New variable. --- gnu/packages/cran.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bf942f03f6..65474d8f8b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4770,6 +4770,43 @@ label attributes, to convert labelled vectors into factors or numeric (and vice versa), or to deal with multiple declared missing values.") (license license:gpl3))) +(define-public r-sjmisc + (package + (name "r-sjmisc") + (version "2.7.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "sjmisc" version)) + (sha256 + (base32 + "11cy09k1d2y5wwqvafqxr01hzk4x68ji2pqlwj7fnpw27i3ap4q4")))) + (build-system r-build-system) + (propagated-inputs + `(("r-broom" ,r-broom) + ("r-crayon" ,r-crayon) + ("r-dplyr" ,r-dplyr) + ("r-haven" ,r-haven) + ("r-magrittr" ,r-magrittr) + ("r-pillar" ,r-pillar) + ("r-purrr" ,r-purrr) + ("r-rlang" ,r-rlang) + ("r-sjlabelled" ,r-sjlabelled) + ("r-stringdist" ,r-stringdist) + ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr) + ("r-tidyselect" ,r-tidyselect))) + (home-page "https://github.com/strengejacke/sjmisc") + (synopsis "Data and variable transformation functions") + (description + "This package is a collection of miscellaneous utility functions, +supporting data transformation tasks like recoding, dichotomizing or grouping +variables, setting and replacing missing values. The data transformation +functions also support labelled data, and all integrate seamlessly into a +tidyverse workflow.") + (license license:gpl3))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From aaed237d1bcae69bd3c65f06633a8a4c88f2e382 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:14:45 +0200 Subject: gnu: Add r-nortest. * gnu/packages/cran.scm (r-nortest): New variable. --- gnu/packages/cran.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 65474d8f8b..4d6bd269b1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4807,6 +4807,25 @@ functions also support labelled data, and all integrate seamlessly into a tidyverse workflow.") (license license:gpl3))) +(define-public r-nortest + (package + (name "r-nortest") + (version "1.0-4") + (source + (origin + (method url-fetch) + (uri (cran-uri "nortest" version)) + (sha256 + (base32 + "17r0wpz72z9312c70nwi1i1kp1v9fm1h6jg7q5cx1mc1h420m1d3")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/nortest/") + (synopsis "Tests for normality") + (description + "This package provides five omnibus tests for testing the composite +hypothesis of normality.") + (license license:gpl2+))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From 0fd7d59dc387eea437482f7584d03c5a20399faa Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:14:56 +0200 Subject: gnu: Add r-moonbook. * gnu/packages/cran.scm (r-moonbook): New variable. --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4d6bd269b1..1025ff093a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4826,6 +4826,35 @@ tidyverse workflow.") hypothesis of normality.") (license license:gpl2+))) +(define-public r-moonbook + (package + (name "r-moonbook") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "moonBook" version)) + (sha256 + (base32 + "0hys56mwbm776ff7dibi8wzyf69qiais9rs1jazv79lk6h56s9s6")))) + (properties `((upstream-name . "moonBook"))) + (build-system r-build-system) + (propagated-inputs + `(("r-magrittr" ,r-magrittr) + ("r-nortest" ,r-nortest) + ("r-purrr" ,r-purrr) + ("r-sjmisc" ,r-sjmisc) + ("r-stringr" ,r-stringr) + ("r-survival" ,r-survival))) + (home-page "https://github.com/cardiomoon/moonBook") + (synopsis "Functions and datasets for the book by Keon-Woong Moon") + (description + "This package provides several analysis-related functions for the book +entitled \"R statistics and graph for medical articles\" (written in Korean), +version 1, by Keon-Woong Moon with Korean demographic data with several plot +functions.") + (license license:gpl2))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From 90708323a13c94bf36a56735da9c21a2203e9fde Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 18:39:43 +0200 Subject: Revert "gnu: ghc-base-compat: Update to 0.10.4." This reverts commit 0fa2c552fcd5176b0484b77b7f7c94d82d46415e. We may not upgrade base-compat at this point because we haven't upgraded the default GHC yet. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b8ae26346e..31a0d6d7ee 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4231,7 +4231,7 @@ system.") (define-public ghc-base-compat (package (name "ghc-base-compat") - (version "0.10.4") + (version "0.9.3") (source (origin (method url-fetch) @@ -4241,7 +4241,7 @@ system.") ".tar.gz")) (sha256 (base32 - "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d")))) + "0452l6zf6fjhy4kxqwv6i6hhg6yfx4wcg450k3axpyj30l7jnq3x")))) (build-system haskell-build-system) (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) -- cgit v1.2.3 From f9f4578ba0c4b5b22cdac86e8183dc542d66cc85 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 18:43:11 +0200 Subject: Revert "gnu: ghc-tasty: Update to 1.1.0.3." This reverts commit 3ad6b8909025a8f4d3e1f1f5ea16bcd0cace557c. --- gnu/packages/haskell-check.scm | 7 +++---- gnu/packages/haskell.scm | 27 +++------------------------ 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 65333f8269..31407ca259 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -183,7 +183,7 @@ timer functions of different operating systems via a unified API.") (define-public ghc-tasty (package (name "ghc-tasty") - (version "1.1.0.3") + (version "0.11.0.4") (source (origin (method url-fetch) @@ -193,7 +193,7 @@ timer functions of different operating systems via a unified API.") ".tar.gz")) (sha256 (base32 - "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22")))) + "05pxjzgbgjdn7477xry0ssjrnmnsydqiq6nm6ck8n2da1baliqp0")))) (build-system haskell-build-system) (inputs `(("ghc-stm" ,ghc-stm) @@ -205,8 +205,7 @@ timer functions of different operating systems via a unified API.") ("ghc-unbounded-delays" ,ghc-unbounded-delays) ("ghc-async" ,ghc-async) ("ghc-ansi-terminal" ,ghc-ansi-terminal) - ("ghc-clock-bootstrap" ,ghc-clock-bootstrap) - ("ghc-wcwidth" ,ghc-wcwidth))) + ("ghc-clock-bootstrap" ,ghc-clock-bootstrap))) (home-page "http://documentup.com/feuerbach/tasty") (synopsis "Modern and extensible testing framework") (description "Tasty is a modern testing framework for Haskell. It lets diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 31a0d6d7ee..eb629cf138 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2870,7 +2870,7 @@ with slicing and Clang-style colored diagnostics.") ;; re-enable them. (arguments `(#:tests? #f)) (inputs - `(("ghc-scientific-bootstrap" ,ghc-scientific-bootstrap) + `(("ghc-scientific" ,ghc-scientific) ("ghc-text" ,ghc-text))) (native-inputs `(("ghc-tasty" ,ghc-tasty) @@ -2885,13 +2885,6 @@ aimed particularly at dealing efficiently with network protocols and complicated text/binary file formats.") (license license:bsd-3))) -(define ghc-attoparsec-bootstrap - (package - (inherit ghc-attoparsec) - (name "ghc-attoparsec-bootstrap") - (arguments '(#:tests? #f)) - (native-inputs '()))) - (define-public ghc-zip-archive (package (name "ghc-zip-archive") @@ -5221,13 +5214,6 @@ occurrences of a substring (the first in case of overlaps) with another.") in migrated modules.") (license license:expat))) -(define ghc-integer-logarithms-bootstrap - (package - (inherit ghc-integer-logarithms) - (name "ghc-integer-logarithms-bootstrap") - (arguments `(#:tests? #f)) - (native-inputs '()))) - (define-public ghc-scientific (package (name "ghc-scientific") @@ -5244,7 +5230,7 @@ in migrated modules.") "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397")))) (build-system haskell-build-system) (inputs - `(("ghc-integer-logarithms-bootstrap" ,ghc-integer-logarithms-bootstrap) + `(("ghc-integer-logarithms" ,ghc-integer-logarithms) ("ghc-text" ,ghc-text) ("ghc-hashable" ,ghc-hashable) ("ghc-primitive" ,ghc-primitive))) @@ -5265,13 +5251,6 @@ and space efficient. They are represented using notation}.") (license license:bsd-3))) -(define ghc-scientific-bootstrap - (package - (inherit ghc-scientific) - (name "ghc-scientific-bootstrap") - (arguments `(#:tests? #f)) - (native-inputs '()))) - (define-public ghc-boxes (package (name "ghc-boxes") @@ -10195,7 +10174,7 @@ backends provided by the @code{Cairo} and @code{Diagrams} libraries.") (inputs `(("ghc-setlocale" ,ghc-setlocale) ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-attoparsec-bootstrap" ,ghc-attoparsec-bootstrap))) + ("ghc-attoparsec" ,ghc-attoparsec))) (home-page "https://github.com/solidsnack/wcwidth/") (synopsis "Haskell bindings to wcwidth") (description "This package provides Haskell bindings to your system's -- cgit v1.2.3 From 78f2c08c0b780dd2fe72548b901df7eb887da7f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:22:20 +0200 Subject: gnu: r-rmarkdown: Use latest version of Pandoc. * gnu/packages/statistics.scm (r-rmarkdown)[propagated-inputs]: Replace "ghc-pandoc-1" with "ghc-pandoc". --- gnu/packages/statistics.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index dd7494db49..69c72541a7 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2633,11 +2633,7 @@ certain criterion, e.g., it contains a certain regular file.") ("r-stringr" ,r-stringr) ("r-tinytex" ,r-tinytex) ("r-yaml" ,r-yaml) - ;; rmarkdown works with the 2.x release of Pandoc, but with degraded - ;; functionality. For example, tabbed plots do not currently work with - ;; Pandoc 2. The authors of rmarkdown recommend the use of Pandoc 1 - ;; for the time being. - ("ghc-pandoc" ,ghc-pandoc-1))) + ("ghc-pandoc" ,ghc-pandoc))) (home-page "http://rmarkdown.rstudio.com") (synopsis "Convert R Markdown documents into a variety of formats") (description -- cgit v1.2.3 From 589bd1c4260a429536d3a69a4b7c0a7bcd2e4357 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:23:51 +0200 Subject: gnu: Add r-flextable. * gnu/packages/cran.scm (r-flextable): New variable. --- gnu/packages/cran.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1025ff093a..ea3f1c4981 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4855,6 +4855,37 @@ version 1, by Keon-Woong Moon with Korean demographic data with several plot functions.") (license license:gpl2))) +(define-public r-flextable + (package + (name "r-flextable") + (version "0.4.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "flextable" version)) + (sha256 + (base32 + "09j2y0z7rkc0w1cl9pp1cpk6fnzzfr6245mxa3ca42z9k2cy2jfl")))) + (build-system r-build-system) + (propagated-inputs + `(("r-gdtools" ,r-gdtools) + ("r-htmltools" ,r-htmltools) + ("r-knitr" ,r-knitr) + ("r-officer" ,r-officer) + ("r-r6" ,r-r6) + ("r-rmarkdown" ,r-rmarkdown) + ("r-stringr" ,r-stringr) + ("r-xml2" ,r-xml2))) + (home-page "https://davidgohel.github.io/flextable") + (synopsis "Functions for tabular reporting") + (description + "This package provides tools to create pretty tables for HTML documents +and other formats. Functions are provided to let users create tables, modify +and format their content. It extends the @code{officer} package and can be +used within R markdown documents when rendering to HTML and to Word +documents.") + (license license:gpl3))) + (define-public r-writexl (package (name "r-writexl") -- cgit v1.2.3 From cb96d81be47ac5e553dc7b14ce64823a9b6f99a5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:24:12 +0200 Subject: gnu: r-doby: Update to 4.6-2. * gnu/packages/cran.scm (r-doby): Update to 4.6-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 ea3f1c4981..56b6462fae 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5079,14 +5079,14 @@ Group (Non-)Overlap considerations.") (define-public r-doby (package (name "r-doby") - (version "4.6-1") + (version "4.6-2") (source (origin (method url-fetch) (uri (cran-uri "doBy" version)) (sha256 (base32 - "1y02awzid23bxz8hx6j8pxd6i7jaq8pdw3k60rag8y6m69incrw5")))) + "02vbv9nfgywg6lsiialkmfnax5z3rkyb9nr8j9l2cp8xi6ml95mb")))) (properties `((upstream-name . "doBy"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 2cdd9d4f832bf11d9b419e15fdfcdcf49ec99520 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:24:41 +0200 Subject: gnu: r-reticulate: Update to 1.10. * gnu/packages/cran.scm (r-reticulate): Update to 1.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 56b6462fae..9033fac0a6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4236,14 +4236,14 @@ obtain a better initial configuration in non-metric MDS.") (define-public r-reticulate (package (name "r-reticulate") - (version "1.8") + (version "1.10") (source (origin (method url-fetch) (uri (cran-uri "reticulate" version)) (sha256 (base32 - "0zwb4ikf021nw7axdn7qlr6bq4xkph3anfy314idkspy1iil4nmr")))) + "0bz3lxbisjwn6cv23090zivpy0bxcncr82g5qja13l37i8xnvqsq")))) (build-system r-build-system) (inputs `(("python" ,python))) (propagated-inputs -- cgit v1.2.3 From e3c1e93e35f25fc746476226e3c7b8c633eb2b8e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:25:04 +0200 Subject: gnu: r-reprex: Update to 0.2.0. * gnu/packages/cran.scm (r-reprex): Update to 0.2.0. [propagated-inputs]: Add r-clipr, r-rlang, and r-withr. --- gnu/packages/cran.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9033fac0a6..2c6de3ddd2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -162,20 +162,23 @@ package is a port of the Python package @code{cssselect}.") (define-public r-reprex (package (name "r-reprex") - (version "0.1.2") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "reprex" version)) (sha256 (base32 - "105d9vsmqfilgpw8psfb2wyiz1hvcycvh4cqhb3ab37lm3rcavvs")))) + "1l44pxjiz3g0jkk3v6rg5jps3llihfiah0qyv40s0bxvxa6gm8v9")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) + ("r-clipr" ,r-clipr) ("r-knitr" ,r-knitr) + ("r-rlang" ,r-rlang) ("r-rmarkdown" ,r-rmarkdown) - ("r-whisker" ,r-whisker))) + ("r-whisker" ,r-whisker) + ("r-withr" ,r-withr))) (home-page "https://github.com/tidyverse/reprex") (synopsis "Prepare reproducible R code examples for sharing") (description -- cgit v1.2.3 From b72de5b3f674e3b360f1d7c5032d9fb47e0992d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:25:42 +0200 Subject: gnu: r-callr: Update to 3.0.0. * gnu/packages/cran.scm (r-callr): Update to 3.0.0. [propagated-inputs]: Add r-base64enc. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2c6de3ddd2..5c3c7ed821 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -193,17 +193,18 @@ such as copy/paste from an R session.") (define-public r-callr (package (name "r-callr") - (version "2.0.4") + (version "3.0.0") (source (origin (method url-fetch) (uri (cran-uri "callr" version)) (sha256 (base32 - "1053qqq632z94pqq2v5dynjpgyv1b1c8zvidmcllw7zn8zha8gqf")))) + "1rxbxy6kn7dj90z9hpppr9cnpvnxzknba2dwrdp0lrk5dh462qz3")))) (build-system r-build-system) (propagated-inputs - `(("r-r6" ,r-r6) + `(("r-base64enc" ,r-base64enc) + ("r-r6" ,r-r6) ("r-processx" ,r-processx))) (home-page "https://github.com/r-lib/callr#readme") (synopsis "Call R from R") -- cgit v1.2.3 From b00e8ae77105d8fe398f5b9d47812844aa21b5dd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:26:04 +0200 Subject: gnu: r-glue: Update to 1.3.0. * gnu/packages/cran.scm (r-glue): Update to 1.3.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 5c3c7ed821..6ef31e09dd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -392,14 +392,14 @@ colors are provided.") (define-public r-glue (package (name "r-glue") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "glue" version)) (sha256 (base32 - "0vi9y8ix95g6hjqdz9c9y4119apbdjcypdv0ag8cl6vaxqs5n9qr")))) + "1vhw5497lpfr4m8lcx9bs0fgdp4ax0sycrk6n8yksp33qd25m7kq")))) (build-system r-build-system) (home-page "https://github.com/tidyverse/glue") (synopsis "Interpreted string literals") -- cgit v1.2.3 From c73752cac5e74691d9f28c3c8c29a2fbb8291f4c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:26:18 +0200 Subject: gnu: r-pls: Update to 2.7-0. * gnu/packages/cran.scm (r-pls): Update to 2.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 6ef31e09dd..c6f4f73f53 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -453,14 +453,14 @@ error stream.") (define-public r-pls (package (name "r-pls") - (version "2.6-0") + (version "2.7-0") (source (origin (method url-fetch) (uri (cran-uri "pls" version)) (sha256 (base32 - "15j59p5x0rkdrk7iqzkipsy50rsyjl31w8zxc4w3v1j5gzxhi1rx")))) + "0xaqqgmdvfh7g7v1m4bcwjqzph68b9cq3bn4kjisfsadl54i5p2x")))) (build-system r-build-system) (home-page "http://mevik.net/work/software/pls.html") (synopsis "Partial Least Squares and Principal Component Regression") -- cgit v1.2.3 From 2d2b95d15141f55f747b785ca0094aeaf3001268 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:26:33 +0200 Subject: gnu: r-ipred: Update to 0.9-7. * gnu/packages/cran.scm (r-ipred): Update to 0.9-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 c6f4f73f53..b2768cc403 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1755,14 +1755,14 @@ provided.") (define-public r-ipred (package (name "r-ipred") - (version "0.9-6") + (version "0.9-7") (source (origin (method url-fetch) (uri (cran-uri "ipred" version)) (sha256 (base32 - "1vrw1pqcpnc04x1r2h9grdfm6bivs358sww5gg90jwlvxcw69lxq")))) + "0q53cqs46501wsd4cmfsmr78l8nv1hkbamk9m0ns5qy02df5r254")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class) -- cgit v1.2.3 From 45c156bf812e227b07e94b0420d41ed57ae10220 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:26:58 +0200 Subject: gnu: r-broom: Update to 0.5.0. * gnu/packages/cran.scm (r-broom): Update to 0.5.0. [propagated-inputs]: Add r-backports, r-dplyr, r-purrr, and r-tibble; remove r-plyr and r-psych. --- gnu/packages/cran.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b2768cc403..4cf7d6295e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1816,22 +1816,23 @@ created using basic graphics.") (define-public r-broom (package (name "r-broom") - (version "0.4.5") + (version "0.5.0") (source (origin (method url-fetch) (uri (cran-uri "broom" version)) (sha256 (base32 - "1mrrqqw1bmjf2v88ziqwb5y86g29h0a3rsx2jpw0hrzrzb8i5kcb")))) + "1r3831vq0fd5sh5841xr844sghg88z7ws91hg4jgnzbbkxfjp4ag")))) (build-system r-build-system) (propagated-inputs - `(("r-dplyr" ,r-dplyr) + `(("r-backports" ,r-backports) + ("r-dplyr" ,r-dplyr) ("r-nlme" ,r-nlme) - ("r-plyr" ,r-plyr) - ("r-psych" ,r-psych) + ("r-purrr" ,r-purrr) ("r-reshape2" ,r-reshape2) ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr))) (home-page "https://github.com/tidyverse/broom") (synopsis "Convert statistical analysis objects into tidy data frames") -- cgit v1.2.3 From dc66835226858236c12c498cc9de0e98c8c86e18 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:32:40 +0200 Subject: gnu: Add r-ucminf. * gnu/packages/cran.scm (r-ucminf): New variable. --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4cf7d6295e..f64b48da5f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1981,6 +1981,30 @@ can be computed between character vectors while taking proper care of encoding or between integer vectors representing generic sequences.") (license license:gpl3+))) +(define-public r-ucminf + (package + (name "r-ucminf") + (version "1.1-4") + (source + (origin + (method url-fetch) + (uri (cran-uri "ucminf" version)) + (sha256 + (base32 + "01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2")))) + (build-system r-build-system) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/web/packages/ucminf/") + (synopsis "General-purpose unconstrained non-linear optimization") + (description + "This package provides an implementation of an algorithm for +general-purpose unconstrained non-linear optimization. The algorithm is of +quasi-Newton type with BFGS updating of the inverse Hessian and soft line +search with a trust region type monitoring of the input to the line search +algorithm. The interface of @code{ucminf} is designed for easy interchange +with the package @code{optim}.") + (license license:gpl2+))) + (define-public r-jomo (package (name "r-jomo") -- cgit v1.2.3 From b8f6e2f82a733759017269170e7b8813f04a9425 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:32:50 +0200 Subject: gnu: Add r-ordinal. * gnu/packages/cran.scm (r-ordinal): New variable. --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f64b48da5f..590d2c90d3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2005,6 +2005,33 @@ algorithm. The interface of @code{ucminf} is designed for easy interchange with the package @code{optim}.") (license license:gpl2+))) +(define-public r-ordinal + (package + (name "r-ordinal") + (version "2018.8-25") + (source + (origin + (method url-fetch) + (uri (cran-uri "ordinal" version)) + (sha256 + (base32 + "03cv9hcrw8j3lhamzhz8sk2p3ns4cw9z41x49h301k2b3pajv43h")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mass" ,r-mass) + ("r-matrix" ,r-matrix) + ("r-numderiv" ,r-numderiv) + ("r-ucminf" ,r-ucminf))) + (home-page "https://github.com/runehaubo/ordinal") + (synopsis "Regression models for ordinal data") + (description + "This package provides an implementation of cumulative link (mixed) +models also known as ordered regression models, proportional odds models, +proportional hazards models for grouped survival times and ordered models. +Estimation is via maximum likelihood and mixed models are fitted with the +Laplace approximation and adaptive Gauss-Hermite quadrature.") + (license license:gpl2+))) + (define-public r-jomo (package (name "r-jomo") -- cgit v1.2.3 From e7630cc93182f38b486c1c6825bf7a9ca5c3a6b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:27:42 +0200 Subject: gnu: r-jomo: Update to 2.6-4. * gnu/packages/cran.scm (r-jomo): Update to 2.6-4. [propagated-inputs]: Add r-ordinal. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 590d2c90d3..8f9a463a0f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2035,17 +2035,18 @@ Laplace approximation and adaptive Gauss-Hermite quadrature.") (define-public r-jomo (package (name "r-jomo") - (version "2.6-3") + (version "2.6-4") (source (origin (method url-fetch) (uri (cran-uri "jomo" version)) (sha256 (base32 - "14s8q0j5zgl1g1pfxg3a4y1jzvs0wl61ir4992wsj7safskj7zvi")))) + "05g2rj9g7rgyb22b0gybw042nydyqsqsb31v05hifzavri8ij01x")))) (build-system r-build-system) (propagated-inputs `(("r-lme4" ,r-lme4) + ("r-ordinal" ,r-ordinal) ("r-survival" ,r-survival))) (home-page "https://cran.r-project.org/web/packages/jomo/") (synopsis "Multilevel Joint Modelling Multiple Imputation") -- cgit v1.2.3 From a7265593d3385423adc2dbeaeb4827db586b2e34 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:33:37 +0200 Subject: gnu: r-pan: Update to 1.6. * gnu/packages/cran.scm (r-pan): Update to 1.6. --- 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 8f9a463a0f..46cb3e16a5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2062,14 +2062,14 @@ impute compatibly with the substantive model.") (define-public r-pan (package (name "r-pan") - (version "1.4") + (version "1.6") (source (origin (method url-fetch) (uri (cran-uri "pan" version)) (sha256 (base32 - "1p3nigmhrnlch86g89hn7l0wvkifx3k9n59g0psi95yck43kza76")))) + "1dk3jjj826p7xrz10qz04vyc068xnypg7bp0pj4c32z3da0xzh5d")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) (home-page "https://cran.r-project.org/web/packages/pan/") -- cgit v1.2.3 From 1b3b2a72eeaa5a134e0db8928f43e42340df36f6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:33:48 +0200 Subject: gnu: r-mice: Update to 3.3.0. * gnu/packages/cran.scm (r-mice): Update to 3.3.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 46cb3e16a5..3865ffa150 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2107,14 +2107,14 @@ analysis of multiply imputed data sets.") (define-public r-mice (package (name "r-mice") - (version "3.1.0") + (version "3.3.0") (source (origin (method url-fetch) (uri (cran-uri "mice" version)) (sha256 (base32 - "0xpn215yfzib4hw09cwilnyg9zbvq460njavfvm84mvgwbm25byi")))) + "1p0ipbqk5aqdi7iikw3qrjyvdi9sdhpnw1h5mwakwvv0yl0pzbyx")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) -- cgit v1.2.3 From 69bf449bf10fe3c6ea5fc643ee49ed6ee8e50b84 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:34:29 +0200 Subject: gnu: r-xts: Update to 0.11-0. * gnu/packages/cran.scm (r-xts): Update to 0.11-0. [native-inputs]: Remove. --- 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 3865ffa150..afba068dd6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2312,17 +2312,16 @@ training models for classification or ranking.") (define-public r-xts (package (name "r-xts") - (version "0.10-2") + (version "0.11-0") (source (origin (method url-fetch) (uri (cran-uri "xts" version)) (sha256 (base32 - "1i11fczks4lh8rpi6xbm9bm7f3jpcp6xw03kv178g3n3361qhmc1")))) + "1v50yn4bsjzdyk7r90isn6dxmpkapillrhpx3gqsshd180vwzqk9")))) (build-system r-build-system) (propagated-inputs `(("r-zoo" ,r-zoo))) - (native-inputs `(("gfortran" ,gfortran))) (home-page "https://github.com/joshuaulrich/xts") (synopsis "Extensible time series") (description -- cgit v1.2.3 From 6f5b157e3dab1ee7db0e62552ba6350b91c66d1e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:34:57 +0200 Subject: gnu: r-pillar: Update to 1.3.0. * gnu/packages/cran.scm (r-pillar): Update to 1.3.0. [propagated-inputs]: Add r-fansi. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index afba068dd6..7d2f93a394 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2798,18 +2798,19 @@ display.") (define-public r-pillar (package (name "r-pillar") - (version "1.2.3") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "pillar" version)) (sha256 (base32 - "1rzhssprqgam1nq3s0f5rzxhxsq02azcghvxf6k8kmsmddf1n7f8")))) + "1q6arybmfqxhp5zqj1fri5pb8v7ywcv7bmgf81rrmgl892p4bn5f")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) ("r-crayon" ,r-crayon) + ("r-fansi" ,r-fansi) ("r-rlang" ,r-rlang) ("r-utf8" ,r-utf8))) (home-page "https://github.com/r-lib/pillar") -- cgit v1.2.3 From d97d98e142e40820807b050c656df40a33e8d020 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:35:24 +0200 Subject: gnu: r-tinytex: Update to 0.8. * gnu/packages/cran.scm (r-tinytex): Update to 0.8. --- 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 7d2f93a394..b7827931c1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2843,14 +2843,14 @@ terminals.") (define-public r-tinytex (package (name "r-tinytex") - (version "0.6") + (version "0.8") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "16y9dldaff2kx1fkm92p7zlph0dcrdmlmavpdgf5y9jbhmc8g83f")))) + "1bgpr5i5399jf9n6pg2mm4aamisbhppg082ad0wv1j4g0rlxf1gy")))) (build-system r-build-system) (propagated-inputs `(("r-xfun" ,r-xfun))) -- cgit v1.2.3 From e32368c130893da22b35b4318f06606baacd5056 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:35:46 +0200 Subject: gnu: r-metap: Update to 1.0. * gnu/packages/cran.scm (r-metap): Update to 1.0. [propagated-inputs]: Add r-rdpack. --- gnu/packages/cran.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b7827931c1..784f476145 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2867,17 +2867,18 @@ automatically.") (define-public r-metap (package (name "r-metap") - (version "0.9") + (version "1.0") (source (origin (method url-fetch) (uri (cran-uri "metap" version)) (sha256 (base32 - "03vg0mb6q7j2z0pkxykbak0hcp6dcak7zxs1lw9hswz9kqrq5jhz")))) + "18rzvqfzyk8fn54gjvy2qd21nk9w69j7ihww477ma3f3ab6i982h")))) (build-system r-build-system) (propagated-inputs - `(("r-lattice" ,r-lattice))) + `(("r-lattice" ,r-lattice) + ("r-rdpack" ,r-rdpack))) (home-page "http://www.dewey.myzen.co.uk/meta/meta.html") (synopsis "Meta-analysis of significance values") (description -- cgit v1.2.3 From be5642eb69d3b0dba1685742291b5d635f004c66 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:36:12 +0200 Subject: gnu: r-statnet-common: Update to 4.1.4. * gnu/packages/cran.scm (r-statnet-common): Update to 4.1.4. --- 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 784f476145..fb398f56b8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2912,14 +2912,14 @@ supports arbitrary vertex/edge/graph attributes.") (define-public r-statnet-common (package (name "r-statnet-common") - (version "4.1.2") + (version "4.1.4") (source (origin (method url-fetch) (uri (cran-uri "statnet.common" version)) (sha256 (base32 - "0h3g687214rlycca0fjrpy1lqbqsrginxqhmhl2mb2jinqqxcfgd")))) + "14dydm4c4dzc4v6ldxpn04q551nczzfablwibrd8lzgja8x9ksic")))) (properties `((upstream-name . "statnet.common"))) (build-system r-build-system) -- cgit v1.2.3 From 1fe9919a575b5d2d97dc7dee65251a2689709ed4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:36:31 +0200 Subject: gnu: r-tsa: Update to 1.2. * gnu/packages/cran.scm (r-tsa): Update to 1.2. [propagated-inputs]: Remove r-tseries. --- gnu/packages/cran.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fb398f56b8..478df95eaf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3141,21 +3141,20 @@ University Press, 2000.") (define-public r-tsa (package (name "r-tsa") - (version "1.01") + (version "1.2") (source (origin (method url-fetch) (uri (cran-uri "TSA" version)) (sha256 (base32 - "0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx")))) + "0gjfqibwdznz0nka95k4fjm935svxjpnqfywwz403crn2lh30h6q")))) (properties `((upstream-name . "TSA"))) (build-system r-build-system) (propagated-inputs `(("r-leaps" ,r-leaps) ("r-locfit" ,r-locfit) - ("r-mgcv" ,r-mgcv) - ("r-tseries" ,r-tseries))) + ("r-mgcv" ,r-mgcv))) (home-page "http://www.stat.uiowa.edu/~kchan/TSA.htm") (synopsis "Time series analysis") (description -- cgit v1.2.3 From 19950821d74e5ae008919f28511bb8caa8c516ce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:37:05 +0200 Subject: gnu: r-heatmaply: Update to 0.15.2. * gnu/packages/cran.scm (r-heatmaply): Update to 0.15.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 478df95eaf..706f612344 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3407,14 +3407,14 @@ exponentiation.") (define-public r-heatmaply (package (name "r-heatmaply") - (version "0.14.1") + (version "0.15.2") (source (origin (method url-fetch) (uri (cran-uri "heatmaply" version)) (sha256 (base32 - "03p2caclhfgqgpx3wwck5h06jy3mxgs05gjmwkb7hmwghkjh41jc")))) + "0h8s5djzj4mrmaswlcaap6jbwxrkbzc43bbqik3qf8vrqz335w04")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From 7a96c4e0a00e0c527862df289aa48cab231380dc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:39:09 +0200 Subject: gnu: r-fnn: Update to 1.1.2.1. * gnu/packages/cran.scm (r-fnn): Update to 1.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 706f612344..9e7cb04f91 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3763,14 +3763,14 @@ multivariate plot methods.") (define-public r-fnn (package (name "r-fnn") - (version "1.1") + (version "1.1.2.1") (source (origin (method url-fetch) (uri (cran-uri "FNN" version)) (sha256 (base32 - "1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj")))) + "1n61jrcmakqif8f827x4qnlhm2jqpj5fgjj65c4p0kdd8lzw8pqp")))) (properties `((upstream-name . "FNN"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/FNN") -- cgit v1.2.3 From 12132229b0c9c57b1f99db158e02a81922a1aabf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:39:23 +0200 Subject: gnu: r-maptools: Update to 0.9-3. * gnu/packages/cran.scm (r-maptools): Update to 0.9-3. --- 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 9e7cb04f91..116fdf42cb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4055,14 +4055,14 @@ simple method for converting between file types.") (define-public r-maptools (package (name "r-maptools") - (version "0.9-2") + (version "0.9-3") (source (origin (method url-fetch) (uri (cran-uri "maptools" version)) (sha256 (base32 - "075lmb3b62171cw2dg8fv1vwmvfzg39r1ji7jwb8s5k9dz88ry1v")))) + "0hxbv01im9zk1qrwgigpc510w6x0kzdzip4gx2jzfqmmwr8m17r8")))) (build-system r-build-system) (propagated-inputs `(("r-foreign" ,r-foreign) -- cgit v1.2.3 From 2e6909baf0512cb5f4de9553e6dad3329db7e47c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:39:46 +0200 Subject: gnu: r-later: Update to 0.7.4. * gnu/packages/cran.scm (r-later): Update to 0.7.4. --- 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 116fdf42cb..82111ff96e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4083,14 +4083,14 @@ exchanging spatial objects with other R packages.") (define-public r-later (package (name "r-later") - (version "0.7.3") + (version "0.7.4") (source (origin (method url-fetch) (uri (cran-uri "later" version)) (sha256 (base32 - "04j2phymxgkk4hv9pfa5w3s98w5d7fvm11blrdhxmray4n618msw")))) + "125zc499gj702x2bch95lsfzk2qb4dzv3604x9afym2i3ylrmm64")))) (build-system r-build-system) (propagated-inputs `(("r-bh" ,r-bh) -- cgit v1.2.3 From a9b02ddd73adf938d5ef68658c2873dac64b7f04 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:39:58 +0200 Subject: gnu: r-codedepends: Update to 0.6.5. * gnu/packages/cran.scm (r-codedepends): Update to 0.6.5. [propagated-inputs]: Add r-graph. --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 82111ff96e..8eac103109 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4180,18 +4180,19 @@ it.") (define-public r-codedepends (package (name "r-codedepends") - (version "0.5-3") + (version "0.6.5") (source (origin (method url-fetch) (uri (cran-uri "CodeDepends" version)) (sha256 (base32 - "03p82s0abca2jimzqvxdzykfzca7c7fhm5xsjxybcksr4gggr5sc")))) + "0l7kiv3awx50glf5cs841b4zzsff1ml90f0zr868ygvwsr4ps1hq")))) (properties `((upstream-name . "CodeDepends"))) (build-system r-build-system) (propagated-inputs `(("r-codetools" ,r-codetools) + ("r-graph" ,r-graph) ("r-xml" ,r-xml))) (home-page "http://cran.r-project.org/web/packages/CodeDepends") (synopsis "Analysis of R code for reproducible research and code comprehension") -- cgit v1.2.3 From caaec8865117a15392a5220fe29f0acacef1a318 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:40:20 +0200 Subject: gnu: r-ggpubr: Update to 0.1.8. * gnu/packages/cran.scm (r-ggpubr): Update to 0.1.8. [propagated-inputs]: Add r-glue and r-polynom. --- gnu/packages/cran.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8eac103109..9f3d1bfd09 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4411,14 +4411,14 @@ and adds the annotation to the plot.") (define-public r-ggpubr (package (name "r-ggpubr") - (version "0.1.7") + (version "0.1.8") (source (origin (method url-fetch) (uri (cran-uri "ggpubr" version)) (sha256 (base32 - "110ny8p41kmbz0a5rl0mv9cqpjkx6yr3ybflp1r0fmcvhwv7cr3i")))) + "0psl2zndm4wk6nnj1nv305islpxfvfgd87gjh2ph8yqn4mxpnfi1")))) (build-system r-build-system) (propagated-inputs `(("r-cowplot" ,r-cowplot) @@ -4427,8 +4427,10 @@ and adds the annotation to the plot.") ("r-ggrepel" ,r-ggrepel) ("r-ggsci" ,r-ggsci) ("r-ggsignif" ,r-ggsignif) + ("r-glue" ,r-glue) ("r-gridextra" ,r-gridextra) ("r-magrittr" ,r-magrittr) + ("r-polynom" ,r-polynom) ("r-purrr" ,r-purrr) ("r-scales" ,r-scales) ("r-tidyr" ,r-tidyr))) -- cgit v1.2.3 From 5dfe491290b14a1ee7efd70f9cd083969c24e1c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:46:12 +0200 Subject: gnu: r-graph: Move from bioinformatics to bioconductor. * gnu/packages/bioinformatics.scm (r-graph): Move from here... * gnu/packages/bioconductor.scm (r-graph): ...to here. --- gnu/packages/bioconductor.scm | 19 +++++++++++++++++++ gnu/packages/bioinformatics.scm | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1ff86779e8..fc01c2283b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -360,6 +360,25 @@ cutoffs. The procedures are directly applicable to identifying differentially expressed genes in DNA microarray experiments.") (license license:lgpl3))) +(define-public r-graph + (package + (name "r-graph") + (version "1.58.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "graph" version)) + (sha256 + (base32 + "1zx445lk36g1s6i5dbhhf00nzzazyklfjxxjfax6q8hnhvgm9759")))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics))) + (home-page "https://bioconductor.org/packages/graph") + (synopsis "Handle graph data structures in R") + (description + "This package implements some simple graph handling capabilities for R.") + (license license:artistic2.0))) + (define-public r-chippeakanno (package (name "r-chippeakanno") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 760b716408..a03d37c5b0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7787,25 +7787,6 @@ extracting the desired features in a convenient format.") information about the latest version of the Gene Ontologies.") (license license:artistic2.0))) -(define-public r-graph - (package - (name "r-graph") - (version "1.58.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "graph" version)) - (sha256 - (base32 - "1zx445lk36g1s6i5dbhhf00nzzazyklfjxxjfax6q8hnhvgm9759")))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics))) - (home-page "https://bioconductor.org/packages/graph") - (synopsis "Handle graph data structures in R") - (description - "This package implements some simple graph handling capabilities for R.") - (license license:artistic2.0))) - (define-public r-topgo (package (name "r-topgo") -- cgit v1.2.3 From a207bca2adf5371aabe41f28203c0e3e7bfbacad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:47:19 +0200 Subject: gnu: r-codedepends: Move from cran to bioconductor. * gnu/packages/cran.scm (r-codedepends): Move from here... * gnu/packages/bioconductor.scm (r-codedepends): ...to here. --- gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/cran.scm | 28 ---------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index fc01c2283b..a47a5aad05 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -379,6 +379,34 @@ expressed genes in DNA microarray experiments.") "This package implements some simple graph handling capabilities for R.") (license license:artistic2.0))) +(define-public r-codedepends + (package + (name "r-codedepends") + (version "0.6.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "CodeDepends" version)) + (sha256 + (base32 + "0l7kiv3awx50glf5cs841b4zzsff1ml90f0zr868ygvwsr4ps1hq")))) + (properties `((upstream-name . "CodeDepends"))) + (build-system r-build-system) + (propagated-inputs + `(("r-codetools" ,r-codetools) + ("r-graph" ,r-graph) + ("r-xml" ,r-xml))) + (home-page "http://cran.r-project.org/web/packages/CodeDepends") + (synopsis "Analysis of R code for reproducible research and code comprehension") + (description + "This package provides tools for analyzing R expressions or blocks of +code and determining the dependencies between them. It focuses on R scripts, +but can be used on the bodies of functions. There are many facilities +including the ability to summarize or get a high-level view of code, +determining dependencies between variables, code improvement suggestions.") + ;; Any version of the GPL + (license (list license:gpl2+ license:gpl3+)))) + (define-public r-chippeakanno (package (name "r-chippeakanno") diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9f3d1bfd09..447be5657a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4177,34 +4177,6 @@ to the cluster management tool @code{sfCluster}, but can also used without it.") (license license:gpl2+))) -(define-public r-codedepends - (package - (name "r-codedepends") - (version "0.6.5") - (source - (origin - (method url-fetch) - (uri (cran-uri "CodeDepends" version)) - (sha256 - (base32 - "0l7kiv3awx50glf5cs841b4zzsff1ml90f0zr868ygvwsr4ps1hq")))) - (properties `((upstream-name . "CodeDepends"))) - (build-system r-build-system) - (propagated-inputs - `(("r-codetools" ,r-codetools) - ("r-graph" ,r-graph) - ("r-xml" ,r-xml))) - (home-page "http://cran.r-project.org/web/packages/CodeDepends") - (synopsis "Analysis of R code for reproducible research and code comprehension") - (description - "This package provides tools for analyzing R expressions or blocks of -code and determining the dependencies between them. It focuses on R scripts, -but can be used on the bodies of functions. There are many facilities -including the ability to summarize or get a high-level view of code, -determining dependencies between variables, code improvement suggestions.") - ;; Any version of the GPL - (license (list license:gpl2+ license:gpl3+)))) - (define-public r-rappdirs (package (name "r-rappdirs") -- cgit v1.2.3 From c0608f815c4706ede4e7533409f3e7da127b767f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:49:33 +0200 Subject: gnu: r-adaptivesparsity: Update to 1.6. * gnu/packages/machine-learning.scm (r-adaptivesparsity): Update to 1.6. [propagated-inputs]: Add r-mass and r-matrix. --- gnu/packages/machine-learning.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index a86bdcb5ed..ec917e4442 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -560,13 +560,13 @@ I/O.") (define-public r-adaptivesparsity (package (name "r-adaptivesparsity") - (version "1.4") + (version "1.6") (source (origin (method url-fetch) (uri (cran-uri "AdaptiveSparsity" version)) (sha256 (base32 - "1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z")))) + "0imr5m8mll9j6n4icsv6z9rl5kbnwsp9wvzrg7n90nnmcxq2cz91")))) (properties `((upstream-name . "AdaptiveSparsity"))) (build-system r-build-system) @@ -579,7 +579,9 @@ I/O.") (("PKG_LIBS=" prefix) (string-append prefix "-larmadillo")))))))) (propagated-inputs - `(("r-rcpp" ,r-rcpp) + `(("r-mass" ,r-mass) + ("r-matrix" ,r-matrix) + ("r-rcpp" ,r-rcpp) ("r-rcpparmadillo" ,r-rcpparmadillo))) (inputs `(("armadillo" ,armadillo))) -- cgit v1.2.3 From c28d8d8db06e165faa168a8e197651d941bbb9ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:50:14 +0200 Subject: gnu: r-kernlab: Update to 0.9-27. * gnu/packages/machine-learning.scm (r-kernlab): Update to 0.9-27. --- gnu/packages/machine-learning.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index ec917e4442..7790e78779 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -596,14 +596,14 @@ geometric models.") (define-public r-kernlab (package (name "r-kernlab") - (version "0.9-26") + (version "0.9-27") (source (origin (method url-fetch) (uri (cran-uri "kernlab" version)) (sha256 (base32 - "0xv0slf3ggw3sswsi34416lb1g3h1pqkrr2h7r1n1kvgii3l0jcm")))) + "1m0xqf6gyvwayz7w3c83y32ayvnlz0jicj8ijk808zq9sh7dbbgn")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/kernlab") (synopsis "Kernel-based machine learning tools") -- cgit v1.2.3 From 8da236a377f4c0c6679334bcc76704d858ae088f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:50:43 +0200 Subject: gnu: r-gtools: Update to 3.8.1. * gnu/packages/statistics.scm (r-gtools): Update to 3.8.1. --- 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 69c72541a7..4fefdcd7f2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4091,14 +4091,14 @@ Zurich, including many that are related to graphics.") (define-public r-gtools (package (name "r-gtools") - (version "3.5.0") + (version "3.8.1") (source (origin (method url-fetch) (uri (cran-uri "gtools" version)) (sha256 (base32 - "1xknwk9xlsj027pg0nwiizigcrsc84hdrig0jn0cgcyxj8dabdl6")))) + "0f5syk1qq6cjq6hwymvkiyhzwa389z94722v881ipbfqkd2q8505")))) (build-system r-build-system) (arguments `(#:phases -- cgit v1.2.3 From f0519c8faec872b599debde5f2f91d6dbf57a5b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:50:59 +0200 Subject: gnu: r-zoo: Update to 1.8-3. * gnu/packages/statistics.scm (r-zoo): Update to 1.8-3. --- 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 4fefdcd7f2..eb4063c984 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4231,13 +4231,13 @@ mechanism.") (define-public r-zoo (package (name "r-zoo") - (version "1.8-2") + (version "1.8-3") (source (origin (method url-fetch) (uri (cran-uri "zoo" version)) (sha256 (base32 - "1lpwigxmi5sc23xrha4gcsccsm4yfsg0sa97y6vac3pg1lliblvx")))) + "15jmkgwvq2mm9f09vijgx7sff8pszh90fndcwhk2vw9i0p183di0")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From e5db6890adb1b842d4ad5dc3313a65f6628ec3bf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:51:15 +0200 Subject: gnu: r-ztable: Update to 0.2.0. * gnu/packages/statistics.scm (r-ztable): Update to 0.2.0. [propagated-inputs]: Add r-flextable, r-magrittr, r-moonbook, r-officer, r-rcolorbrewer, r-scales, and r-stringr. --- gnu/packages/statistics.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index eb4063c984..ccff5fc293 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4251,14 +4251,22 @@ series of numeric vectors/matrices and factors.") (define-public r-ztable (package (name "r-ztable") - (version "0.1.8") + (version "0.2.0") (source (origin (method url-fetch) (uri (cran-uri "ztable" version)) (sha256 (base32 - "1hk5k9614n52dpfrhdws06w4gvwhnz8q47x4cwxx88qmrzm8z2m3")))) + "0g7khk5ifsdh9p31wlwh2l5mn1hzxzpv6qcn1wh34vsfjdmijjwy")))) (build-system r-build-system) + (propagated-inputs + `(("r-flextable" ,r-flextable) + ("r-magrittr" ,r-magrittr) + ("r-moonbook" ,r-moonbook) + ("r-officer" ,r-officer) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-scales" ,r-scales) + ("r-stringr" ,r-stringr))) (home-page "https://cran.r-project.org/web/packages/ztable") (synopsis "Zebra-striped tables in LaTeX and HTML formats for R") (description -- cgit v1.2.3 From 314e8e763f9a2b3a3d5f98e8e435691f9dc01501 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:52:05 +0200 Subject: gnu: r-ggthemes: Update to 4.0.1. * gnu/packages/statistics.scm (r-ggthemes): Update to 4.0.1. [propagated-inputs]: Remove r-assertthat and r-colorspace; add r-purrr, r-stringr, and r-tibble. --- gnu/packages/statistics.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ccff5fc293..51a3c1fada 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4361,19 +4361,20 @@ data at that region, and avoids over-plotting.") (define-public r-ggthemes (package (name "r-ggthemes") - (version "3.5.0") + (version "4.0.1") (source (origin (method url-fetch) (uri (cran-uri "ggthemes" version)) (sha256 (base32 - "0drbzzb4i5jq1579fx1wmgh87ybnswjn7srak2l8g771ip49xwb8")))) + "0y6570wv135sf7pv57l7bqilzw47rziaqx4vsk45pf1w4lmj0w8b")))) (build-system r-build-system) (propagated-inputs - `(("r-assertthat" ,r-assertthat) - ("r-colorspace" ,r-colorspace) - ("r-ggplot2" ,r-ggplot2) - ("r-scales" ,r-scales))) + `(("r-ggplot2" ,r-ggplot2) + ("r-purrr" ,r-purrr) + ("r-scales" ,r-scales) + ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble))) (home-page "https://cran.rstudio.com/web/packages/ggthemes") (synopsis "Extra themes, scales and geoms for @code{ggplot2}") (description "This package provides extra themes and scales for -- cgit v1.2.3 From 8e499d756a4a7c5f875e023da2500536bdc10258 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:53:17 +0200 Subject: gnu: r-rann: Update to 2.6. * gnu/packages/statistics.scm (r-rann): Update to 2.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 51a3c1fada..d832003791 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4413,13 +4413,13 @@ dispersion modeling and Tweedie power-law families.") (define-public r-rann (package (name "r-rann") - (version "2.5.1") + (version "2.6") (source (origin (method url-fetch) (uri (cran-uri "RANN" version)) (sha256 (base32 - "0il5i99vbcagnxvb15af5n37g04a4q1x96bz73zh3jhki9fpw9vm")))) + "1r6rivh9ba4gwnzryip0aiwsbm46zma7nvd9z5y456p2dgzp9lii")))) (properties `((upstream-name . "RANN"))) (build-system r-build-system) -- cgit v1.2.3 From 0d279d607aeccc2365a4502db4c58ec247724bb4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:53:34 +0200 Subject: gnu: r-robustbase: Update to 0.93-2. * gnu/packages/statistics.scm (r-robustbase): Update to 0.93-2. --- 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 d832003791..07e180cf53 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4735,14 +4735,14 @@ can be efficiently implemented directly in the R language.") (define-public r-robustbase (package (name "r-robustbase") - (version "0.93-0") + (version "0.93-2") (source (origin (method url-fetch) (uri (cran-uri "robustbase" version)) (sha256 (base32 - "130pzibn5cb8mycv8byc6npzcpddghz8m7jqwk15qmx4g3cj8zgy")))) + "1632p73iv9iqqm0v3k9rfv9way0him3fl35si1nly9wi5kpq5ci7")))) (build-system r-build-system) (inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From f33a4748b7343a0f2ae3e560047b6eeca0f95235 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:53:52 +0200 Subject: gnu: r-modelmetrics: Update to 1.2.0. * gnu/packages/statistics.scm (r-modelmetrics): Update to 1.2.0. [propagated-inputs]: Add r-data-table. --- gnu/packages/statistics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 07e180cf53..ce7335619b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5011,18 +5011,19 @@ decompositions of such matrices, and solutions of linear systems.") (define-public r-modelmetrics (package (name "r-modelmetrics") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "ModelMetrics" version)) (sha256 (base32 - "119xxmzb5biq7k1yxqsf0jmmarmfn6lds9x9hfgv593xlpym6za8")))) + "1sgdyrf6fbsn18gk8slir4a1yhv133kfhyg2crfs759nff4aw89h")))) (properties `((upstream-name . "ModelMetrics"))) (build-system r-build-system) (propagated-inputs - `(("r-rcpp" ,r-rcpp))) + `(("r-rcpp" ,r-rcpp) + ("r-data-table" ,r-data-table))) (home-page "https://cran.r-project.org/web/packages/ModelMetrics") (synopsis "Rapid calculation of model metrics") (description -- cgit v1.2.3 From dff5640a59da533fc91fa285b6d7d7fec2f7e60a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:55:00 +0200 Subject: gnu: r-rcas: Use standard version of ghc-pandoc-citeproc. * gnu/packages/bioinformatics.scm (r-rcas)[native-inputs]: Replace "ghc-pandoc-citeproc-with-pandoc-1" with "ghc-pandoc-citeproc". --- gnu/packages/bioinformatics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a03d37c5b0..028643aeb4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8518,7 +8518,7 @@ paired-end data.") `(("r-testthat" ,r-testthat) ;; During vignette building knitr checks that "pandoc-citeproc" ;; is in the PATH. - ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1))) + ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc))) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) ("r-biomart" ,r-biomart) -- cgit v1.2.3 From ca248f1db90c2e7b01d734aaa51d330a29fe0937 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:55:56 +0200 Subject: gnu: pigx-rnaseq: Use latest version of Pandoc. * gnu/packages/bioinformatics.scm (pigx-rnaseq)[inputs]: Replace "ghc-pandoc-citeproc-with-pandoc-1" with "ghc-pandoc-citeproc", and "ghc-pandoc-1" with "ghc-pandoc". --- 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 028643aeb4..99313824e9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12830,8 +12830,8 @@ once. This package provides tools to perform Drop-seq analyses.") ("r-rtracklayer" ,r-rtracklayer) ("r-rjson" ,r-rjson) ("salmon" ,salmon) - ("ghc-pandoc" ,ghc-pandoc-1) - ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1) + ("ghc-pandoc" ,ghc-pandoc) + ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) ("python-wrapper" ,python-wrapper) ("python-pyyaml" ,python-pyyaml))) (home-page "http://bioinformatics.mdc-berlin.de/pigx/") -- cgit v1.2.3 From 7cd40c8c5dee1b323117ec85787566505be2d9ad Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:56:38 +0200 Subject: gnu: pigx-chipseq: Use latest version of Pandoc. * gnu/packages/bioinformatics.scm (pigx-chipseq)[inputs]: Replace "ghc-pandoc-citeproc-with-pandoc-1" with "ghc-pandoc-citeproc", and "ghc-pandoc-1" with "ghc-pandoc". --- 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 99313824e9..e1d953561b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12892,8 +12892,8 @@ expression report comparing samples in an easily configurable manner.") ("macs" ,macs) ("multiqc" ,multiqc) ("perl" ,perl) - ("ghc-pandoc" ,ghc-pandoc-1) - ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1) + ("ghc-pandoc" ,ghc-pandoc) + ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) ("fastqc" ,fastqc) ("bowtie" ,bowtie) ("idr" ,idr) -- cgit v1.2.3 From c2b4f81e51bab9a3ca6f2d1ba81ab1ff3b573ab4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:56:53 +0200 Subject: gnu: pigx-bsseq: Use latest version of Pandoc. * gnu/packages/bioinformatics.scm (pigx-bsseq)[inputs]: Replace "ghc-pandoc-citeproc-with-pandoc-1" with "ghc-pandoc-citeproc", and "ghc-pandoc-1" with "ghc-pandoc". --- 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 e1d953561b..7c25a71c6b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12954,8 +12954,8 @@ in an easily configurable manner.") ("r-bookdown" ,r-bookdown) ("r-ggplot2" ,r-ggplot2) ("r-ggbio" ,r-ggbio) - ("ghc-pandoc" ,ghc-pandoc-1) - ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1) + ("ghc-pandoc" ,ghc-pandoc) + ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) ("python-wrapper" ,python-wrapper) ("python-pyyaml" ,python-pyyaml) ("snakemake" ,snakemake-4) -- cgit v1.2.3 From 00a43cb81cecb30d40f9940407c9f1ba08d3d38e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 19:57:09 +0200 Subject: gnu: pigx-scrnaseq: Use latest version of Pandoc. * gnu/packages/bioinformatics.scm (pigx-scrnaseq)[inputs]: Replace "ghc-pandoc-citeproc-with-pandoc-1" with "ghc-pandoc-citeproc", and "ghc-pandoc-1" with "ghc-pandoc". --- 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 7c25a71c6b..92b6e7d50c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13005,8 +13005,8 @@ methylation and segmentation.") ("python-magic" ,python-magic) ("python-numpy" ,python-numpy) ("python-loompy" ,python-loompy) - ("ghc-pandoc" ,ghc-pandoc-1) - ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc-with-pandoc-1) + ("ghc-pandoc" ,ghc-pandoc) + ("ghc-pandoc-citeproc" ,ghc-pandoc-citeproc) ("samtools" ,samtools) ("snakemake" ,snakemake-4) ("star" ,star) -- cgit v1.2.3 From cb341c121919877ae6267a6460c0c17536d06eff Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Sep 2018 22:42:16 +0200 Subject: channels: Fix external channel builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a regression introduced in ca719424455465fca4b872c371daf2a46de88b33 whereby external channels would fail to build due to the lack of (gcrypt …) modules. * guix/channels.scm (channel-instance-derivations): Add 'guile-gcrypt'. Pass it along CORE to 'build-channel-instance'. --- guix/channels.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guix/channels.scm b/guix/channels.scm index 794383fe22..ebae7489f4 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -207,13 +207,18 @@ INSTANCES." (guix-channel? (channel-instance-channel instance))) instances)) + ;; Guile-Gcrypt is a dependency of CORE-INSTANCE. + (define guile-gcrypt + (module-ref (resolve-interface '(gnu packages gnupg)) + 'guile-gcrypt)) + (mlet %store-monad ((core (build-channel-instance core-instance))) (mapm %store-monad (lambda (instance) (if (eq? instance core-instance) (return core) (build-channel-instance instance - (list core)))) + (list core guile-gcrypt)))) instances))) (define (whole-package-for-legacy name modules) -- cgit v1.2.3 From 37a6cdbf1b3503d3e60840a176318284b1f7ca25 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 Sep 2018 23:31:51 +0200 Subject: git: Don't require users to specifiy "origin/" for branches. Fixes . Reported by Eric Brown . * guix/git.scm (update-cached-checkout): Remove "origin/" from default REF. Define CANONICAL-REF and use it instead of REF. (latest-repository-commit): Remove "origin/" from default REF. * guix/channels.scm (%default-channels): Remove "origin/" from 'branch'. --- guix/channels.scm | 2 +- guix/git.scm | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index ebae7489f4..cf833db8b9 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -78,7 +78,7 @@ ;; Default list of channels. (list (channel (name 'guix) - (branch "origin/master") + (branch "master") (url "https://git.savannah.gnu.org/git/guix.git")))) (define (guix-channel? channel) diff --git a/guix/git.scm b/guix/git.scm index c577eba5ee..3d0eb93d9b 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -112,7 +112,7 @@ OID (roughly the commit hash) corresponding to REF." (define* (update-cached-checkout url #:key - (ref '(branch . "origin/master")) + (ref '(branch . "master")) (cache-directory (url-cache-directory url (%repository-cache-directory)))) @@ -122,6 +122,17 @@ to REF. REF is pair whose key is [branch | commit | tag] and value the associated data, respectively [ | | ]." + (define canonical-ref + ;; We used to require callers to specify "origin/" for each branch, which + ;; made little sense since the cache should be transparent to them. So + ;; here we append "origin/" if it's missing and otherwise keep it. + (match ref + (('branch . branch) + `(branch . ,(if (string-prefix? "origin/" branch) + branch + (string-append "origin/" branch)))) + (_ ref))) + (with-libgit2 (let* ((cache-exists? (openable-repository? cache-directory)) (repository (if cache-exists? @@ -130,7 +141,7 @@ data, respectively [ | | ]." ;; Only fetch remote if it has not been cloned just before. (when cache-exists? (remote-fetch (remote-lookup repository "origin"))) - (let ((oid (switch-to-ref repository ref))) + (let ((oid (switch-to-ref repository canonical-ref))) ;; Reclaim file descriptors and memory mappings associated with ;; REPOSITORY as soon as possible. @@ -144,7 +155,7 @@ data, respectively [ | | ]." #:key (cache-directory (%repository-cache-directory)) - (ref '(branch . "origin/master"))) + (ref '(branch . "master"))) "Return two values: the content of the git repository at URL copied into a store directory and the sha1 of the top level commit in this directory. The reference to be checkout, once the repository is fetched, is specified by REF. -- cgit v1.2.3 From a5c70c2e0e91ede6061ba130c27e5fdedbcbf2d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 6 Sep 2018 02:29:48 +0200 Subject: gnu: libmpdclient: Update to 2.15. * gnu/packages/mpd.scm (libmpdclient): Update to 2.15. --- 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 2554ec9efd..5c82bf9ba1 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -56,7 +56,7 @@ (define-public libmpdclient (package (name "libmpdclient") - (version "2.14") + (version "2.15") (source (origin (method url-fetch) (uri @@ -65,7 +65,7 @@ "/libmpdclient-" version ".tar.xz")) (sha256 (base32 - "0whk0qw0lsd3kaimdznz0c45bfym0p4885zf4b7pfc7y3dwy510a")))) + "1la60ar6i4ghpscrlgm45kci9b74bvkpsfybhg0ygs4rzpwzdnxl")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From d83477adf92f18bd3a19b1ab2d22a0312bbaf294 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 6 Sep 2018 02:23:49 +0200 Subject: gnu: font-fira-code: Update to 1.205. * gnu/packages/fonts.scm (font-fira-code): Update to 1.205. --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 4d02b4bc62..ce07d3ad4c 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -887,7 +887,7 @@ designed to work well in user interface environments.") (define-public font-fira-code (package (name "font-fira-code") - (version "1.204") + (version "1.205") (source (origin (method url-fetch/zipbomb) (uri (string-append "https://github.com/tonsky/FiraCode/releases/" @@ -895,7 +895,7 @@ designed to work well in user interface environments.") "/FiraCode_" version ".zip")) (sha256 (base32 - "17wky221b3igrqhmxgmqiyv1xdfn0nw471vzhpkrvv1w2w1w1k18")))) + "13bxgf59g6fw5191xclcjzn22hj8jk9k5jjwf7vz07mpjbgadcl5")))) (build-system font-build-system) (home-page "https://mozilla.github.io/Fira/") (synopsis "Monospaced font with programming ligatures") -- cgit v1.2.3 From 79b283e433be171c7917fd5d9f10fa2185862a36 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 6 Sep 2018 02:21:26 +0200 Subject: gnu: ccache: Update to 3.4.3. * gnu/packages/ccache.scm (ccache): Update to 3.4.3. [arguments]: Remove obsolete 'munge-failing-test' phase. --- gnu/packages/ccache.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index af06b741a7..af29cee565 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -30,7 +30,7 @@ (define-public ccache (package (name "ccache") - (version "3.4.2") + (version "3.4.3") (source (origin (method url-fetch) @@ -38,7 +38,7 @@ version ".tar.xz")) (sha256 (base32 - "1qpy6k9f06kpr6bxy26ncdxcszqv1skcncvczcvksgfncx1v3a0q")))) + "0jjzq5340qw3jm5gkajjkkb5wd0yqqy1dyjw3mf3jy15cakmazi9")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) ; for test.sh ("which" ,(@ (gnu packages base) which)))) @@ -49,13 +49,6 @@ (lambda _ (substitute* '("unittest/test_hashutil.c" "test/suites/base.bash") (("#!/bin/sh") (string-append "#!" (which "sh")))) - #t)) - (add-before 'check 'munge-failing-test - (lambda _ - ;; XXX The new ‘Multiple -fdebug-prefix-map’ test added in - ;; 3.3.5 fails (why?). Force it to report success instead. - (substitute* "test/suites/debug_prefix_map.bash" - (("grep \"name\"") "true")) #t))))) (home-page "https://ccache.samba.org/") (synopsis "Compiler cache") -- cgit v1.2.3 From d53aeeafccb91fd03c6c540153720717eceb92a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Sep 2018 04:53:32 +0200 Subject: Add missing use-modules clause. This is a follow-up to commit 5dfe491290b14a1ee7efd70f9cd083969c24e1c2. Sorry! * gnu/packages/bioinformatics.scm, gnu/packages/graph.scm: Use (gnu packages bioconductor). --- gnu/packages/bioinformatics.scm | 1 + gnu/packages/graph.scm | 1 + 2 files changed, 2 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 92b6e7d50c..2d5ec6d170 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -51,6 +51,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages bioconductor) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 3b222d6ee8..245ee8f956 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -28,6 +28,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages gcc) + #:use-module (gnu packages bioconductor) #:use-module (gnu packages bioinformatics) #:use-module (gnu packages compression) #:use-module (gnu packages cran) -- cgit v1.2.3 From 96d6c41dfa5d69d4f25c8b53cb74e2ee621165d6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Sep 2018 10:43:01 +0200 Subject: gnu: guile-commonmark: Install .go files to libdir. * gnu/packages/guile.scm (guile-commonmark)[source](snippet): Change the "modir = " and "godir = " line separately, allowing .go files to be installed to $(libdir). --- gnu/packages/guile.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f594cd13ed..335bd6219f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1612,8 +1612,10 @@ you send to a FIFO file.") (("ac_subst_vars='") "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n")) (substitute* "Makefile.in" - (("/site/2.0") - "/site/@GUILE_EFFECTIVE_VERSION@")) + (("moddir =.*") + "moddir = $(datadir)/guile/site/@GUILE_EFFECTIVE_VERSION@\n") + (("godir =.*") + "godir = $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) #t)))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From b3ca2d8883f7aa5c8505e04427f2d892148f61e1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Sep 2018 10:46:07 +0200 Subject: gnu: hpcguix-web: Update to 9ff40fc. * gnu/packages/web.scm (hpcguix-web): Update to 9ff40fc. [arguments]: In 'wrap-program' phase, add guile-gcrypt, guile-git, and guile-bytestructures to DEPS. --- gnu/packages/web.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 918548513d..9567254424 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6708,10 +6708,11 @@ compressed JSON header blocks. (license l:expat))) (define-public hpcguix-web - (let ((commit "87cb51611c0f1fd3863b830614ab1364599cf1ca")) + (let ((commit "9ff40fcc77f248901d861756dbbddc80270c380c") + (revision "2")) (package (name "hpcguix-web") - (version (git-version "0.0.1" "1" commit)) + (version (git-version "0.0.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -6720,7 +6721,7 @@ compressed JSON header blocks. (file-name (git-file-name name version)) (sha256 (base32 - "0p66fl8r3v73v13fqg9rbqbzbdzvyznchxbq2s1jwq6qfsn2w3gr")))) + "0lxcj9s3wxrv1l7lrxxx374jwzx7h60gxwkbgr46lzcbgvb3k26s")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -6741,10 +6742,13 @@ compressed JSON header blocks. (let* ((out (assoc-ref outputs "out")) (guix (assoc-ref inputs "guix")) (guile (assoc-ref inputs "guile")) + (gcrypt (assoc-ref inputs "guile-gcrypt")) + (git (assoc-ref inputs "guile-git")) + (bs (assoc-ref inputs "guile-bytestructures")) (json (assoc-ref inputs "guile-json")) (guile-cm (assoc-ref inputs "guile-commonmark")) - (deps (list guile guile-cm guix json)) + (deps (list guile gcrypt git bs guile-cm guix json)) (effective (read-line (open-pipe* OPEN_READ -- cgit v1.2.3 From 89874fd15610bc35c586b38a0d575522140ff5b8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Sep 2018 10:48:44 +0200 Subject: gnu: guile-charting: Install .go files to libdir. * gnu/packages/plotutils.scm (guile-charting)[source](modules, snippet): Remove. --- gnu/packages/plotutils.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 0e65cb319f..2a330695c6 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2016, 2017 Nicolas Goaziou ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -93,15 +93,7 @@ scientific data.") "guile-charting-" version ".tar.gz")) (sha256 (base32 - "0w5qiyv9v0ip5li22x762bm48g8xnw281w66iyw094zdw611pb2m")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Use the standard location for modules. - (substitute* "Makefile.in" - (("godir = .*$") - "godir = $(moddir)\n")) - #t)))) + "0w5qiyv9v0ip5li22x762bm48g8xnw281w66iyw094zdw611pb2m")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.2))) -- cgit v1.2.3 From b290a631a0f9ee9a52095be66c843780dc0366f9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Sep 2018 10:49:42 +0200 Subject: gnu: guile-present: Install .go files to libdir. * gnu/packages/plotutils.scm (guile-present)[source](modules, snippet): Remove. --- gnu/packages/gtk.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6c43a3ab56..4daaad0ebc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -903,14 +903,7 @@ images onto Cairo surfaces.") (sha256 (base32 "1qam447m05sxxv6x8dlzg7qnyfc4dh8apjw1idpfhpns671gfr6m")) - (patches (search-patches "guile-present-coding.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "Makefile.in" - (("godir = .*$") - "godir = $(moddir)\n")) - #t)))) + (patches (search-patches "guile-present-coding.patch")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 888b64038db00c73467a05320c7c7f03070e5621 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Sep 2018 10:59:32 +0200 Subject: build: Remove -L flag when $LIBGCRYPT_LIBDIR is empty. Reported by Alex Vong . * config-daemon.ac: Do not add "-L$LIBGCRYPT_LIBDIR" to LIBGCRYPT_LIBS when "$LIBGCRYPT_LIBDIR" is empty. --- config-daemon.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-daemon.ac b/config-daemon.ac index 6cf65bef1d..04f0fde3b2 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -48,7 +48,7 @@ if test "x$guix_build_daemon" = "xyes"; then esac case "$LIBGCRYPT_LIBDIR" in - no) + no | "") LIBGCRYPT_LIBS="-lgcrypt" ;; *) -- cgit v1.2.3 From f66be84d08b90a9ecf08f79c8156d072ad359c36 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Sun, 2 Sep 2018 09:27:56 -0500 Subject: gnu: gfortran, gcc-objc, gcc-objc++: Add version 8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gcc.scm (gfortran-8, gcc-objc-8, gcc-objc++-8): New variables. Signed-off-by: Ludovic Courtès --- gnu/packages/gcc.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index bdff2ddada..0dd5d64464 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -663,6 +663,10 @@ as the 'native-search-paths' field." (custom-gcc gcc-7 "gfortran" '("fortran") %generic-search-paths)) +(define-public gfortran-8 + (custom-gcc gcc-8 "gfortran" '("fortran") + %generic-search-paths)) + (define-public gfortran ;; Note: Update this when GCC changes! We cannot use ;; (custom-gcc gcc "fortran" …) because that would lead to a package object @@ -723,6 +727,15 @@ as the 'native-search-paths' field." (variable "LIBRARY_PATH") (files '("lib" "lib64")))))) +(define-public gcc-objc-8 + (custom-gcc gcc-8 "gcc-objc" '("objc") + (list (search-path-specification + (variable "OBJC_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64")))))) + (define-public gcc-objc gcc-objc-5) (define-public gcc-objc++-4.8 @@ -770,6 +783,15 @@ as the 'native-search-paths' field." (variable "LIBRARY_PATH") (files '("lib" "lib64")))))) +(define-public gcc-objc++-8 + (custom-gcc gcc-8 "gcc-objc++" '("obj-c++") + (list (search-path-specification + (variable "OBJCPLUS_INCLUDE_PATH") + (files '("include"))) + (search-path-specification + (variable "LIBRARY_PATH") + (files '("lib" "lib64")))))) + (define-public gcc-objc++ gcc-objc++-5) (define (make-libstdc++-doc gcc) -- cgit v1.2.3 From 3ffcad7df3ab8947010814f61b32ce14ea80e780 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Sep 2018 11:55:36 +0200 Subject: build-self: Accomodate upgrades from May 2016 and earlier. Reported by Paul Garlick . Fixes a bug whereby "old" Guix instances (before mid-May 2018) would fail to pull to current master. Specifically, Paul reported being unable to upgrade from 6f84dc4314cd84550d9fc7e7afa11c495edc45a5 (a commit that predates that addition of the 'bootstrap' phase on gnu-build-system on 'master' and that also predates the new 'guix pull'.) * build-aux/build-self.scm (guile-gcrypt)[arguments]: New field. --- build-aux/build-self.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index f472724f18..f91b43987a 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -216,6 +216,16 @@ person's version identifier." "1gir7ifknbmbvjlql5j6wzk7bkb5lnmq80q59ngz43hhpclrk5k3")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) + (arguments + ;; The 'bootstrap' phase appeared in 'core-updates', which was merged + ;; into 'master' ca. June 2018. + '(#:phases (modify-phases %standard-phases + (delete 'bootstrap) + (add-before 'configure 'bootstrap + (lambda _ + (unless (zero? (system* "autoreconf" "-vfi")) + (error "autoreconf failed")) + #t))))) (native-inputs `(("pkg-config" ,(specification->package "pkg-config")) ("autoconf" ,(specification->package "autoconf")) -- cgit v1.2.3 From 7df945656cd448b13969f90a7a95d8a4e9d442f7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Sep 2018 13:49:06 +0200 Subject: services: hpcguix-web: Set SSL_CERT_DIR. Previously Git pulls over HTTPS would fail with: guix/git.scm:132:7: In procedure update-cached-checkout: Throw to key `git-error' with args `(#< code: -17 message: "the SSL certificate is invalid" class: 16>)'. * gnu/services/web.scm (hpcguix-web-shepherd-service): Pass "SSL_CERT_DIR=/etc/ssl/certs". * doc/guix.texi (Web Services): Mention certificates. --- doc/guix.texi | 11 +++++++++++ gnu/services/web.scm | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 9375aac30c..c328af40cd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -16848,6 +16848,17 @@ A typical hpcguix-web service declaration looks like this: (menu '(("/about" "ABOUT")))))))) @end example +@quotation Note +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. + +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. +@end quotation + @node Certificate Services @subsubsection Certificate Services diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 467656444e..3778efd048 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -967,7 +967,8 @@ a webserver.") #:user "hpcguix-web" #:group "hpcguix-web" #:environment-variables - (list "XDG_CACHE_HOME=/var/cache"))) + (list "XDG_CACHE_HOME=/var/cache" + "SSL_CERT_DIR=/etc/ssl/certs"))) (stop #~(make-kill-destructor)))))) (define hpcguix-web-service-type -- cgit v1.2.3 From fd3a64335da5a591dbe9276395d0ad6bb09f00bb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Sep 2018 13:53:04 +0200 Subject: doc: Update hpcguix-web configuration documentation. * doc/guix.texi (Web Services): Document 'channels' and 'package-list-expiration'. --- doc/guix.texi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index c328af40cd..2c5b01e4a8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -16825,6 +16825,13 @@ Extension package for @code{hpcguix-web}. @item @code{menu} (default: @code{'()}) Additional entry in page @code{menu}. + +@item @code{channels} (default: @code{%default-channels}) +List of channels from which the package list is built (@pxref{Channels}). + +@item @code{package-list-expiration} (default: @code{(* 12 3600)}) +The expiration time, in seconds, after which the package list is rebuilt from +the latest instances of the given channels. @end table See the hpcguix-web repository for a -- cgit v1.2.3 From 21f5f351fb4a21a8051cdb2b747fef57aa2fa8d4 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 6 Sep 2018 10:55:21 -0400 Subject: gnu: libgme: Update to 0.6.2. * gnu/packages/music.scm (libgme): Update to 0.6.2. [native-inputs]: Add gcc-4.9. --- gnu/packages/music.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ba21e5da2b..e39478e794 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -786,18 +786,23 @@ interface. It is implemented as a frontend to @code{klick}.") (define-public libgme (package (name "libgme") - (version "0.6.1") + (version "0.6.2") (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/mpyne/game-music-emu/" "downloads/game-music-emu-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw")))) + "0hkkmxbaas2sirlb5i4r10mgbbiaapjx8pazifabwba23m3wnijh")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no check target + (native-inputs + `(;; Use gcc-4.9 to work around an internal compiler error that happens + ;; when using gcc-5.5.0. FIXME: Try removing this when the default + ;; compiler is no longer gcc-5.5.0. + ("gcc" ,gcc-4.9))) (home-page "https://bitbucket.org/mpyne/game-music-emu") (synopsis "Video game music file playback library") (description -- cgit v1.2.3 From 1e066f070611b64d24af4544efe8075bb1999d30 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 6 Sep 2018 16:43:10 -0400 Subject: gnu: curl: Update replacement to 7.61.1 [fixes CVE-2018-14618]. * gnu/packages/curl.scm (curl)[replacement]: Update to 7.61.1. (curl-7.61.0): Replace variable with ... (curl-7.61.1): ... new variable. --- gnu/packages/curl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 1907d2dc3d..6d45dc0cc5 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -51,7 +51,7 @@ (package (name "curl") (version "7.59.0") - (replacement curl-7.61.0) + (replacement curl-7.61.1) (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" @@ -141,10 +141,10 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.61.0 +(define-public curl-7.61.1 (package (inherit curl) - (version "7.61.0") + (version "7.61.1") (source (origin (method url-fetch) @@ -152,7 +152,7 @@ tunneling, and so on.") version ".tar.xz")) (sha256 (base32 - "080p9r2kln8cbfj0rqfn6wqp5kdn9k5wp720nirkcw845lcmavpg")))))) + "148qv1f32290r9pwg07mccawihz4srznkzsdwdl2xllvlgb16n9x")))))) (define-public kurly (package -- cgit v1.2.3 From 91cc2a38ded0f9a637c37d83d72fa514a13fe6bd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 6 Sep 2018 16:46:08 -0400 Subject: gnu: Wireshark: Update to 2.6.3 [fixes CVE-2018-{14994,16056,16057,16058}]. * gnu/packages/networking.scm (wireshark): Update to 2.6.3. --- 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 61c0ad7fba..acf523d366 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -580,7 +580,7 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "2.6.2") + (version "2.6.3") (source (origin (method url-fetch) @@ -588,7 +588,7 @@ of the same name.") version ".tar.xz")) (sha256 (base32 - "153h6prxamv5a62f3pfadkry0y57696xrgxfy2gfy5xswdg8kcj9")))) + "1v538h02y8avwy3cr11xz6wkyf9xd8qva4ng4sl9f2fw4skahn6i")))) (build-system gnu-build-system) (inputs `(("c-ares" ,c-ares) ("glib" ,glib) -- cgit v1.2.3 From 0012e0dd5642fbbb8ee40a68f65afc184952fc98 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 7 Sep 2018 02:57:28 +0200 Subject: gnu: knot: Update to 2.7.2. * gnu/packages/dns.scm (knot): Update to 2.7.2. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 7a80e1bd9b..29c3d9b923 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -498,14 +498,14 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "2.7.1") + (version "2.7.2") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" name "-" version ".tar.xz")) (sha256 (base32 - "108k6x3hjsnyf06pv5rlxqhynjbbz13pzwax1mqff3hgv85f4skx")) + "0cc4wgb02ch09x99a1fnr7vsdik8k920q7jafzcamjvy3kpb4w6b")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From b03f270e3d5ab5315b50ef3ebac35735cc28d4a2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Aug 2018 17:22:41 +0200 Subject: gnu: guile: Remove "share/guile/site" from GUILE_LOAD_COMPILED_PATH. .go files should always go to lib/guile/2.x/site-ccache, and in practice, we no longer have packages that don't do that. * gnu/packages/guile.scm (guile-2.2)[native-search-paths]: Remove "share/guile/site/2.2" from GUILE_LOAD_COMPILED_PATH spec. (guile-2.0)[native-search-paths]: Likewise. --- gnu/packages/guile.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 5c9f4d499c..8c561b0210 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -212,8 +212,7 @@ without requiring the source code to be rewritten.") (files '("share/guile/site/2.0"))) (search-path-specification (variable "GUILE_LOAD_COMPILED_PATH") - (files '("lib/guile/2.0/site-ccache" - "share/guile/site/2.0"))))) + (files '("lib/guile/2.0/site-ccache"))))) (synopsis "Scheme implementation intended especially for extensions") (description @@ -257,8 +256,7 @@ without requiring the source code to be rewritten.") (files '("share/guile/site/2.2"))) (search-path-specification (variable "GUILE_LOAD_COMPILED_PATH") - (files '("lib/guile/2.2/site-ccache" - "share/guile/site/2.2"))))) + (files '("lib/guile/2.2/site-ccache"))))) (arguments (if (%current-target-system) -- cgit v1.2.3 From 1540075c790dfaeff52c93392f2fc63b9e23b77e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Sep 2018 09:50:26 +0200 Subject: vm: Make UUID computation really deterministic. Fixes . * gnu/system/vm.scm (operating-system-uuid)[service-name, file-system-digest]: New procedures. Map these over services and file systems and hash the result. * tests/guix-system.sh: Add test. --- gnu/system/vm.scm | 33 +++++++++++++++++++++++++++++---- tests/guix-system.sh | 8 ++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 3898872a46..91e117b9f3 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -529,17 +529,42 @@ should set REGISTER-CLOSURES? to #f." (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) + (cond ((file-system-label? device) + (file-system-label->string device)) + ((uuid? device) + (uuid->string device)) + ((string? device) + device) + (else #f)) + (file-system-options fs)))) + (if (eq? type 'iso9660) (let ((pad (compose (cut string-pad <> 2 #\0) number->string)) - (h (hash (operating-system-services os) 3600))) + (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 (operating-system-file-systems os) 100)))) + (pad (hash (map file-system-digest + (operating-system-file-systems os)) + 100)))) 'iso9660)) (bytevector->uuid (uint-list->bytevector @@ -547,9 +572,9 @@ TYPE (one of 'iso9660 or 'dce). Return a UUID object." (- (expt 2 32) 1)) (hash (operating-system-host-name os) (- (expt 2 32) 1)) - (hash (operating-system-services os) + (hash (map service-name (operating-system-services os)) (- (expt 2 32) 1)) - (hash (operating-system-file-systems os) + (hash (map file-system-digest (operating-system-file-systems os)) (- (expt 2 32) 1))) (endianness little) 4) diff --git a/tests/guix-system.sh b/tests/guix-system.sh index 36ba5fbd5f..a129efdfcb 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -232,6 +232,14 @@ guix system build "$tmpfile" -d | grep '\.drv$' guix system vm "$tmpfile" -d # succeeds guix system vm "$tmpfile" -d | grep '\.drv$' +# Make sure the behavior is deterministic (). +drv1="`guix system vm "$tmpfile" -d`" +drv2="`guix system vm "$tmpfile" -d`" +test "$drv1" = "$drv2" +drv1="`guix system disk-image --file-system-type=iso9660 "$tmpfile" -d`" +drv2="`guix system disk-image --file-system-type=iso9660 "$tmpfile" -d`" +test "$drv1" = "$drv2" + make_user_config "group-that-does-not-exist" "users" if guix system build "$tmpfile" -n 2> "$errorfile" then false -- cgit v1.2.3 From 12498b59e76c0285f0d9babb0107e8e82855aa60 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Thu, 6 Sep 2018 18:35:36 +0200 Subject: gnu: emacs-ess: Update to 17.11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-ess): Update to 17.11 [url]: Use github for https [snippet]: update julia-mode substitution, only build info doc, bypass failing test [propagated-inputs]: Add emacs-julia-mode [description]: Mention that ESS supports Julia and JAGS (which replaces OpenBUGS) [arguments]: Remove 'set-home' phase. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 957b72f4e7..1f64a5e84a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Jack Hill ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2018 Alex Branham ;;; ;;; This file is part of GNU Guix. ;;; @@ -4123,22 +4124,34 @@ programming language.") (define-public emacs-ess (package (name "emacs-ess") - (version "16.10") + (version "17.11") (source (origin (method url-fetch) - (uri (string-append "http://ess.r-project.org/downloads/ess/ess-" - version ".tgz")) + (uri (string-append "https://github.com/emacs-ess/ESS/archive/v" + version ".tar.gz")) (sha256 (base32 - "04m8lwp3ylh2vl7k2bjjs7mxbm64j4sdckqpvnm9k0qhaqf02pjk")) + "0cbilbsiwvcyf6d5y24mymp57m3ana5dkzab3knfs83w4a3a4c5c")) + (file-name (string-append name "-" version ".tar.gz")) (modules '((guix build utils))) (snippet '(begin ;; Stop ESS from trying to bundle an external julia-mode.el. (substitute* "lisp/Makefile" (("^\tjulia-mode.elc\\\\\n") "") - (("^all: \\$\\(ELC\\) ess-custom.el julia-mode.el") - "all: $(ELC) ess-custom.el")) + (("^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. + (substitute* "doc/Makefile" + (("all : info text html pdf") + "all : info") + (("install: install-info install-other-docs") + "install: install-info")) + ;; Test fails upstream + (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")) #t)))) (build-system gnu-build-system) (arguments @@ -4157,10 +4170,6 @@ programming language.") (("SHELL = /bin/sh") (string-append "SHELL = " (which "sh")))) #t)) - ;; FIXME: the texlive-union insists on regenerating fonts. It stores - ;; them in HOME, so it needs to be writeable. - (add-before 'build 'set-HOME - (lambda _ (setenv "HOME" "/tmp") #t)) (replace 'check (lambda _ (invoke "make" "test"))))))) @@ -4169,16 +4178,14 @@ programming language.") ("r-minimal" ,r-minimal))) (native-inputs `(("perl" ,perl) - ("texinfo" ,texinfo) - ("texlive" ,(texlive-union (list texlive-latex-natbib - texlive-latex-seminar - texlive-latex-hyperref - texlive-tex-texinfo))))) + ("texinfo" ,texinfo))) + (propagated-inputs + `(("emacs-julia-mode" ,emacs-julia-mode))) (home-page "https://ess.r-project.org/") (synopsis "Emacs mode for statistical analysis programs") (description "Emacs Speaks Statistics (ESS) is an add-on package for GNU Emacs. It is designed to support editing of scripts and interaction with -various statistical analysis programs such as R and OpenBUGS.") +various statistical analysis programs such as R, Julia, and JAGS.") (license license:gpl2+))) (define-public emacs-smex -- cgit v1.2.3 From 40c10917bc3b8df853001c193da882d643db1bd1 Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 09:24:34 +0200 Subject: gnu: Add r-abcp2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-abcp2): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 447be5657a..c713a9904b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5411,3 +5411,24 @@ maximum cycle number. The @code{r-abcoptim} implements the Artificial bee colony optimization algorithm @url{http://mf.erciyes.edu.tr/abc/pub/tr06_2005.pdf}. This version is a work-in-progress and is written in R code.") (license license:expat))) + +(define-public r-abcp2 + (package + (name "r-abcp2") + (version "1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "ABCp2" version)) + (sha256 + (base32 "1s2skkxpzss7c29i8600psgrp0hl46jcrxqrmy2b4db8hc0kcnbx")))) + (properties `((upstream-name . "ABCp2"))) + (build-system r-build-system) + (propagated-inputs `(("r-mass" ,r-mass))) + (home-page "https://cran.r-project.org/web/packages/ABCp2/") + (synopsis "Approximate Bayesian Computational Model for Estimating P2") + (description + "This package tests the goodness of fit of a distribution of offspring to the Normal, +Poisson, and Gamma distribution and estimates the proportional paternity of the +second male (P2) based on the best fit distribution.") + (license license:gpl2))) -- cgit v1.2.3 From cadc10a513af2624c9233fb2cffb4c4ff5471197 Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 09:32:45 +0200 Subject: gnu: Add r-abcrf. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-abcrf): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c713a9904b..93c111bccc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5432,3 +5432,31 @@ colony optimization algorithm @url{http://mf.erciyes.edu.tr/abc/pub/tr06_2005.pd Poisson, and Gamma distribution and estimates the proportional paternity of the second male (P2) based on the best fit distribution.") (license license:gpl2))) + +(define-public r-abcrf + (package + (name "r-abcrf") + (version "1.7.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "abcrf" version)) + (sha256 + (base32 "06vy3inikrr9hv36q4djhrgzi9zizdfnhz17wpra8kadmr7qj441")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mass" ,r-mass) + ("r-matrixstats" ,r-matrixstats) + ("r-ranger" ,r-ranger) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-readr" ,r-readr) + ("r-stringr" ,r-stringr))) + (home-page "https://cran.r-project.org/web/packages/abcrf/") + (synopsis "Approximate bayesian computation via random forests") + (description + "This package performs approximate bayesian computation (ABC) model choice and +parameter inference via random forests. This machine learning tool named random +forests (RF) can conduct selection among the highly complex models covered by +ABC algorithms.") + (license license:gpl2+))) -- cgit v1.2.3 From 12da2a5e58c6f518892376df5e1af4a511f12e6b Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 09:39:17 +0200 Subject: gnu: Add r-abctools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-abctools): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 93c111bccc..aa58efce7c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5460,3 +5460,28 @@ parameter inference via random forests. This machine learning tool named random forests (RF) can conduct selection among the highly complex models covered by ABC algorithms.") (license license:gpl2+))) + +(define-public r-abctools + (package + (name "r-abctools") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "abctools" version)) + (sha256 + (base32 "07s9dg10i8lsxl73b4n2hynca2fjgb0ykb0dz8c3zv6cgw3cyx97")))) + (build-system r-build-system) + (propagated-inputs + `(("r-abc" ,r-abc) + ("r-abind" ,r-abind) + ("r-hmisc" ,r-hmisc) + ("r-plyr" ,r-plyr))) + (home-page "https://github.com/dennisprangle/abctools/") + (synopsis "Tools for ABC analyses") + (description + "This @code{r-abctools} package provides tools for approximate Bayesian computation +including summary statistic selection and assessing coverage. This includes +recent dimension reduction algorithms to tune the choice of summary statistics, +and coverage methods to tune the choice of threshold.") + (license license:gpl2+))) -- cgit v1.2.3 From 77b33e0ede4bd015d863f0b1f63f492c62fb1943 Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 10:09:12 +0200 Subject: gnu: Add r-ggstance. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gnu/packages/cran.scm (r-ggstance): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index aa58efce7c..8026f99736 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5485,3 +5485,29 @@ including summary statistic selection and assessing coverage. This includes recent dimension reduction algorithms to tune the choice of summary statistics, and coverage methods to tune the choice of threshold.") (license license:gpl2+))) + +(define-public r-ggstance + (package + (name "r-ggstance") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "ggstance" version)) + (sha256 + (base32 "0v7f3xdaaridw6d4jvnsfwxmpjrasvx5vl555wsrn50aah17fkvh")))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-plyr" ,r-plyr) + ("r-rlang" ,r-rlang) + ("r-withr" ,r-withr))) + (home-page "https://cran.r-project.org/web/packages/ggstance/") + (synopsis "Horizontal and vertical versions of @code{r-ggplot2}") + (description + "This package is a @code{r-ggplot2} extension that provides flipped components: +@enumerate +@item horizontal versions of @code{r-ggplot2} stats and @code{r-ggplot2} geoms; +@item vertical versions of @code{r-ggplot2} positions. +@end enumerate") + (license license:gpl3))) -- cgit v1.2.3 From c61f7bc543d98781d9c24989edbfde39af7e7320 Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 10:16:11 +0200 Subject: gnu: Add r-mosaiccore. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-mosaiccore): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8026f99736..3be7fd7d62 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5511,3 +5511,27 @@ and coverage methods to tune the choice of threshold.") @item vertical versions of @code{r-ggplot2} positions. @end enumerate") (license license:gpl3))) + +(define-public r-mosaiccore + (package + (name "r-mosaiccore") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "mosaicCore" version)) + (sha256 + (base32 "1klw97h6lchw1cpcl8s637ikcl428cckmjq0czi7mibh9q9mw72z")))) + (properties `((upstream-name . "mosaicCore"))) + (build-system r-build-system) + (propagated-inputs + `(("r-dplyr" ,r-dplyr) + ("r-lazyeval" ,r-lazyeval) + ("r-mass" ,r-mass) + ("r-rlang" ,r-rlang) + ("r-tidyr" ,r-tidyr))) + (home-page "https://github.com/ProjectMOSAIC/mosaicCore/") + (synopsis "Common utilities for mosaic family packages") + (description + "Common utilities used in other Mosaic family packages are collected here.") + (license license:gpl2+))) -- cgit v1.2.3 From 214452ffd339491f63560d19d2aeab4e668029a4 Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 10:19:55 +0200 Subject: gnu: Add r-ggformula. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-ggformula): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3be7fd7d62..8144391729 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5535,3 +5535,32 @@ and coverage methods to tune the choice of threshold.") (description "Common utilities used in other Mosaic family packages are collected here.") (license license:gpl2+))) + +(define-public r-ggformula + (package + (name "r-ggformula") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "ggformula" version)) + (sha256 + (base32 "1pmpdfjfbrc6kcpq70cr1kbj2qy711hw940g2aiis6l443z706kh")))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-ggstance" ,r-ggstance) + ("r-magrittr" ,r-magrittr) + ("r-mosaiccore" ,r-mosaiccore) + ("r-rlang" ,r-rlang) + ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr))) + (home-page "https://github.com/ProjectMOSAIC/ggformula/") + (synopsis "Formula interface for the @code{r-ggplot2}") + (description + "The @code{r-ggformula} introduces a family of graphics functions, gf_point(), +gf_density(), and so on, bring the formula interface to ggplot(). This captures +and extends the excellent simplicity of the lattice-graphics formula interface, +while providing the intuitive capabilities of @code{r-ggplot2}.") + (license license:expat))) -- cgit v1.2.3 From ee94cfeb99a7e3879c92ca21318960077ce4100e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 3 Sep 2018 12:46:40 +0200 Subject: pull: Add '--profile'. * guix/scripts/pull.scm (show-help, %options): Add '--profile'. (build-and-install): Change 'config-dir' argument to 'profile'. (guix-pull): Honor '--profile'. * doc/guix.texi (Invoking guix pull): Document it. --- doc/guix.texi | 4 ++++ guix/scripts/pull.scm | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 2c5b01e4a8..30f1be2ab8 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2851,6 +2851,10 @@ 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}). +@item --profile=@var{profile} +@itemx -p @var{profile} +Use @var{profile} instead of @file{~/.config/guix/current}. + @item --bootstrap Use the bootstrap Guile to build the latest Guix. This option is only useful to Guix developers. diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 18c04f05dd..ebc5dc9b13 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -79,6 +79,8 @@ Download and deploy the latest version of Guix.\n")) (display (G_ " -l, --list-generations[=PATTERN] list generations matching PATTERN")) + (display (G_ " + -p, --profile=PROFILE use PROFILE instead of ~/.config/guix/current")) (display (G_ " --bootstrap use the bootstrap Guile to build the new Guix")) (newline) @@ -113,6 +115,10 @@ Download and deploy the latest version of Guix.\n")) (lambda (opt name arg result) (alist-cons 'ref `(branch . ,(string-append "origin/" arg)) result))) + (option '(#\p "profile") #t #f + (lambda (opt name arg result) + (alist-cons 'profile (canonicalize-profile arg) + result))) (option '(#\n "dry-run") #f #f (lambda (opt name arg result) (alist-cons 'dry-run? #t (alist-cons 'graft? #f result)))) @@ -152,15 +158,12 @@ Download and deploy the latest version of Guix.\n")) #:heading (G_ "New in this revision:\n")))) (_ #t))) -(define* (build-and-install instances config-dir +(define* (build-and-install instances profile #:key verbose?) - "Build the tool from SOURCE, and install it in CONFIG-DIR." + "Build the tool from SOURCE, and install it in PROFILE." (define update-profile (store-lift build-and-use-profile)) - (define profile - (string-append config-dir "/current")) - (mlet %store-monad ((manifest (channel-instances->manifest instances))) (mbegin %store-monad (update-profile profile manifest) @@ -414,7 +417,9 @@ Use '~/.config/guix/channels.scm' instead.")) (let* ((opts (parse-command-line args %options (list %default-options))) (cache (string-append (cache-directory) "/pull")) - (channels (channel-list opts))) + (channels (channel-list opts)) + (profile (or (assoc-ref opts 'profile) + (string-append (config-directory) "/current")))) (cond ((assoc-ref opts 'query) (process-query opts)) @@ -456,7 +461,7 @@ Use '~/.config/guix/channels.scm' instead.")) %bootstrap-guile (canonical-package guile-2.2))))) (run-with-store store - (build-and-install instances (config-directory) + (build-and-install instances profile #:verbose? (assoc-ref opts 'verbose?))))))))))))) -- cgit v1.2.3 From bd7470185bae15e686c2b2a83d3f61807e6fa527 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 3 Sep 2018 15:03:33 +0200 Subject: Add 'guix describe'. * guix/scripts/describe.scm: New file. * Makefile.am (MODULES): Add it. (SH_TESTS): Add tests/guix-describe.sh. * po/guix/POTFILES.in: Add it. * guix/scripts/pull.scm (display-profile-content): Export. * guix/describe.scm (current-profile, current-profile-entries): Export. * tests/guix-describe.sh: New file. * doc/guix.texi (Features): Mention 'guix pull' and provenance tracking. (Invoking guix pull): Link to 'guix describe'. (Channels): Likewise. (Invoking guix describe): New node. --- Makefile.am | 2 + doc/guix.texi | 94 ++++++++++++++++++++++++++- guix/describe.scm | 4 +- guix/scripts/describe.scm | 160 ++++++++++++++++++++++++++++++++++++++++++++++ guix/scripts/pull.scm | 3 +- po/guix/POTFILES.in | 1 + tests/guix-describe.sh | 47 ++++++++++++++ 7 files changed, 308 insertions(+), 3 deletions(-) create mode 100644 guix/scripts/describe.scm create mode 100644 tests/guix-describe.sh diff --git a/Makefile.am b/Makefile.am index a3498460e0..5c8639d665 100644 --- a/Makefile.am +++ b/Makefile.am @@ -204,6 +204,7 @@ MODULES = \ guix/scripts/authenticate.scm \ guix/scripts/refresh.scm \ guix/scripts/repl.scm \ + guix/scripts/describe.scm \ guix/scripts/system.scm \ guix/scripts/system/search.scm \ guix/scripts/lint.scm \ @@ -409,6 +410,7 @@ SH_TESTS = \ tests/guix-environment.sh \ tests/guix-environment-container.sh \ tests/guix-graph.sh \ + tests/guix-describe.sh \ tests/guix-lint.sh TESTS = $(SCM_TESTS) $(SH_TESTS) diff --git a/doc/guix.texi b/doc/guix.texi index 30f1be2ab8..19a497c746 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -147,6 +147,7 @@ Package Management * Invoking guix gc:: Running the garbage collector. * Invoking guix pull:: Fetching the latest Guix and distribution. * Channels:: Customizing the package collection. +* Invoking guix describe:: Display information about your Guix revision. * Invoking guix pack:: Creating software bundles. * Invoking guix archive:: Exporting and importing store files. @@ -1698,6 +1699,7 @@ guix package -i emacs-guix * Invoking guix gc:: Running the garbage collector. * Invoking guix pull:: Fetching the latest Guix and distribution. * Channels:: Customizing the package collection. +* Invoking guix describe:: Display information about your Guix revision. * Invoking guix pack:: Creating software bundles. * Invoking guix archive:: Exporting and importing store files. @end menu @@ -1751,7 +1753,7 @@ collected. @cindex reproducibility @cindex reproducible builds -Finally, Guix takes a @dfn{purely functional} approach to package +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 @@ -1779,6 +1781,15 @@ 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}). +@cindex replication, of software environments +@cindex provenance tracking, of software artifacts +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. + @node Invoking guix package @section Invoking @command{guix package} @@ -2806,6 +2817,9 @@ Generation 3 Jun 13 2018 23:31:07 (current) 69 packages upgraded: borg@@1.1.6, cheese@@3.28.0, @dots{} @end example +@ref{Invoking guix describe, @command{guix describe}}, for other ways to +describe the current status of Guix. + 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 @@ -2851,6 +2865,9 @@ 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}). +@ref{Invoking guix describe}, for a way to display information about the +current generation only. + @item --profile=@var{profile} @itemx -p @var{profile} Use @var{profile} instead of @file{~/.config/guix/current}. @@ -3023,6 +3040,9 @@ say, on another machine, by providing a channel specification in (branch "dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb"))) @end lisp +The @command{guix describe --format=channels} command can even generate this +list of channels directly (@pxref{Invoking guix describe}). + 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 @@ -3034,6 +3054,78 @@ 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. +@node Invoking guix describe +@section Invoking @command{guix describe} + +@cindex reproducibility +@cindex replicating Guix +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. + +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}): + +@example +$ guix describe +Generation 10 Sep 03 2018 17:32:44 (current) + guix e0fa68c + repository URL: https://git.savannah.gnu.org/git/guix.git + branch: master + commit: e0fa68c7718fffd33d81af415279d6ddb518f727 +@end example + +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. + +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: + +@example +$ guix describe -f channels +(list (channel + (name 'guix) + (url "https://git.savannah.gnu.org/git/guix.git") + (commit + "e0fa68c7718fffd33d81af415279d6ddb518f727"))) +@end example + +@noindent +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! + +The details of the options supported by @command{guix describe} are as +follows: + +@table @code +@item --format=@var{format} +@itemx -f @var{format} +Produce output in the specified @var{format}, one of: + +@table @code +@item human +produce human-readable output; +@item channels +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}). +@end table +@end table + @node Invoking guix pack @section Invoking @command{guix pack} diff --git a/guix/describe.scm b/guix/describe.scm index 3122a762fe..670db63ce7 100644 --- a/guix/describe.scm +++ b/guix/describe.scm @@ -21,7 +21,9 @@ #:use-module (guix profiles) #:use-module (srfi srfi-1) #:use-module (ice-9 match) - #:export (package-path-entries)) + #:export (current-profile + current-profile-entries + package-path-entries)) ;;; Commentary: ;;; diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm new file mode 100644 index 0000000000..46feea2940 --- /dev/null +++ b/guix/scripts/describe.scm @@ -0,0 +1,160 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 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 (guix scripts describe) + #:use-module ((guix ui) #:hide (display-profile-content)) + #:use-module (guix scripts) + #:use-module (guix describe) + #:use-module (guix profiles) + #:use-module ((guix scripts pull) #:select (display-profile-content)) + #:use-module (git) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-37) + #:use-module (ice-9 match) + #:autoload (ice-9 pretty-print) (pretty-print) + #:export (guix-describe)) + + +;;; +;;; Command-line options. +;;; + +(define %options + ;; Specifications of the command-line options. + (list (option '(#\f "format") #t #f + (lambda (opt name arg result) + (unless (member arg '("human" "channels")) + (leave (G_ "~a: unsupported output format~%") arg)) + (alist-cons 'format 'channels result))) + (option '(#\h "help") #f #f + (lambda args + (show-help) + (exit 0))) + (option '(#\V "version") #f #f + (lambda args + (show-version-and-exit "guix describe"))))) + +(define %default-options + ;; Alist of default option values. + '((format . human))) + +(define (show-help) + (display (G_ "Usage: guix describe [OPTION]... +Display information about the channels currently in use.\n")) + (display (G_ " + -f, --format=FORMAT display information in the given FORMAT")) + (newline) + (display (G_ " + -h, --help display this help and exit")) + (display (G_ " + -V, --version display version information and exit")) + (newline) + (show-bug-report-information)) + +(define (display-package-search-path fmt) + "Display GUIX_PACKAGE_PATH, if it is set, according to FMT." + (match (getenv "GUIX_PACKAGE_PATH") + (#f #t) + (string + (match fmt + ('human + (format #t "~%GUIX_PACKAGE_PATH=\"~a\"~%" string)) + ('channels + (format #t (G_ "~%;; warning: GUIX_PACKAGE_PATH=\"~a\"~%") + string)))))) + +(define (display-checkout-info fmt) + "Display information about the current checkout according to FMT, a symbol +denoting the requested format. Exit if the current directory does not lie +within a Git checkout." + (let* ((program (car (command-line))) + (directory (catch 'git-error + (lambda () + (repository-discover (dirname program))) + (lambda (key err) + (leave (G_ "failed to determine origin~%"))))) + (repository (repository-open directory)) + (head (repository-head repository)) + (commit (oid->string (reference-target head)))) + (match fmt + ('human + (format #t (G_ "Git checkout:~%")) + (format #t (G_ " repository: ~a~%") (dirname directory)) + (format #t (G_ " branch: ~a~%") (reference-shorthand head)) + (format #t (G_ " commit: ~a~%") commit)) + ('channels + (pretty-print `(list (channel + (name 'guix) + (url ,(dirname directory)) + (commit ,commit)))))) + (display-package-search-path fmt))) + +(define (display-profile-info profile fmt) + "Display information about PROFILE, a profile as created by (guix channels), +in the format specified by FMT." + (define number + (match (profile-generations profile) + ((_ ... last) last))) + + (match fmt + ('human + (display-profile-content profile number)) + ('channels + (pretty-print + `(list ,@(map (lambda (entry) + (match (assq 'source (manifest-entry-properties entry)) + (('source ('repository ('version 0) + ('url url) + ('branch branch) + ('commit commit) + _ ...)) + `(channel (name ',(string->symbol + (manifest-entry-name entry))) + (url ,url) + (commit ,commit))) + + ;; Pre-0.15.0 Guix does not provide that information, + ;; so there's not much we can do in that case. + (_ '???))) + + ;; Show most recently installed packages last. + (reverse + (manifest-entries + (profile-manifest (generation-file-name profile + number))))))))) + (display-package-search-path fmt)) + + +;;; +;;; Entry point. +;;; + +(define (guix-describe . args) + (let* ((opts (args-fold* args %options + (lambda (opt name arg result) + (leave (G_ "~A: unrecognized option~%") + name)) + cons + %default-options)) + (format (assq-ref opts 'format))) + (with-error-handling + (match (current-profile) + (#f + (display-checkout-info format)) + (profile + (display-profile-info profile format)))))) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index ebc5dc9b13..976e054a84 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -48,7 +48,8 @@ #:use-module (srfi srfi-37) #:use-module (ice-9 match) #:use-module (ice-9 vlist) - #:export (guix-pull)) + #:export (display-profile-content + guix-pull)) ;;; diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index 7f881355e7..2762ea078a 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -31,6 +31,7 @@ guix/scripts/challenge.scm guix/scripts/copy.scm guix/scripts/pack.scm guix/scripts/weather.scm +guix/scripts/describe.scm guix/gnu-maintenance.scm guix/scripts/container.scm guix/scripts/container/exec.scm diff --git a/tests/guix-describe.sh b/tests/guix-describe.sh new file mode 100644 index 0000000000..af523f0a0b --- /dev/null +++ b/tests/guix-describe.sh @@ -0,0 +1,47 @@ +# GNU Guix --- Functional package management for GNU +# Copyright © 2018 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 . + +# +# Test 'guix describe'. +# + +guix describe --version + +tmpfile="t-guix-describe-$$" +trap "rm -f $tmpfile" EXIT +rm -f "$tmpfile" + +if [ -d "$abs_top_srcdir/.git" ] +then + # Since we're in a Git checkout, we can at least check that these things + # work. + guix describe | grep -i "checkout" + if git --version > /dev/null 2>&1 + then + result="`guix describe | grep commit: | cut -d : -f 2-`" + commit="`git log | head -1 | cut -c 7-`" + test "x$result" = "x$commit" + fi + guix describe -f channels + case "`guix describe -f channels | grep url`" in + *"(url \"$abs_top_srcdir\")") true;; + *) false;; + esac +else + exit 77 +fi -- cgit v1.2.3 From 2b73d82830a29e60914ca23cc64440adb3ae4d18 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 Sep 2018 10:56:14 +0200 Subject: guix package: Record package provenance in manifest entries. * guix/profiles.scm (package->manifest-entry): Add #:properties and honor it. * guix/scripts/package.scm (package-provenance) (package->manifest-entry*): New procedures. (transaction-upgrade-entry, options->installable): Use 'package->manifest-entry*' instead of 'package->manifest-entry'. --- guix/profiles.scm | 6 +++-- guix/scripts/package.scm | 57 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index f34f4fcff6..8acfcff8c1 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -286,7 +286,8 @@ file name." (manifest-transitive-entries manifest)))) (define* (package->manifest-entry package #:optional (output "out") - #:key (parent (delay #f))) + #:key (parent (delay #f)) + (properties '())) "Return a manifest entry for the OUTPUT of package PACKAGE." ;; For each dependency, keep a promise pointing to its "parent" entry. (letrec* ((deps (map (match-lambda @@ -305,7 +306,8 @@ file name." (dependencies (delete-duplicates deps)) (search-paths (package-transitive-native-search-paths package)) - (parent parent)))) + (parent parent) + (properties properties)))) entry)) (define (packages->manifest packages) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index b38a55d01c..97bcc699d9 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -35,6 +35,7 @@ #:use-module (guix config) #:use-module (guix scripts) #:use-module (guix scripts build) + #:autoload (guix describe) (current-profile-entries) #:use-module ((guix build utils) #:select (directory-exists? mkdir-p)) #:use-module (ice-9 format) @@ -238,7 +239,7 @@ of relevance scores." (info (G_ "package '~a' has been superseded by '~a'~%") (manifest-entry-name old) (package-name new)) (manifest-transaction-install-entry - (package->manifest-entry new (manifest-entry-output old)) + (package->manifest-entry* new (manifest-entry-output old)) (manifest-transaction-remove-pattern (manifest-pattern (name (manifest-entry-name old)) @@ -261,7 +262,7 @@ of relevance scores." (case (version-compare candidate-version version) ((>) (manifest-transaction-install-entry - (package->manifest-entry pkg output) + (package->manifest-entry* pkg output) transaction)) ((<) transaction) @@ -274,7 +275,7 @@ of relevance scores." (null? (package-propagated-inputs pkg))) transaction (manifest-transaction-install-entry - (package->manifest-entry pkg output) + (package->manifest-entry* pkg output) transaction)))))))) (#f (warning (G_ "package '~a' no longer exists~%") name) @@ -570,6 +571,52 @@ upgrading, #f otherwise." (output "out") ;XXX: wild guess (item item)))) +(define (package-provenance package) + "Return the provenance of PACKAGE as an sexp for use as the 'provenance' +property of manifest entries, or #f if it could not be determined." + (define (entry-source entry) + (match (assq 'source + (manifest-entry-properties entry)) + (('source value) value) + (_ #f))) + + (match (and=> (package-location package) location-file) + (#f #f) + (file + (let ((file (if (string-prefix? "/" file) + file + (search-path %load-path file)))) + (and file + (string-prefix? (%store-prefix) file) + + ;; Always store information about the 'guix' channel and + ;; optionally about the specific channel FILE comes from. + (or (let ((main (and=> (find (lambda (entry) + (string=? "guix" + (manifest-entry-name entry))) + (current-profile-entries)) + entry-source)) + (extra (any (lambda (entry) + (let ((item (manifest-entry-item entry))) + (and (string-prefix? item file) + (entry-source entry)))) + (current-profile-entries)))) + (and main + `(,main + ,@(if extra (list extra) '())))))))))) + +(define (package->manifest-entry* package output) + "Like 'package->manifest-entry', but attach PACKAGE provenance meta-data to +the resulting manifest entry." + (define (provenance-properties package) + (match (package-provenance package) + (#f '()) + (sexp `((provenance ,@sexp))))) + + (package->manifest-entry package output + #:properties (provenance-properties package))) + + (define (options->installable opts manifest transaction) "Given MANIFEST, the current manifest, and OPTS, the result of 'args-fold', return an variant of TRANSACTION that accounts for the specified installations @@ -590,13 +637,13 @@ and upgrades." (('install . (? package? p)) ;; When given a package via `-e', install the first of its ;; outputs (XXX). - (package->manifest-entry p "out")) + (package->manifest-entry* p "out")) (('install . (? string? spec)) (if (store-path? spec) (store-item->manifest-entry spec) (let-values (((package output) (specification->package+output spec))) - (package->manifest-entry package output)))) + (package->manifest-entry* package output)))) (_ #f)) opts)) -- cgit v1.2.3 From da34a19f3af425b5596c09fb388f0a2ee04d4bba Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Sep 2018 14:19:42 +0200 Subject: guix describe: Display information about the current generation. * guix/scripts/describe.scm (display-profile-info)[number]: Use the current generation number instead of the last generation number. --- guix/scripts/describe.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm index 46feea2940..fdff07d0e3 100644 --- a/guix/scripts/describe.scm +++ b/guix/scripts/describe.scm @@ -108,8 +108,7 @@ within a Git checkout." "Display information about PROFILE, a profile as created by (guix channels), in the format specified by FMT." (define number - (match (profile-generations profile) - ((_ ... last) last))) + (generation-number profile)) (match fmt ('human -- cgit v1.2.3 From 15214828a52b66f95890ee29f7fb25dec3c5b065 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Sep 2018 17:03:49 +0200 Subject: gnu: guile-json: Update to 1.2.0. * gnu/packages/guile.scm (guile-json): Update to 1.2.0. [license]: Change to GPL3+. --- 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 335bd6219f..05d9315214 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -897,7 +897,7 @@ for Guile\".") (define-public guile-json (package (name "guile-json") - (version "1.1.1") + (version "1.2.0") (home-page "https://github.com/aconchillo/guile-json") (source (origin (method url-fetch) @@ -906,7 +906,7 @@ for Guile\".") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "12jqkn9qgwdlxbasy2n25a2a7apf30dww1nnxqfam5735k3jdngv")))) + "02kqv0q98fmchn7i4y7ycmrjlh4b2c93ij0z7k036qwpp204w4gh")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -924,7 +924,9 @@ specification. These are the main features: @item Unicode support for strings. @item Allows JSON pretty printing. @end itemize\n") - (license license:lgpl3+))) + + ;; Version 1.2.0 switched to GPLv3+ (from LGPLv3+). + (license license:gpl3+))) (define-public guile2.2-json (deprecated-package "guile2.2-json" guile-json)) -- cgit v1.2.3 From 6b4f99102c4e3f57cc657c14ff196b211654f88b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Sep 2018 17:38:08 +0200 Subject: gnu: gdb: Update to 8.2. * gnu/packages/gdb.scm (gdb): Update to 8.2. --- gnu/packages/gdb.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index f0c4c8b804..74eb0f8994 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -37,14 +37,14 @@ (define-public gdb (package (name "gdb") - (version "8.1.1") + (version "8.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gdb/gdb-" version ".tar.xz")) (sha256 (base32 - "0g6hv9xk12aa58w77fydaldqr9a6b0a6bnwsq87jfc6lkcbc7p4p")))) + "0fbw6j4z7kmvywwgavn7w3knp860i5i9qnjffc5p52bwkji43963")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; FIXME "make check" fails on single-processor systems. -- cgit v1.2.3 From afdd1555c4639dbd378fddffdee702933d14a1b4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Sep 2018 17:57:04 +0200 Subject: gnu: indent: Add version 2.2.12. * gnu/packages/code.scm (indent-2.2.12): New variable. --- gnu/packages/code.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index be178a5f99..85ee6c2877 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -651,6 +651,19 @@ extensions over the standard utility.") (license license:gpl3+) (home-page "https://www.gnu.org/software/indent/"))) +(define-public indent-2.2.12 + (package + (inherit indent) + (version "2.2.12") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/indent/indent-" version + ".tar.gz")) + (sha256 + (base32 + "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7")))) + (native-inputs `(("texinfo" ,texinfo))))) + (define-public amalgamate (let* ((commit "c91f07eea1133aa184f652b8f1398eaf03586208") (revision "0") -- cgit v1.2.3 From 9f1f200c0462d5fa798e4d7b8c3c09294f8bfb95 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Sep 2018 17:59:16 +0200 Subject: gnu: diffoscope: Update to 100. * gnu/packages/package-management.scm (diffoscope): Update to 100. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 529d2943c4..5edfb5dffb 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -568,13 +568,13 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "96") + (version "100") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "1x66f2x8miy3giff14higpcs70c0zb5d3gj6yn8ac6p183sngl72")))) + "0sh7g26i5ndpa8l7xq6rnijbi3jz5izjn0b98zcnm6wpgghszw48")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 9b6c4355645534d1ae799bfef6761b75ed8b3a41 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Sep 2018 23:00:39 +0200 Subject: services: 'instantiate-missing-services' reaches fixed point. Fixes a bug whereby services indirectly depended on would not be automatically instantiated. * gnu/services.scm (instantiate-missing-services): Loop back when the length of ADJUSTED is greater than that of INSTANCES. * tests/services.scm ("instantiate-missing-services, indirect"): New test. --- gnu/services.scm | 24 +++++++++++++++++------- tests/services.scm | 25 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index 49cf01a4f8..f151bbaa9d 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -732,13 +732,23 @@ instantiated; other missing services lead to a instances (service-type-extensions (service-kind svc)))) - (let ((instances (fold (lambda (service result) - (vhash-consq (service-kind service) service - result)) - vlist-null services))) - (fold2 adjust-service-list - services instances - services))) + (let loop ((services services)) + (define instances + (fold (lambda (service result) + (vhash-consq (service-kind service) service + result)) + vlist-null services)) + + (define adjusted + (fold2 adjust-service-list + services instances + services)) + + ;; If we instantiated services, they might in turn depend on missing + ;; services. Loop until we've reached fixed point. + (if (= (length adjusted) (vlist-length instances)) + adjusted + (loop adjusted)))) (define* (fold-services services #:key (target-type system-service-type)) diff --git a/tests/services.scm b/tests/services.scm index b146a0dec2..1ad577e601 100644 --- a/tests/services.scm +++ b/tests/services.scm @@ -138,6 +138,31 @@ (equal? (list s1 s2) (instantiate-missing-services (list s1 s2)))))) +(test-assert "instantiate-missing-services, indirect" + (let* ((t1 (service-type (name 't1) (extensions '()) + (default-value 'dflt) + (compose concatenate) + (extend cons))) + (t2 (service-type (name 't2) (extensions '()) + (default-value 'dflt2) + (compose concatenate) + (extend cons) + (extensions + (list (service-extension t1 list))))) + (t3 (service-type (name 't3) + (extensions + (list (service-extension t2 list))))) + (s1 (service t1)) + (s2 (service t2)) + (s3 (service t3 42)) + (== (cut lset= equal? <...>))) + (and (== (list s1 s2 s3) + (instantiate-missing-services (list s3))) + (== (list s1 s2 s3) + (instantiate-missing-services (list s1 s3))) + (== (list s1 s2 s3) + (instantiate-missing-services (list s2 s3)))))) + (test-assert "instantiate-missing-services, no default value" (let* ((t1 (service-type (name 't1) (extensions '()))) (t2 (service-type (name 't2) -- cgit v1.2.3 From 48d17ba1d333109876bc53fe6ede6f8b3f519609 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 7 Sep 2018 21:01:48 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.154. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.154. --- 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 02d723316d..1670cf7a3c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.153" - "195vzkkmjiicqfzd38hgf381rlz665rl06abzf8cww0gbnzvrf72" + (make-linux-libre "4.4.154" + "08i9fvrmswkydj538wg6c7ggxmhll0ff0bjkw8rnyslqwilfwr1i" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From ddb419ce046f6ef7732b71af9f145c46d4aa42de Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 7 Sep 2018 21:02:30 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.125. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.125. --- 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 1670cf7a3c..cabc34b0df 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.124" - "0p78gx5jiqvaf2cadf5jp40lzgarrg0m0ybf9w2499v28vjsp30q" + (make-linux-libre "4.9.125" + "1saihk61l1kk42jf8yfsfkm77zalq31f0bdlam3c1g7yw702wj9g" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 4be8fdd3ccb5d41438812d6781379457800345bd Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 7 Sep 2018 21:03:03 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.68. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.68. (%linux-libre-4.14-hash): 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 cabc34b0df..2b02870a73 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.67") -(define %linux-libre-4.14-hash "050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg") +(define %linux-libre-4.14-version "4.14.68") +(define %linux-libre-4.14-hash "05l5y0vbbl60jxdbqglqr9c99a8g8lfsp4mcqfpcx1pkh5br7i3l") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 090e3768e8a3157d440f6fdf513b4bf058328b0f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 7 Sep 2018 21:05:14 -0400 Subject: gnu: linux-libre: Update to 4.18.6. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.6. (%linux-libre-hash): 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 2b02870a73..7d5b3aed86 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.5") -(define %linux-libre-hash "1y52ns34vh9p4pfj08xsycv8p0xywm6dbpdi0wwpkll1xgpqikvf") +(define %linux-libre-version "4.18.6") +(define %linux-libre-hash "1l5caid77vbfb54zrfxkk7qj7lrf9ck9kpn96kr45spkwl51wm8m") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 39b5d8fd9d0383124c93b85fd22c6d35545f694f Mon Sep 17 00:00:00 2001 From: Benjamin Slade Date: Fri, 7 Sep 2018 21:08:15 -0600 Subject: gnu: Add frotz, frotz-dumb-terminal, and frotz-sdl. * gnu/packages/games.scm (frotz, frotz-dumb-terminal, frotz-sdl): New variables. Signed-off-by: Kei Kebreau --- gnu/packages/games.scm | 157 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 728f763806..2015e3ce47 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2018 okapi ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Madalin Ionel-Patrascu +;;; Copyright © 2018 Benjamin Slade ;;; ;;; This file is part of GNU Guix. ;;; @@ -5553,3 +5554,159 @@ open-source FPS of its kind.") (license (list license:gpl2+ license:bsd-3 ; /source/d0_blind_id folder and others (license:x11-style "" "See file rcon.pl."))))) + +(define-public frotz + (package + (name "frotz") + (version "2.44") + (source (origin + (method url-fetch) + (uri (list (string-append + "http://www.ifarchive.org/if-archive/infocom/interpreters/" + name "/" name "-" version ".tar.gz") + (string-append + "ftp://ftp.ifarchive.org/if-archive/infocom/interpreters/" + name "/" name "-" version ".tar.gz"))) + (sha256 + (base32 + "1v735xr3blznac8fnwa27s1vhllx4jpz7kw7qdw1bsfj6kq21v3k")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'curses + (lambda _ + (substitute* "Makefile" + (("lcurses") "lncurses")) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man6"))) + (install-file "frotz" bin) + (mkdir-p man) + (install-file "doc/frotz.6" man) + #t)))))) + (inputs `(("libmodplug" ,libmodplug) + ("libsamplerate" ,libsamplerate) + ("libsndfile" ,libsndfile) + ("libvorbis" ,libvorbis) + ("ncurses" ,ncurses))) + (synopsis "Portable Z-machine interpreter (ncurses version) for text adventure games") + (description "Frotz is an interpreter for Infocom games and other Z-machine +games in the text adventure/interactive fiction genre. This version of Frotz +complies with standard 1.0 of Graham Nelson's specification. It plays all +Z-code games V1-V8, including V6, with sound support through libao, and uses +ncurses for text display.") + (home-page "http://frotz.sourceforge.net") + (license license:gpl2+))) + +(define-public frotz-dumb-terminal + (package + (name "frotz-dumb-terminal") + (version "2.44") + (source (origin + (method url-fetch) + (uri (list (string-append + "http://www.ifarchive.org/if-archive/infocom/interpreters/" + "frotz" "/" "frotz" "-" version ".tar.gz") + (string-append + "ftp://ftp.ifarchive.org/if-archive/infocom/interpreters/" + "frotz" "/" "frotz" "-" version ".tar.gz"))) + (sha256 + (base32 + "1v735xr3blznac8fnwa27s1vhllx4jpz7kw7qdw1bsfj6kq21v3k")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "make" "dumb"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man6"))) + (install-file "dfrotz" bin) + (mkdir-p man) + (install-file "doc/dfrotz.6" man) + #t)))))) + (synopsis "Portable Z-machine dumb interpreter for text adventure games") + (description "Frotz is an interpreter for Infocom games and +other Z-machine games in the text adventure/interactive fiction genre. +dfrotz is the dumb interface version. You get no screen control; everything +is just printed to the terminal line by line. The terminal handles all the +scrolling. Maybe you'd like to experience what it's like to play Adventure on +a teletype. A much cooler use for compiling Frotz with the dumb interface is +that it can be wrapped in CGI scripting, PHP, and the like to allow people +to play games on webpages. It can also be made into a chat bot.") + (home-page "http://frotz.sourceforge.net") + (license license:gpl2+))) + +(define-public frotz-sdl + (let* ((commit "4de8c34f2116fff554af6216c30ec9d41bf50b24")) + (package + (name "frotz-sdl") + (version "2.45pre") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/DavidGriffith/frotz") + (commit commit))) + (sha256 + (base32 + "18ms21pcrl7ipcnyqnf8janamkryzx78frsgd9kfk67jvbj0z2k8")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch-makefile + (lambda _ + (substitute* "Makefile" + (("lcurses") "lncurses") + (("^BUILD_DATE_TIME =.*$") + "BUILD_DATE_TIME = \"2.45pre-20180907.00000\"\n")) + #t)) + (replace 'build + (lambda _ + (invoke "make" "sdl"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man (string-append out "/share/man/man6"))) + (install-file "sfrotz" bin) + (mkdir-p man) + (install-file "doc/sfrotz.6" man) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("which" ,which) + ("perl" ,perl))) + (inputs `(("sdl2" ,sdl2) + ("sdl2-mixer" ,sdl2-mixer) + ("libmodplug" ,libmodplug) + ("libsamplerate" ,libsamplerate) + ("libsndfile" ,libsndfile) + ("libvorbis" ,libvorbis) + ("ncurses" ,ncurses) + ("freetype" ,freetype) + ("libjpeg-turbo" ,libjpeg-turbo))) + (synopsis "Portable Z-machine interpreter (SDL port) for text adventure games") + (description "Frotz is an interpreter for Infocom games and other Z-machine +games in the text adventure/interactive fiction genre. This version of Frotz +using SDL fully supports all these versions of the Z-Machine including the +graphical version 6. Graphics and sound are created through the use of the SDL +libraries. AIFF sound effects and music in MOD and OGG formats are supported +when packaged in Blorb container files or optionally from individual files.") + (home-page "http://frotz.sourceforge.net") + (license license:gpl2+)))) -- cgit v1.2.3 From 445ecce92307aa7ab70cf02b70078e860de17dc0 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 8 Sep 2018 16:55:32 +0200 Subject: gnu: nyacc: Update to 0.86.0. * gnu/packages/patches/nyacc-binary-literals.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/mes.scm (nyacc): Update to 0.86.0, add patch. --- gnu/local.mk | 1 + gnu/packages/mes.scm | 6 ++--- gnu/packages/patches/nyacc-binary-literals.patch | 29 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/nyacc-binary-literals.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1924ae9467..847e45e8cc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -988,6 +988,7 @@ dist_patch_DATA = \ %D%/packages/patches/nvi-assume-preserve-path.patch \ %D%/packages/patches/nvi-dbpagesize-binpower.patch \ %D%/packages/patches/nvi-db4.patch \ + %D%/packages/patches/nyacc-binary-literals.patch \ %D%/packages/patches/nyx-show-header-stats-with-python3.patch \ %D%/packages/patches/ocaml-bisect-fix-camlp4-in-another-directory.patch \ %D%/packages/patches/ocaml-bitstring-fix-configure.patch \ diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 81d4145439..7bdad5e32f 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -39,15 +39,15 @@ (define-public nyacc (package (name "nyacc") - (version "0.83.3") + (version "0.86.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/nyacc/" name "-" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (patches (search-patches "nyacc-binary-literals.patch")) (sha256 (base32 - "0120n0mdb6r58c4jc024dhwqy5s8a20waknijfhqjc59a884lrd6")))) + "0lkd9lyspvhxlfs0496gsllwinh62jk9wij6gpadvx9gwz6yavd9")))) (build-system gnu-build-system) (native-inputs `(("guile" ,guile-2.2))) diff --git a/gnu/packages/patches/nyacc-binary-literals.patch b/gnu/packages/patches/nyacc-binary-literals.patch new file mode 100644 index 0000000000..8159d74032 --- /dev/null +++ b/gnu/packages/patches/nyacc-binary-literals.patch @@ -0,0 +1,29 @@ +From 6a08014b77bf435f025ecdac08396580b85f159a Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Sat, 8 Sep 2018 20:22:45 +0200 +Subject: [PATCH] fix binary literals. + +--- + module/nyacc/lex.scm | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/module/nyacc/lex.scm b/module/nyacc/lex.scm +index 2ec9895..b205212 100644 +--- a/module/nyacc/lex.scm ++++ b/module/nyacc/lex.scm +@@ -345,10 +345,11 @@ + ((char-numeric? ch) (iter chl '$fixed ba 1 ch)) + ((char=? #\. ch) (iter (cons ch chl) #f ba 15 (read-char))) + (else #f))) +- ((10) ;; allow x after 0 ++ ((10) ;; allow x, b after 0 + (cond + ((eof-object? ch) (iter chl ty ba 5 ch)) + ((char=? #\x ch) (iter (cons ch chl) ty 16 1 (read-char))) ++ ((char=? #\b ch) (iter (cons ch chl) ty 2 1 (read-char))) + (else (iter chl ty ba 1 ch)))) + ((15) ;; got `.' only + (cond +-- +2.18.0 + -- cgit v1.2.3 From c665774a1ca9431746b1d559b06e24c1b05625d8 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sat, 8 Sep 2018 16:58:37 +0200 Subject: gnu: mes: Update to 0.17.1. * gnu/packages/patches/mes-nyacc-0.86.0.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/mes.scm (mes): Update to 0.17.1, depend on latest Nyacc 0.86.0. (nyacc-for-mes): Remove. --- gnu/local.mk | 1 + gnu/packages/mes.scm | 20 +-- gnu/packages/patches/mes-nyacc-0.86.0.patch | 197 ++++++++++++++++++++++++++++ 3 files changed, 202 insertions(+), 16 deletions(-) create mode 100644 gnu/packages/patches/mes-nyacc-0.86.0.patch diff --git a/gnu/local.mk b/gnu/local.mk index 847e45e8cc..278afbb257 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -953,6 +953,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ + %D%/packages/patches/mes-nyacc-0.86.0.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 7bdad5e32f..63a8db449a 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -59,36 +59,24 @@ extensive examples, including parsers for the Javascript and C99 languages.") (home-page "https://savannah.nongnu.org/projects/nyacc") (license (list gpl3+ lgpl3+)))) -(define-public nyacc-for-mes - (package - (inherit nyacc) - (version "0.80.42") - (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/nyacc" - "/-/archive/v" version - "/nyacc-" version ".tar.gz")) - (sha256 - (base32 - "0c8c8kxir0h2d4nxr131xbkfs7c80haipmkp2g6677sh14wn0b3y")))))) - (define-public mes (let ((triplet "i686-unknown-linux-gnu")) (package (name "mes") - (version "0.17") + (version "0.17.1") (source (origin (method url-fetch) (uri (string-append "http://alpha.gnu.org/gnu/mes/" "mes-" version ".tar.gz")) + (patches (search-patches "mes-nyacc-0.86.0.patch")) (sha256 (base32 - "1j32x4zqy2cqjlg9m35f2411mwac2b0p5ch4hm99gddmfbxzgyhg")))) + "02g8zig53ffd0ai8kqhv2zj7bj2366a8hr6ydkwakmi2d1amyrna")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs `(("mescc-tools" ,mescc-tools) - ("nyacc" ,nyacc-for-mes))) + ("nyacc" ,nyacc))) (native-inputs `(("guile" ,guile-2.2) ,@(if (not (string-prefix? "i686-linux" (or (%current-target-system) diff --git a/gnu/packages/patches/mes-nyacc-0.86.0.patch b/gnu/packages/patches/mes-nyacc-0.86.0.patch new file mode 100644 index 0000000000..58dfc5a46b --- /dev/null +++ b/gnu/packages/patches/mes-nyacc-0.86.0.patch @@ -0,0 +1,197 @@ +From 9e610736bf779f3295c1192e748cd19cbbe3be28 Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Wed, 5 Sep 2018 20:28:06 +0200 +Subject: [PATCH 1/2] mes: Support Nyacc 0.85.3: Add char-set-copy. + +* mes/module/srfi/srfi-14.mes (char-set-copy): New function> +--- + mes/module/srfi/srfi-14.mes | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/mes/module/srfi/srfi-14.mes b/mes/module/srfi/srfi-14.mes +index 0be39b1e..a16d16ce 100644 +--- a/mes/module/srfi/srfi-14.mes ++++ b/mes/module/srfi/srfi-14.mes +@@ -52,3 +52,6 @@ + + (define (char-whitespace? c) + (char-set-contains? char-set:whitespace c)) ++ ++(define (char-set-copy cs) ++ (map identity cs)) +-- +2.18.0 + +From b952bdf44f11edbfc277600dc35236aae1769b54 Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Wed, 5 Sep 2018 22:14:34 +0200 +Subject: [PATCH 2/2] mes: Support Nyacc 0.85.3: Integrate progress. + +* mes/module/nyacc/lang/sx-util.mes: New file. +* mes/module/nyacc/version.mes: New file. +* mes/module/nyacc/lang/c99/cpp.mes (nyacc): Include them. +* mes/module/nyacc/lang/c99/parser.mes (nyacc): Include them. +* module/mescc/preprocess.scm (need-progress): New function. +(progress): New function. +(insert-progress-monitors): Use them to Integrate progress. +--- + mes/module/mescc/preprocess.mes | 1 + + mes/module/nyacc/lang/c99/cpp.mes | 1 + + mes/module/nyacc/lang/c99/parser.mes | 1 + + mes/module/nyacc/lang/sx-util.mes | 27 +++++++++++++++++++++ + mes/module/nyacc/version.mes | 26 +++++++++++++++++++++ + module/mescc/preprocess.scm | 35 ++++++++++++++++++++++++++++ + 6 files changed, 91 insertions(+) + create mode 100644 mes/module/nyacc/lang/sx-util.mes + create mode 100644 mes/module/nyacc/version.mes + +diff --git a/mes/module/mescc/preprocess.mes b/mes/module/mescc/preprocess.mes +index c7c5fcaa..022a372c 100644 +--- a/mes/module/mescc/preprocess.mes ++++ b/mes/module/mescc/preprocess.mes +@@ -24,4 +24,5 @@ + (mes-use-module (srfi srfi-13)) + (mes-use-module (srfi srfi-26)) + (mes-use-module (nyacc lang c99 parser)) ++(mes-use-module (nyacc version)) + (include-from-path "mescc/preprocess.scm") +diff --git a/mes/module/nyacc/lang/c99/cpp.mes b/mes/module/nyacc/lang/c99/cpp.mes +index fad1dc55..b25c4a93 100644 +--- a/mes/module/nyacc/lang/c99/cpp.mes ++++ b/mes/module/nyacc/lang/c99/cpp.mes +@@ -28,5 +28,6 @@ + + (mes-use-module (nyacc parse)) + (mes-use-module (nyacc lex)) ++(mes-use-module (nyacc lang sx-util)) + (mes-use-module (nyacc lang util)) + (include-from-path "nyacc/lang/c99/cpp.scm") +diff --git a/mes/module/nyacc/lang/c99/parser.mes b/mes/module/nyacc/lang/c99/parser.mes +index c51552d6..1a9aaf73 100644 +--- a/mes/module/nyacc/lang/c99/parser.mes ++++ b/mes/module/nyacc/lang/c99/parser.mes +@@ -32,6 +32,7 @@ + + (mes-use-module (nyacc lex)) + (mes-use-module (nyacc parse)) ++(mes-use-module (nyacc lang sx-util)) + (mes-use-module (nyacc lang util)) + (mes-use-module (nyacc lang c99 cpp)) + +diff --git a/mes/module/nyacc/lang/sx-util.mes b/mes/module/nyacc/lang/sx-util.mes +new file mode 100644 +index 00000000..41ac5b4a +--- /dev/null ++++ b/mes/module/nyacc/lang/sx-util.mes +@@ -0,0 +1,27 @@ ++;;; -*-scheme-*- ++ ++;;; GNU Mes --- Maxwell Equations of Software ++;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ++;;; ++;;; This file is part of GNU Mes. ++;;; ++;;; GNU Mes 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 Mes 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 Mes. If not, see . ++ ++;;; Commentary: ++ ++;;; Code: ++ ++(mes-use-module (srfi srfi-1)) ++(mes-use-module (srfi srfi-16)) ++(include-from-path "nyacc/lang/sx-util.scm") +diff --git a/mes/module/nyacc/version.mes b/mes/module/nyacc/version.mes +new file mode 100644 +index 00000000..b9db628e +--- /dev/null ++++ b/mes/module/nyacc/version.mes +@@ -0,0 +1,26 @@ ++;;; -*-scheme-*- ++ ++;;; GNU Mes --- Maxwell Equations of Software ++;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ++;;; ++;;; This file is part of GNU Mes. ++;;; ++;;; GNU Mes 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 Mes 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 Mes. If not, see . ++ ++;;; Commentary: ++ ++;;; Code: ++ ++(include-from-path "nyacc/version.scm") ++(display "nyacc version\n") +diff --git a/module/mescc/preprocess.scm b/module/mescc/preprocess.scm +index 9e341cba..c2efb32c 100644 +--- a/module/mescc/preprocess.scm ++++ b/module/mescc/preprocess.scm +@@ -26,9 +26,44 @@ + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:use-module (nyacc lang c99 parser) ++ #:use-module (nyacc lang c99 parser) ++ #:use-module (nyacc version) + #:use-module (mes guile) + #:export (c99-input->ast)) + ++(format (current-error-port) "*nyacc-version*=~a\n" *nyacc-version*) ++;; list of which rules you want progress reported ++(define need-progress ++ (assoc-ref ++ '(("0.85.3" (1 2 3)) ++ ("0.86.0" (1 2 3))) ++ *nyacc-version*)) ++ ++(define (progress o) ++ (when (and o (getenv "NYACC_DEBUG")) ++ (display " :" (current-error-port)) ++ (display o (current-error-port)) ++ (display "\n" (current-error-port)))) ++ ++(define (insert-progress-monitors act-v len-v) ++ (let ((n (vector-length act-v))) ++ (let loop ((ix 0)) ++ (when (< ix n) ++ (if (memq ix need-progress) ++ (vector-set ++ act-v ix ++ (lambda args ++ (progress (list-ref args (1- (vector-ref len-v ix)))) ++ (apply (vector-ref act-v ix) args)))) ++ (loop (1+ ix)))))) ++ ++(cond-expand ++ (guile ++ (insert-progress-monitors (@@ (nyacc lang c99 parser) c99-act-v) ++ (@@ (nyacc lang c99 parser) c99-len-v))) ++ (mes ++ (insert-progress-monitors c99-act-v c99-len-v))) ++ + (define (logf port string . rest) + (apply format (cons* port string rest)) + (force-output port) +-- +2.18.0 + -- cgit v1.2.3 From 985975ae80fe5a8e58319b3a5aaf14da940c4419 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 8 Sep 2018 18:48:48 +0200 Subject: services: nginx: Don't read PID file when passed a custom config file. Fixes . * gnu/services/web.scm (nginx-shepherd-service): Check whether FILE is true and don't read the PID file if it is; use 'read-pid-file' instead of a potentially endless loop. --- gnu/services/web.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 3778efd048..1c993b29fe 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -610,14 +610,12 @@ of index files." (match '#$args (("-s" . _) #t) (_ - (let loop ((duration 0)) - ;; https://bugs.launchpad.net/ubuntu/+source/nginx/+bug/1581864/comments/7 - (sleep duration) - (if (file-exists? #$pid-file) - (let ((pid (call-with-input-file #$pid-file read))) - ;; it could be # - (if (integer? pid) pid (loop 1))) - (loop 1))))))))) + ;; When FILE is true, we cannot be sure that PID-FILE will + ;; be created, so assume it won't show up. When FILE is + ;; false, read PID-FILE. + #$(if file + #~#t + #~(read-pid-file #$pid-file)))))))) ;; TODO: Add 'reload' action. (list (shepherd-service -- cgit v1.2.3 From e80c725db7d11618dec7c3f92845f71b0a9715b0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 8 Sep 2018 18:50:55 +0200 Subject: services: nginx: 'stop' returns #f. Previously we'd return #t, which the Shepherd would consider a failure to stop the service. * gnu/services/web.scm (nginx-shepherd-service): In 'nginx-action', return #f when stopping the service. --- gnu/services/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 1c993b29fe..df82a6de61 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -608,7 +608,7 @@ of index files." (default-nginx-config config)) #$@args) (match '#$args - (("-s" . _) #t) + (("-s" . _) #f) (_ ;; When FILE is true, we cannot be sure that PID-FILE will ;; be created, so assume it won't show up. When FILE is -- cgit v1.2.3 From 5dec93bb8ba89605bce2f9a5ee9c4dbadeee3b58 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 8 Sep 2018 22:56:40 +0200 Subject: gexp: 'file-union' accepts directory names. * guix/gexp.scm (file-union): Import (guix build utils). Make the parent directories of TARGET. * tests/gexp.scm ("file-union"): New test. --- guix/gexp.scm | 39 ++++++++++++++++++++++----------------- tests/gexp.scm | 18 ++++++++++++++++++ 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index ffc976d61b..f7a23db872 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1479,26 +1479,31 @@ denoting the target file. Here's an example: `((\"hosts\" ,(plain-file \"hosts\" \"127.0.0.1 localhost\")) (\"bashrc\" ,(plain-file \"bashrc\" - \"alias ls='ls --color'\")))) + \"alias ls='ls --color'\")) + (\"libvirt/qemu.conf\" ,(plain-file \"qemu.conf\" \"\")))) This yields an 'etc' directory containing these two files." (computed-file name - (gexp - (begin - (mkdir (ungexp output)) - (chdir (ungexp output)) - (ungexp-splicing - (map (match-lambda - ((target source) - (gexp - (begin - ;; Stat the source to abort early if it does - ;; not exist. - (stat (ungexp source)) - - (symlink (ungexp source) - (ungexp target)))))) - files)))))) + (with-imported-modules '((guix build utils)) + (gexp + (begin + (use-modules (guix build utils)) + + (mkdir (ungexp output)) + (chdir (ungexp output)) + (ungexp-splicing + (map (match-lambda + ((target source) + (gexp + (begin + ;; Stat the source to abort early if it does + ;; not exist. + (stat (ungexp source)) + + (mkdir-p (dirname (ungexp target))) + (symlink (ungexp source) + (ungexp target)))))) + files))))))) (define* (directory-union name things #:key (copy? #f) (quiet? #f) diff --git a/tests/gexp.scm b/tests/gexp.scm index b22e635805..5d049cd5fc 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -1093,6 +1093,24 @@ (call-with-input-file out get-string-all)) (equal? refs (list guile)))))))) +(test-assertm "file-union" + (mlet* %store-monad ((union -> (file-union "union" + `(("a" ,(plain-file "a" "1")) + ("b/c/d" ,(plain-file "d" "2")) + ("e" ,(plain-file "e" "3"))))) + (drv (lower-object union)) + (out -> (derivation->output-path drv))) + (define (contents=? file str) + (string=? (call-with-input-file (string-append out "/" file) + get-string-all) + str)) + + (mbegin %store-monad + (built-derivations (list drv)) + (return (and (contents=? "a" "1") + (contents=? "b/c/d" "2") + (contents=? "e" "3")))))) + (test-assert "gexp->derivation vs. %current-target-system" (let ((mval (gexp->derivation "foo" #~(begin -- cgit v1.2.3 From 4ab6a2f23d43f6c7e4a5a7420db613c5ba5b03b6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 8 Sep 2018 22:59:04 +0200 Subject: tests: base: Add Guile-Gcrypt & co. to the search path. Fixes a regression introduced in ca719424455465fca4b872c371daf2a46de88b33, whereby (gcrypt hash) would not be found in the system under test, leading to a failure of the "/run/current-system is a GC root" test. * gnu/tests/base.scm (run-basic-test)[guix&co]: New variable. [test]: Add all of GUIX&CO to %LOAD-PATH. --- gnu/tests/base.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index f27064af85..f97581de33 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -42,6 +42,7 @@ #:use-module (guix monads) #:use-module (guix packages) #:use-module (srfi srfi-1) + #:use-module (ice-9 match) #:export (run-basic-test %test-basic-os %test-halt @@ -68,6 +69,11 @@ initialization step, such as entering a LUKS passphrase." (fold-services (operating-system-services os) #:target-type special-files-service-type))) + (define guix&co + (match (package-transitive-propagated-inputs guix) + (((labels packages) ...) + (cons guix packages)))) + (define test (with-imported-modules '((gnu build marionette) (guix build syscalls)) @@ -345,8 +351,14 @@ info --version") 'success! (marionette-eval '(begin ;; Make sure the (guix …) modules are found. - (add-to-load-path - #+(file-append guix "/share/guile/site/2.2")) + (eval-when (expand load eval) + (set! %load-path + (append (map (lambda (package) + (string-append package + "/share/guile/site/" + (effective-version))) + '#$guix&co) + %load-path))) (use-modules (srfi srfi-34) (guix store)) -- cgit v1.2.3 From d7f99b3b767e50e73afbe041a2887aa1c878d990 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 9 Sep 2018 18:56:18 +0800 Subject: gnu: perl: Improve description. Fixes . * gnu/packages/perl.scm (perl)[description]: Use description from 'perlintro'. --- gnu/packages/perl.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 4d70e019b9..1bf4cb15fe 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -156,8 +156,10 @@ (files '("lib/perl5/site_perl"))))) (synopsis "Implementation of the Perl programming language") (description - "Perl 5 is a highly capable, feature-rich programming language with over -24 years of development.") + "Perl is a general-purpose programming language originally developed for +text manipulation and now used for a wide range of tasks including system +administration, web development, network programming, GUI development, and +more.") (home-page "http://www.perl.org/") (license gpl1+))) ; or "Artistic" -- cgit v1.2.3 From 6930ea33c979b3d4713c9a1c59bd24ca0f642980 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Aug 2018 16:09:33 +0200 Subject: gnu: aircrack-ng: Use HTTPS. * gnu/packages/networking.scm (aircrack-ng)[source, home-page]: Use HTTPS. --- 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 acf523d366..5a85a9d40d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -766,7 +766,7 @@ live network and disk I/O bandwidth monitor.") (source (origin (method url-fetch) - (uri (string-append "http://download.aircrack-ng.org/aircrack-ng-" + (uri (string-append "https://download.aircrack-ng.org/aircrack-ng-" version ".tar.gz")) (sha256 (base32 @@ -807,7 +807,7 @@ live network and disk I/O bandwidth monitor.") (("\\$\\(ethtool") (string-append "$(" ethtool))) #t)))))) - (home-page "http://www.aircrack-ng.org") + (home-page "https://www.aircrack-ng.org") (synopsis "Assess WiFi network security") (description "Aircrack-ng is a complete suite of tools to assess WiFi network -- cgit v1.2.3 From b9114ccbad64db553b88d2b17206a34585b60e37 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 17 Aug 2018 16:13:51 +0200 Subject: gnu: aircrack-ng: Update to 1.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (aircrack-ng): Update to 1.3. [native-inputs]: Add autoconf, automake, libtool, and which. [inputs]: Add libpcap. [arguments]: Use conventional --options in #:configure-flags. Restore ‘configure’ phase. Add ‘patch-evalrev’ and customise ‘bootstrap’ phases. Simplify ‘absolutize-tools’ phase. --- gnu/packages/networking.scm | 48 +++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 5a85a9d40d..abc616de3c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -762,7 +762,7 @@ live network and disk I/O bandwidth monitor.") (define-public aircrack-ng (package (name "aircrack-ng") - (version "1.2-rc4") + (version "1.3") (source (origin (method url-fetch) @@ -770,42 +770,48 @@ live network and disk I/O bandwidth monitor.") version ".tar.gz")) (sha256 (base32 - "0dpzx9kddxpgzmgvdpl3rxn0jdaqhm5wxxndp1xd7d75mmmc2fnr")))) + "1jl30d0kibc82447fr3lgw75arik0l9729k94z76l7vl51y8mq4a")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("which" ,which))) (inputs `(("libgcrypt" ,libgcrypt) ("libnl" ,libnl) + ("libpcap" ,libpcap) ("ethtool" ,ethtool) ("pcre" ,pcre) ("sqlite" ,sqlite) ("zlib" ,zlib))) (arguments - `(#:make-flags `("sqlite=true" - "gcrypt=true" - "libnl=true" - "pcre=true" - "experimental=true" ;build wesside-ng, etc. - "AVX2FLAG=N" "AVX1FLAG=N" - ,,@(match (%current-system) - ((or "x86_64-linux" "i686-linux") - `("SSEFLAG=Y")) - (_ - `("NEWSSE=false"))) - ,(string-append "prefix=" %output)) + `(#:configure-flags + (list "--with-experimental=yes" ; build wesside-ng, etc. + "--with-gcrypt") ; openssl's the default #:phases (modify-phases %standard-phases - (delete 'configure) ;no configure phase + (add-before 'bootstrap 'patch-evalrev + (lambda _ + ;; Called by ./autogen.sh below, before the default + ;; ‘patch-shebangs’ phase has had a chance to run. + (substitute* "evalrev" + (("/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") "/sbin/ethtool"))) (substitute* "scripts/airmon-ng" - (("\\[ ! -x \"\\$\\(command -v ethtool 2>&1)\" \\]") - (string-append "! " ethtool " --version " - ">/dev/null 2>&1")) - (("\\$\\(ethtool") - (string-append "$(" ethtool))) + (("ethtool ") + (string-append ethtool " "))) #t)))))) (home-page "https://www.aircrack-ng.org") (synopsis "Assess WiFi network security") -- cgit v1.2.3 From a0fad0374e583d44a73d6f76ead3bfeefc6d6b08 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:59:49 +0200 Subject: gnu: links: Update to 2.17. * gnu/packages/web-browsers.scm (links): Update to 2.17. --- 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 45252c933d..2c2767dbbc 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -86,14 +86,14 @@ older or slower computers and embedded systems.") (define-public links (package (name "links") - (version "2.16") + (version "2.17") (source (origin (method url-fetch) (uri (string-append "http://links.twibright.com/download/" name "-" version ".tar.bz2")) (sha256 (base32 - "0gsa2gpb1grhssl5jzpc5pa0zi21mxi8g25rh5bacl70slw31w42")))) + "0dh2gbzcw8kxy81z4ggsynibnqs56b83vy8qgz7illsag1irff6q")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 2d32a6572ddcd23aa1ae598a5d9b6e36f7f87b09 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:38:44 +0200 Subject: gnu: perl-params-validate: Update to 1.29. * gnu/packages/perl.scm (perl-params-validate): Update to 1.29. --- 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 1bf4cb15fe..8dea2051a6 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6744,7 +6744,7 @@ checking parameters easier.") (define-public perl-params-validate (package (name "perl-params-validate") - (version "1.26") + (version "1.29") (source (origin (method url-fetch) @@ -6752,7 +6752,7 @@ checking parameters easier.") "Params-Validate-" version ".tar.gz")) (sha256 (base32 - "1vbj78qd46ip09i06dsbb62jfwpzp4bg7yi617v98nvim77w66l2")))) + "0cwpf8yxwyxbnwhf6rx4wnaq1q38j38i34a78a005shb8gxqv9j9")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) -- cgit v1.2.3 From 49e63e38846977342c6b6cb44349db0b070f2a84 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:38:35 +0200 Subject: gnu: perl-datetime: Update to 1.50. * gnu/packages/perl.scm (perl-datetime): Update to 1.50. --- 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 8dea2051a6..a3f899fdb3 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2180,7 +2180,7 @@ hours, minutes, seconds, and time zones.") (define-public perl-datetime (package (name "perl-datetime") - (version "1.49") + (version "1.50") (source (origin (method url-fetch) @@ -2188,7 +2188,7 @@ hours, minutes, seconds, and time zones.") "DateTime-" version ".tar.gz")) (sha256 (base32 - "0hbw4zq1562slnz7g7hyhfhyq98dzkk3i5g21x3xra5cvfix93kh")))) + "165iqk1xvhs5j0kzsipa7aqycx3h37wqsl2r4jl104yqvmqhqszd")))) (build-system perl-build-system) (native-inputs `(("perl-cpan-meta-check" ,perl-cpan-meta-check) -- cgit v1.2.3 From 04fc0b9489e97e55914d0e1f9b1439a5b7964854 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:13:51 +0200 Subject: gnu: perl-namespace-clean: Update to 0.27. * gnu/packages/perl.scm (perl-namespace-clean): Update to 0.27. --- 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 a3f899fdb3..c81829165e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6364,7 +6364,7 @@ anything that looks like a method.") (define-public perl-namespace-clean (package (name "perl-namespace-clean") - (version "0.25") + (version "0.27") (source (origin (method url-fetch) @@ -6372,7 +6372,7 @@ anything that looks like a method.") "namespace-clean-" version ".tar.gz")) (sha256 (base32 - "016dds70ql1mp18b07chkxiy4drn976ibnbshqc2hmhrh9xjnsll")))) + "17dg64pd4bwi2ad3p8ykwys1zha7kg8a8ykvks7wfg8q7qyah44a")))) (build-system perl-build-system) (propagated-inputs `(("perl-package-stash" ,perl-package-stash) -- cgit v1.2.3 From 748e6e1271750319cfa1096f28f9c8588356bcf5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:13:43 +0200 Subject: gnu: perl-getopt-long-descriptive: Update to 0.103. * gnu/packages/perl.scm (perl-getopt-long-descriptive): Update to 0.103. --- 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 c81829165e..1c6b251198 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3812,7 +3812,7 @@ single-letter approach, is provided but not enabled by default.") (define-public perl-getopt-long-descriptive (package (name "perl-getopt-long-descriptive") - (version "0.102") + (version "0.103") (source (origin (method url-fetch) @@ -3820,7 +3820,7 @@ single-letter approach, is provided but not enabled by default.") "Getopt-Long-Descriptive-" version ".tar.gz")) (sha256 (base32 - "0ii8xafvlph5vzcqp3dpc83lg7nkg3l1l2hmqdf5382a567vkm4s")))) + "1cpl240qxmh7jf85ai9sfkp3nzm99syya4jxidizp7aa83kvmqbh")))) (build-system perl-build-system) (native-inputs `(("perl-cpan-meta-check" ,perl-cpan-meta-check) -- cgit v1.2.3 From 4e77b75e114d8ab50ead5e28ae04556abc6c6883 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:13:32 +0200 Subject: gnu: perl-extutils-helpers: Update to 0.026. * gnu/packages/perl.scm (perl-extutils-helpers): Update to 0.026. --- 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 1c6b251198..0de597ca59 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3232,7 +3232,7 @@ XS interface besides the perl one.") (define-public perl-extutils-helpers (package (name "perl-extutils-helpers") - (version "0.022") + (version "0.026") (source (origin (method url-fetch) @@ -3240,7 +3240,7 @@ XS interface besides the perl one.") "ExtUtils-Helpers-" version ".tar.gz")) (sha256 (base32 - "15dalfwmpfmifw312i5pwiai8134pxf7b2804shlqhdk1xqczy6k")))) + "05ilqcj1rg5izr09dsqmy5di4fvq6ph4k0chxks7qmd4j1kip46y")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/ExtUtils-Helpers") (synopsis "Various portability utilities for module builders") -- cgit v1.2.3 From 15dbc911f6deb7c30e7fde2e9bb17e3b671183e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:13:22 +0200 Subject: gnu: perl-extutils-installpaths: Update to 0.012. * gnu/packages/perl.scm (perl-extutils-installpaths): Update to 0.012. --- 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 0de597ca59..54dd29deec 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3168,7 +3168,7 @@ only about 40% as many lines of code and with zero non-core dependencies.") (define-public perl-extutils-installpaths (package (name "perl-extutils-installpaths") - (version "0.011") + (version "0.012") (source (origin (method url-fetch) @@ -3176,7 +3176,7 @@ only about 40% as many lines of code and with zero non-core dependencies.") "ExtUtils-InstallPaths-" version ".tar.gz")) (sha256 (base32 - "0z06y0fhx9hy9x01abb7s2xdbqrh9x4ps7avmlf4bwfwih2gl2bn")))) + "1v9lshfhm9ck4p0v77arj5f7haj1mmkqal62lgzzvcds6wq5www4")))) (build-system perl-build-system) (propagated-inputs `(("perl-extutils-config" ,perl-extutils-config))) -- cgit v1.2.3 From 9ad80992d0111afeedfb47cd3594397e844517ba Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 14:13:12 +0200 Subject: gnu: perl-config-autoconf: Update to 0.317. * gnu/packages/perl.scm (perl-config-autoconf): Update to 0.317. --- 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 54dd29deec..fc0553798b 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -1409,7 +1409,7 @@ supports XML, YAML, JSON, Apache-style configuration, and Perl code.") (define-public perl-config-autoconf (package (name "perl-config-autoconf") - (version "0.315") + (version "0.317") (source (origin (method url-fetch) @@ -1417,7 +1417,7 @@ supports XML, YAML, JSON, Apache-style configuration, and Perl code.") "Config-AutoConf-" version ".tar.gz")) (sha256 (base32 - "0h39x9rzrhhilpg8yxlzpka269qrzsjg0iy0c1b9xflqlvhx2g2b")))) + "1qcwib4yaml5z2283qy5khjcydyibklsnk8zrk9wzdzc5wnv5r01")))) (build-system perl-build-system) (propagated-inputs `(("perl-capture-tiny" ,perl-capture-tiny))) -- cgit v1.2.3 From bb5e06a35e55d687cbc5c64299d039e5de7d9c8c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 13:23:03 +0200 Subject: gnu: perl-pegex: Update to 0.67. * gnu/packages/perl.scm (perl-pegex): Update to 0.67. --- 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 fc0553798b..c4c3b665db 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6937,7 +6937,7 @@ for correctness.") (define-public perl-pegex (package (name "perl-pegex") - (version "0.64") + (version "0.67") (source (origin (method url-fetch) @@ -6946,7 +6946,7 @@ for correctness.") version ".tar.gz")) (sha256 (base32 - "1kb7y2cc3nibbn8i8y3vrzz1f9h3892nbf8jj88c5fdgpmj05q17")))) + "149015ra2figalxrnj72fz02qc5cm96xg6x8d6kmyanfmrrxzf9w")))) (build-system perl-build-system) (native-inputs `(("perl-file-sharedir-install" ,perl-file-sharedir-install) -- cgit v1.2.3 From bb105673b88cea5c290ea9a16094ce29fcf0f475 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 13:17:08 +0200 Subject: gnu: musl: Update to 1.1.20. * gnu/packages/musl.scm (musl): Update to 1.1.20. --- gnu/packages/musl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/musl.scm b/gnu/packages/musl.scm index ff789b8c6f..357372becd 100644 --- a/gnu/packages/musl.scm +++ b/gnu/packages/musl.scm @@ -28,17 +28,17 @@ (define-public musl (package (name "musl") - (version "1.1.19") + (version "1.1.20") (source (origin (method url-fetch) (uri (string-append "http://www.musl-libc.org/releases/" name "-" version ".tar.gz")) (sha256 (base32 - "1nf1wh44bhm8gdcfr75ayib29b99vpq62zmjymrq7f96h9bshnfv")))) + "0q8dsjxl41dccscv9a0r78bs7jap57mn4mni5pwbbip6s1qqggj4")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; Musl has no tests + `(#:tests? #f ; Musl has no tests #:configure-flags (list "--disable-gcc-wrapper"))) (synopsis "Small C standard library") -- cgit v1.2.3 From c2311644a5432eb118d5e789288a0ddf43990684 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 8 Sep 2018 14:56:54 +0200 Subject: gnu: signify: Update to 24. * gnu/packages/crypto.scm (signify): Update to 24. --- gnu/packages/crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index e070ef61ac..d9111135e8 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -126,7 +126,7 @@ communication, encryption, decryption, signatures, etc.") (define-public signify (package (name "signify") - (version "23") + (version "24") (source (origin (method url-fetch) (uri (string-append "https://github.com/aperezdc/signify/" @@ -134,7 +134,7 @@ communication, encryption, decryption, signatures, etc.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0c70mzawgahsvmsv4xdrass4pgyynd67ipd9lij0fgi8wkq0ns8w")))) + "0594vyvkq176xxzaz9xbq8qs0xdnr8s9gkd1prblwpdvnzmw0xvc")))) (build-system gnu-build-system) ;; TODO Build with libwaive (described in README.md), to implement something ;; like OpenBSD's pledge(). -- cgit v1.2.3 From b64e67ad40f7cf6d4867cd38eee0e4ec16cd6e9a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 8 Sep 2018 14:55:12 +0200 Subject: gnu: cloc: Update to 1.78. * gnu/packages/code.scm (cloc): Update to 1.78. [source]: Update URI. --- gnu/packages/code.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 85ee6c2877..b3fbea0b38 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -211,16 +211,16 @@ COCOMO model or user-provided parameters.") (define-public cloc (package (name "cloc") - (version "1.76") + (version "1.78") (source (origin (method url-fetch) (uri (string-append - "https://github.com/AlDanial/cloc/releases/download/v" version + "https://github.com/AlDanial/cloc/releases/download/" version "/cloc-" version ".tar.gz")) (sha256 (base32 - "05srlvzwisr7y7ymvzb5yfdsrspja27ysqdmkwhiiivy84mq2gnl")))) + "176xklr2qsgxh9zdb565gib6pp4gsm585rz5fvyphgjy4i679wkv")))) (build-system gnu-build-system) (inputs `(("coreutils" ,coreutils) -- cgit v1.2.3 From 81bf0fd0d4a7e78febb394576ea849285fc2d329 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Sep 2018 18:53:13 +0200 Subject: gnu: julia: Update objconv input. * gnu/packages/julia.scm (julia)[inputs]: Update the hash of "objconv", which does not have a stable URL. Add a file name and use HTTPS while at it. --- gnu/packages/julia.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 39e2322739..fb9b0eeedf 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -355,10 +355,12 @@ ("objconv" ,(origin (method url-fetch) - (uri "http://www.agner.org/optimize/objconv.zip") + ;; No versioned URL, see for updates. + (uri "https://www.agner.org/optimize/objconv.zip") + (file-name "objconv-2018-08-15.zip") (sha256 (base32 - "1fi7qa2sd9vb35dvkgripjf0fayzg2qmff215f8agfqfiwd1g8qs")))) + "09y4pwxfs6fl47cyingbf95i2rxx74wmycl9fd4ldcgvpx9bzdrx")))) ("dsfmt" ,(origin (method url-fetch) -- cgit v1.2.3 From 617cf5de922e54042e93696d341350149942c6c4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 Sep 2018 19:14:39 +0200 Subject: gnu: mpfr: Update home page. * gnu/packages/multiprecision.scm (mpfr)[home-page]: Use HTTPS. --- gnu/packages/multiprecision.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index e185a98359..4f5eac16b9 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -108,7 +108,7 @@ algebra.") library for performing multiple-precision, floating-point computations with correct rounding.") (license lgpl3+) - (home-page "http://www.mpfr.org/"))) + (home-page "https://www.mpfr.org/"))) (define-public mpc (package -- cgit v1.2.3 From 249846bfdee20e28cc38425aa454ce2f932441f9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 13:28:20 +0200 Subject: gnu: libsoup: Update to 2.64.0. * gnu/packages/gnome.scm (libsoup): Update to 2.64.0. [inputs]: Add LIBPSL. --- 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 13eb41e055..1a0cc9cc11 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2455,7 +2455,7 @@ libxml to ease remote use of the RESTful API.") (define-public libsoup (package (name "libsoup") - (version "2.62.3") + (version "2.64.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -2463,7 +2463,7 @@ libxml to ease remote use of the RESTful API.") name "-" version ".tar.xz")) (sha256 (base32 - "0whi8p03kpbp68kg6fg3vb7rhykjp7wn3nlbzy9j0p298zjss4nk")))) + "09z7g3spww3f84y8jmicdd6lqp360mbggpg5h1fq1v4p5ihcjnyr")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -2567,6 +2567,7 @@ libxml to ease remote use of the RESTful API.") ("libxml2" ,libxml2))) (inputs `(("glib-networking" ,glib-networking) + ("libpsl" ,libpsl) ("sqlite" ,sqlite))) (home-page "https://live.gnome.org/LibSoup/") (synopsis "GLib-based HTTP Library") -- cgit v1.2.3 From 37f9cfae43d8614904335434c91ea1c0d9d69508 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 13:34:31 +0200 Subject: gnu: msmtp: Update to 1.8.0. * gnu/packages/mail.scm (msmtp): Update to 1.8.0. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 4944dd7622..91a8822cfd 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1071,7 +1071,7 @@ which can add many functionalities to the base client.") (define-public msmtp (package (name "msmtp") - (version "1.6.8") + (version "1.8.0") (source (origin (method url-fetch) @@ -1079,7 +1079,7 @@ which can add many functionalities to the base client.") "/msmtp-" version ".tar.xz")) (sha256 (base32 - "1ysrnshvwhzwmvb2walw5i9jdzlvmckj7inr0xnvb26q0jirbzsm")))) + "1k9wwlapkxk9ql3xq05y6vwn6ziqk9b1v8lyhj1866qd02zhqwxx")))) (build-system gnu-build-system) (inputs `(("libidn" ,libidn) -- cgit v1.2.3 From 91b3a6d4db848ae5de65ca511dc2deb27c7cb7dc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 13:39:31 +0200 Subject: gnu: msmtp: Remove unneeded input. * gnu/packages/mail.scm (msmtp)[inputs]: Remove LIBIDN, which is only required when using OpenSSL (or GnuTLS sans IDN support). --- gnu/packages/mail.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 91a8822cfd..024e75aaa1 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1082,8 +1082,7 @@ which can add many functionalities to the base client.") "1k9wwlapkxk9ql3xq05y6vwn6ziqk9b1v8lyhj1866qd02zhqwxx")))) (build-system gnu-build-system) (inputs - `(("libidn" ,libidn) - ("libsecret" ,libsecret) + `(("libsecret" ,libsecret) ("gnutls" ,gnutls) ("zlib" ,zlib) ("gsasl" ,gsasl))) -- cgit v1.2.3 From e9c1492f66b0ca5c86d6f23655b713978a4d7644 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 13:58:31 +0200 Subject: gnu: glm: Update to 0.9.9.1. * gnu/packages/maths.scm (glm): Update to 0.9.9.1. --- 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 d2b9df01a7..ebbe2b0294 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3253,7 +3253,7 @@ Failure to do so will result in a library with poor performance.") (define-public glm (package (name "glm") - (version "0.9.9.0") + (version "0.9.9.1") (source (origin (method url-fetch) @@ -3261,7 +3261,7 @@ Failure to do so will result in a library with poor performance.") version "/glm-" version ".zip")) (sha256 (base32 - "0ihjadp2sb8w312a276skfjsljm3y41bjscbxf79wn23gi00giz1")))) + "042a23hmxfs429czkmlg5ixf28aikzfbw18780prj2gcd4flgw8h")))) (build-system cmake-build-system) (native-inputs `(("unzip" ,unzip))) -- cgit v1.2.3 From 1448fa254732a76fc138059043a6b5f12c71367b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 19:29:00 +0200 Subject: gnu: openal: Update to 1.19.0. * gnu/packages/audio.scm (openal): Update to 1.19.0. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e731569ae1..3b898c024a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1908,7 +1908,7 @@ lv2-c++-tools.") (define-public openal (package (name "openal") - (version "1.18.2") + (version "1.19.0") (source (origin (method url-fetch) (uri (string-append @@ -1916,7 +1916,7 @@ lv2-c++-tools.") version ".tar.bz2")) (sha256 (base32 - "10kydm8701a2kppiss9sdidn1820cmzhqgx1b2bsa5dsgzic32lz")))) + "1mhf5bsb58s1xk6hvxl7ly7rd4rpl9z8h07xl1q94brywykg7bgi")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From a617fd55df0fbdae951ec82b81ad512436e972ed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 20:01:57 +0200 Subject: gnu: OpenBLAS: Update source URI. * gnu/packages/maths.scm (openblas)[source](uri): Use the more stable SourceForge mirror. --- 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 ebbe2b0294..01bd03c600 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2846,8 +2846,8 @@ parts of it.") (source (origin (method url-fetch) - (uri (string-append "https://github.com/xianyi/OpenBLAS/tarball/v" - version)) + (uri (string-append "mirror://sourceforge/openblas/v" version "/OpenBLAS%20" + version "%20version.tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From 910a20e2b8ac6d1c331ff79535831cce6222b3a3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Sep 2018 07:59:06 +0200 Subject: gnu: jbig2dec: Replace with 0.15 [security fixes]. * gnu/packages/image.scm (jbig2dec-0.15): New public variable. (jbig2dec)[replacement]: New field. --- gnu/packages/image.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 81d22ed42d..78fb30c279 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -495,6 +496,7 @@ arithmetic ops.") (package (name "jbig2dec") (version "0.14") + (replacement jbig2dec-0.15) (source (origin (method url-fetch) @@ -519,6 +521,21 @@ work.") (home-page "https://jbig2dec.com") (license license:gpl2+))) +;; This is a bugfix release from an ongoing Ghostscript security audit. +;; It was released alongside Ghostscript 9.24. +(define-public jbig2dec-0.15 + (package + (inherit jbig2dec) + (version "0.15") + (source (origin + (inherit (package-source jbig2dec)) + (uri (string-append "https://github.com/ArtifexSoftware" + "/ghostpdl-downloads/releases/download/gs924/" + "jbig2dec-" version ".tar.gz")) + (sha256 + (base32 + "0m1qwpbjbirgw2fqznbajdhdhh35d6xa2csr64lpjz735pvimykb")))))) + (define-public openjpeg (package (name "openjpeg") -- cgit v1.2.3 From 0084744b3af0a6f8e125120143f57567902339a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Sep 2018 12:46:22 +0200 Subject: gnu: ghostscript: Update replacement to 9.24 [security fixes]. The following CVEs are fixed with this release: CVE-2018-15908, CVE-2018-15909, CVE-2018-15910, CVE-2018-15911, CVE-2018-16509, CVE-2018-16510, CVE-2018-16511, CVE-2018-16513, CVE-2018-16539, CVE-2018-16540, CVE-2018-16541, CVE-2018-16542, CVE-2018-16543. * gnu/packages/patches/ghostscript-CVE-2018-10194.patch: Delete file. * gnu/packages/patches/ghostscript-CVE-2018-16509.patch, gnu/packages/patches/ghostscript-bug-699708.patch: New files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/ghostscript.scm (ghostscript/fixed): Update to 9.24. [source](patches): Remove 'ghostscript-CVE-2018-10194.patch' and 'ghostscript-runpath.patch'. Add 'ghostscript-CVE-2018-16509.patch' and 'ghostscript-bug-699708.patch'. [arguments]: Add LDFLAGS to #:configure-flags, and a phase to create output directory. --- gnu/local.mk | 3 +- gnu/packages/ghostscript.scm | 37 +++- .../patches/ghostscript-CVE-2018-10194.patch | 52 ------ .../patches/ghostscript-CVE-2018-16509.patch | 193 +++++++++++++++++++++ gnu/packages/patches/ghostscript-bug-699708.patch | 160 +++++++++++++++++ 5 files changed, 389 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/ghostscript-CVE-2018-10194.patch create mode 100644 gnu/packages/patches/ghostscript-CVE-2018-16509.patch create mode 100644 gnu/packages/patches/ghostscript-bug-699708.patch diff --git a/gnu/local.mk b/gnu/local.mk index 278afbb257..0407fdc597 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -726,7 +726,8 @@ 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-dont-pass-linker-flags-via-response-files.patch \ - %D%/packages/patches/ghostscript-CVE-2018-10194.patch \ + %D%/packages/patches/ghostscript-CVE-2018-16509.patch \ + %D%/packages/patches/ghostscript-bug-699708.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 1240b1dc16..518e18397b 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,8 +39,10 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #: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)) (define-public lcms (package @@ -255,11 +258,39 @@ output file formats and printers.") (hidden-package (package (inherit ghostscript) + (version "9.24") (source (origin (inherit (package-source ghostscript)) - (patches (append (origin-patches (package-source ghostscript)) - (search-patches "ghostscript-CVE-2018-10194.patch")))))))) + (uri (string-append "https://github.com/ArtifexSoftware/" + "ghostpdl-downloads/releases/download/gs" + (string-delete #\. version) + "/ghostscript-" version ".tar.xz")) + (sha256 + (base32 + "1mk922rnml93w2g42yxiyn8xqanc50cm65irrgh0b6lp4kgifjfl")) + (patches (search-patches "ghostscript-CVE-2018-16509.patch" + "ghostscript-bug-699708.patch" + "ghostscript-no-header-creationdate.patch" + "ghostscript-no-header-id.patch" + "ghostscript-no-header-uuid.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments ghostscript) + ((#:configure-flags flags) + ;; Notice that we removed the 'ghostscript-runpath' patch above. + ;; The reason is that it conflicts with an upstream change that + ;; takes LDFLAGS into account. + `(cons (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + ,flags)) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'create-output-directory + (lambda* (#:key outputs #:allow-other-keys) + ;; Unfortunately the configure script refuses to function if + ;; the directory specified as -rpath does not already exist. + (mkdir-p (string-append (assoc-ref outputs "out") "/lib")) + #t))))))))) (define-public ghostscript/x (package/inherit ghostscript diff --git a/gnu/packages/patches/ghostscript-CVE-2018-10194.patch b/gnu/packages/patches/ghostscript-CVE-2018-10194.patch deleted file mode 100644 index 242e57c27c..0000000000 --- a/gnu/packages/patches/ghostscript-CVE-2018-10194.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix CVE-2018-10194: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10194 -https://bugs.ghostscript.com/show_bug.cgi?id=699255 - -Patch copied from upstream source repository: - -https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=39b1e54b2968620723bf32e96764c88797714879 - -From 39b1e54b2968620723bf32e96764c88797714879 Mon Sep 17 00:00:00 2001 -From: Ken Sharp -Date: Wed, 18 Apr 2018 15:46:32 +0100 -Subject: [PATCH] pdfwrite - Guard against trying to output an infinite number - -Bug #699255 " Buffer overflow on pprintg1 due to mishandle postscript file data to pdf" - -The file uses an enormous parameter to xyxhow, causing an overflow in -the calculation of text positioning (value > 1e39). - -Since this is basically a nonsense value, and PostScript only supports -real values up to 1e38, this patch follows the same approach as for -a degenerate CTM, and treats it as 0. - -Adobe Acrobat Distiller throws a limitcheck error, so we could do that -instead if this approach proves to be a problem. ---- - devices/vector/gdevpdts.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/devices/vector/gdevpdts.c b/devices/vector/gdevpdts.c -index 848ad781f..172fe6bc3 100644 ---- a/devices/vector/gdevpdts.c -+++ b/devices/vector/gdevpdts.c -@@ -103,9 +103,14 @@ append_text_move(pdf_text_state_t *pts, double dw) - static int - set_text_distance(gs_point *pdist, double dx, double dy, const gs_matrix *pmat) - { -- int code = gs_distance_transform_inverse(dx, dy, pmat, pdist); -+ int code; - double rounded; - -+ if (dx > 1e38 || dy > 1e38) -+ code = gs_error_undefinedresult; -+ else -+ code = gs_distance_transform_inverse(dx, dy, pmat, pdist); -+ - if (code == gs_error_undefinedresult) { - /* The CTM is degenerate. - Can't know the distance in user space. --- -2.18.0 - diff --git a/gnu/packages/patches/ghostscript-CVE-2018-16509.patch b/gnu/packages/patches/ghostscript-CVE-2018-16509.patch new file mode 100644 index 0000000000..50ffa3cb98 --- /dev/null +++ b/gnu/packages/patches/ghostscript-CVE-2018-16509.patch @@ -0,0 +1,193 @@ +Ghostscript 9.24 was released with an incomplete fix for CVE-2018-16509: +https://nvd.nist.gov/vuln/detail/CVE-2018-16509 +https://bugs.chromium.org/p/project-zero/issues/detail?id=1640#c19 +https://bugs.ghostscript.com/show_bug.cgi?id=699718 + +The reproducers no longer work after applying these commits: + +https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=5812b1b78fc4d36fdc293b7859de69241140d590 +https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=e914f1da46e33decc534486598dc3eadf69e6efb +https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=3e5d316b72e3965b7968bb1d96baa137cd063ac6 +https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=643b24dbd002fb9c131313253c307cf3951b3d47 + +This patch is a "squashed" version of those. + +diff --git a/Resource/Init/gs_setpd.ps b/Resource/Init/gs_setpd.ps +index bba3c8c0e..8fa7c51df 100644 +--- a/Resource/Init/gs_setpd.ps ++++ b/Resource/Init/gs_setpd.ps +@@ -95,27 +95,41 @@ level2dict begin + { % Since setpagedevice doesn't create new device objects, + % we must (carefully) reinstall the old parameters in + % the same device. +- .currentpagedevice pop //null currentdevice //null .trysetparams ++ .currentpagedevice pop //null currentdevice //null ++ { .trysetparams } .internalstopped ++ { ++ //null ++ } if + dup type /booleantype eq + { pop pop } +- { % This should never happen! ++ { + SETPDDEBUG { (Error in .trysetparams!) = pstack flush } if +- cleartomark pop pop pop ++ {cleartomark pop pop pop} .internalstopped pop ++ % if resetting the entire device state failed, at least put back the ++ % security related key ++ currentdevice //null //false mark /.LockSafetyParams ++ currentpagedevice /.LockSafetyParams .knownget not ++ {systemdict /SAFER .knownget not {//false} } if ++ .putdeviceparamsonly + /.installpagedevice cvx /rangecheck signalerror + } + ifelse pop pop + % A careful reading of the Red Book reveals that an erasepage + % should occur, but *not* an initgraphics. + erasepage .beginpage +- } bind def ++ } bind executeonly def + + /.uninstallpagedevice +- { 2 .endpage { .currentnumcopies //false .outputpage } if ++ { ++ {2 .endpage { .currentnumcopies //false .outputpage } if} .internalstopped pop + nulldevice + } bind def + + (%grestorepagedevice) cvn +- { .uninstallpagedevice grestore .installpagedevice ++ { ++ .uninstallpagedevice ++ grestore ++ .installpagedevice + } bind def + + (%grestoreallpagedevice) cvn +diff --git a/psi/zdevice2.c b/psi/zdevice2.c +index 0c7080d57..159a0c0d9 100644 +--- a/psi/zdevice2.c ++++ b/psi/zdevice2.c +@@ -251,8 +251,8 @@ z2currentgstate(i_ctx_t *i_ctx_p) + /* ------ Wrappers for operators that reset the graphics state. ------ */ + + /* Check whether we need to call out to restore the page device. */ +-static bool +-restore_page_device(const gs_gstate * pgs_old, const gs_gstate * pgs_new) ++static int ++restore_page_device(i_ctx_t *i_ctx_p, const gs_gstate * pgs_old, const gs_gstate * pgs_new) + { + gx_device *dev_old = gs_currentdevice(pgs_old); + gx_device *dev_new; +@@ -260,9 +260,10 @@ restore_page_device(const gs_gstate * pgs_old, const gs_gstate * pgs_new) + gx_device *dev_t2; + bool samepagedevice = obj_eq(dev_old->memory, &gs_int_gstate(pgs_old)->pagedevice, + &gs_int_gstate(pgs_new)->pagedevice); ++ bool LockSafetyParams = dev_old->LockSafetyParams; + + if ((dev_t1 = (*dev_proc(dev_old, get_page_device)) (dev_old)) == 0) +- return false; ++ return 0; + /* If we are going to putdeviceparams in a callout, we need to */ + /* unlock temporarily. The device will be re-locked as needed */ + /* by putdeviceparams from the pgs_old->pagedevice dict state. */ +@@ -271,23 +272,51 @@ restore_page_device(const gs_gstate * pgs_old, const gs_gstate * pgs_new) + dev_new = gs_currentdevice(pgs_new); + if (dev_old != dev_new) { + if ((dev_t2 = (*dev_proc(dev_new, get_page_device)) (dev_new)) == 0) +- return false; +- if (dev_t1 != dev_t2) +- return true; ++ samepagedevice = true; ++ else if (dev_t1 != dev_t2) ++ samepagedevice = false; ++ } ++ ++ if (LockSafetyParams && !samepagedevice) { ++ const int required_ops = 512; ++ const int required_es = 32; ++ ++ /* The %grestorepagedevice must complete: the biggest danger ++ is operand stack overflow. As we use get/putdeviceparams ++ that means pushing all the device params onto the stack, ++ pdfwrite having by far the largest number of parameters ++ at (currently) 212 key/value pairs - thus needing (currently) ++ 424 entries on the op stack. Allowing for working stack ++ space, and safety margin..... ++ */ ++ if (required_ops + ref_stack_count(&o_stack) >= ref_stack_max_count(&o_stack)) { ++ gs_currentdevice(pgs_old)->LockSafetyParams = LockSafetyParams; ++ return_error(gs_error_stackoverflow); ++ } ++ /* We also want enough exec stack space - 32 is an overestimate of ++ what we need to complete the Postscript call out. ++ */ ++ if (required_es + ref_stack_count(&e_stack) >= ref_stack_max_count(&e_stack)) { ++ gs_currentdevice(pgs_old)->LockSafetyParams = LockSafetyParams; ++ return_error(gs_error_execstackoverflow); ++ } + } + /* + * The current implementation of setpagedevice just sets new + * parameters in the same device object, so we have to check + * whether the page device dictionaries are the same. + */ +- return !samepagedevice; ++ return samepagedevice ? 0 : 1; + } + + /* - grestore - */ + static int + z2grestore(i_ctx_t *i_ctx_p) + { +- if (!restore_page_device(igs, gs_gstate_saved(igs))) ++ int code = restore_page_device(i_ctx_p, igs, gs_gstate_saved(igs)); ++ if (code < 0) return code; ++ ++ if (code == 0) + return gs_grestore(igs); + return push_callout(i_ctx_p, "%grestorepagedevice"); + } +@@ -297,7 +326,9 @@ static int + z2grestoreall(i_ctx_t *i_ctx_p) + { + for (;;) { +- if (!restore_page_device(igs, gs_gstate_saved(igs))) { ++ int code = restore_page_device(i_ctx_p, igs, gs_gstate_saved(igs)); ++ if (code < 0) return code; ++ if (code == 0) { + bool done = !gs_gstate_saved(gs_gstate_saved(igs)); + + gs_grestore(igs); +@@ -328,11 +359,15 @@ z2restore(i_ctx_t *i_ctx_p) + if (code < 0) return code; + + while (gs_gstate_saved(gs_gstate_saved(igs))) { +- if (restore_page_device(igs, gs_gstate_saved(igs))) ++ code = restore_page_device(i_ctx_p, igs, gs_gstate_saved(igs)); ++ if (code < 0) return code; ++ if (code > 0) + return push_callout(i_ctx_p, "%restore1pagedevice"); + gs_grestore(igs); + } +- if (restore_page_device(igs, gs_gstate_saved(igs))) ++ code = restore_page_device(i_ctx_p, igs, gs_gstate_saved(igs)); ++ if (code < 0) return code; ++ if (code > 0) + return push_callout(i_ctx_p, "%restorepagedevice"); + + code = dorestore(i_ctx_p, asave); +@@ -355,9 +390,12 @@ static int + z2setgstate(i_ctx_t *i_ctx_p) + { + os_ptr op = osp; ++ int code; + + check_stype(*op, st_igstate_obj); +- if (!restore_page_device(igs, igstate_ptr(op))) ++ code = restore_page_device(i_ctx_p, igs, igstate_ptr(op)); ++ if (code < 0) return code; ++ if (code == 0) + return zsetgstate(i_ctx_p); + return push_callout(i_ctx_p, "%setgstatepagedevice"); + } diff --git a/gnu/packages/patches/ghostscript-bug-699708.patch b/gnu/packages/patches/ghostscript-bug-699708.patch new file mode 100644 index 0000000000..1567be1c6f --- /dev/null +++ b/gnu/packages/patches/ghostscript-bug-699708.patch @@ -0,0 +1,160 @@ +Additional security fix that missed 9.24. + +Taken from upstream: +http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=fb713b3818b52d8a6cf62c951eba2e1795ff9624 + +From fb713b3818b52d8a6cf62c951eba2e1795ff9624 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Thu, 6 Sep 2018 09:16:22 +0100 +Subject: [PATCH] Bug 699708 (part 1): 'Hide' non-replaceable error handlers + for SAFER + +We already had a 'private' dictionary for non-standard errors: gserrordict. + +This now includes all the default error handlers, the dictionary is made +noaccess and all the prodedures are bound and executeonly. + +When running with -dSAFER, in the event of a Postscript error, instead of +pulling the handler from errordict, we'll pull it from gserrordict - thus +malicious input cannot trigger problems by the use of custom error handlers. + +errordict remains open and writeable, so files such as the Quality Logic tests +that install their own handlers will still 'work', with the exception that the +custom error handlers will not be called. + +This is a 'first pass', 'sledgehammer' approach: a nice addition would to allow +an integrator to specify a list of errors that are not to be replaced (for +example, embedded applications would probably want to ensure that VMerror is +always handled as they intend). +--- + Resource/Init/gs_init.ps | 29 ++++++++++++++++++----------- + psi/interp.c | 30 +++++++++++++++++++++--------- + 2 files changed, 39 insertions(+), 20 deletions(-) + +diff --git a/Resource/Init/gs_init.ps b/Resource/Init/gs_init.ps +index 071c39205..bc8b7951c 100644 +--- a/Resource/Init/gs_init.ps ++++ b/Resource/Init/gs_init.ps +@@ -881,7 +881,7 @@ userdict /.currentresourcefile //null put + { not exch pop exit } { pop } ifelse + } + for exch pop .quit +- } bind def ++ } bind executeonly def + /.errorhandler % .errorhandler - + { % Detect an internal 'stopped'. + 1 .instopped { //null eq { pop pop stop } if } if +@@ -926,7 +926,7 @@ userdict /.currentresourcefile //null put + $error /globalmode get $error /.nosetlocal get and .setglobal + $error /.inerror //false put + stop +- } bind def ++ } bind executeonly def + % Define the standard handleerror. We break out the printing procedure + % (.printerror) so that it can be extended for binary output + % if the Level 2 facilities are present. +@@ -976,7 +976,7 @@ userdict /.currentresourcefile //null put + ifelse % newerror + end + flush +- } bind def ++ } bind executeonly def + /.printerror_long % long error printout, + % $error is on the dict stack + { % Push the (anonymous) stack printing procedure. +@@ -1053,14 +1053,14 @@ userdict /.currentresourcefile //null put + { (Current file position is ) print position = } + if + +- } bind def ++ } bind executeonly def + % Define a procedure for clearing the error indication. + /.clearerror + { $error /newerror //false put + $error /errorname //null put + $error /errorinfo //null put + 0 .setoserrno +- } bind def ++ } bind executeonly def + + % Define $error. This must be in local VM. + .currentglobal //false .setglobal +@@ -1086,11 +1086,15 @@ end + /errordict ErrorNames length 3 add dict + .forcedef % errordict is local, systemdict is global + .setglobal % back to global VM +-% For greater Adobe compatibility, we put all non-standard errors in a +-% separate dictionary, gserrordict. It does not need to be in local VM, +-% because PostScript programs do not access it. ++% gserrordict contains all the default error handling methods, but unlike ++% errordict it is noaccess after creation (also it is in global VM). ++% When running 'SAFER', we'll ignore the contents of errordict, which ++% may have been tampered with by the running job, and always use gserrordict ++% gserrordict also contains any non-standard errors, for better compatibility ++% with Adobe. ++% + % NOTE: the name gserrordict is known to the interpreter. +-/gserrordict 5 dict def ++/gserrordict ErrorNames length 3 add dict def + % Register an error in errordict. We make this a procedure because we only + % register the Level 1 errors here: the rest are registered by "feature" + % files. However, ErrorNames contains all of the error names regardless of +@@ -1119,8 +1123,11 @@ errordict begin + } bind def + end % errordict + +-% Put non-standard errors in gserrordict. +-gserrordict /unknownerror errordict /unknownerror get put ++% Put all the default handlers in gserrordict ++gserrordict ++errordict {2 index 3 1 roll put} forall ++noaccess pop ++% remove the non-standard errors from errordict + errordict /unknownerror .undef + % Define a stable private copy of handleerror that we will always use under + % JOBSERVER mode. +diff --git a/psi/interp.c b/psi/interp.c +index c27b70dca..d41a9d3f5 100644 +--- a/psi/interp.c ++++ b/psi/interp.c +@@ -661,16 +661,28 @@ again: + return code; + if (gs_errorname(i_ctx_p, code, &error_name) < 0) + return code; /* out-of-range error code! */ +- /* +- * For greater Adobe compatibility, only the standard PostScript errors +- * are defined in errordict; the rest are in gserrordict. ++ ++ /* If LockFilePermissions is true, we only refer to gserrordict, which ++ * is not accessible to Postcript jobs + */ +- if (dict_find_string(systemdict, "errordict", &perrordict) <= 0 || +- (dict_find(perrordict, &error_name, &epref) <= 0 && +- (dict_find_string(systemdict, "gserrordict", &perrordict) <= 0 || +- dict_find(perrordict, &error_name, &epref) <= 0)) +- ) +- return code; /* error name not in errordict??? */ ++ if (i_ctx_p->LockFilePermissions) { ++ if (((dict_find_string(systemdict, "gserrordict", &perrordict) <= 0 || ++ dict_find(perrordict, &error_name, &epref) <= 0)) ++ ) ++ return code; /* error name not in errordict??? */ ++ } ++ else { ++ /* ++ * For greater Adobe compatibility, only the standard PostScript errors ++ * are defined in errordict; the rest are in gserrordict. ++ */ ++ if (dict_find_string(systemdict, "errordict", &perrordict) <= 0 || ++ (dict_find(perrordict, &error_name, &epref) <= 0 && ++ (dict_find_string(systemdict, "gserrordict", &perrordict) <= 0 || ++ dict_find(perrordict, &error_name, &epref) <= 0)) ++ ) ++ return code; /* error name not in errordict??? */ ++ } + doref = *epref; + epref = &doref; + /* Push the error object on the operand stack if appropriate. */ +-- +2.18.0 + -- cgit v1.2.3 From 842c44c9746f2acb132aab276338b1fac2143364 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 17:54:32 +0200 Subject: gnu: ghostscript: Remove graft for 9.24. * gnu/packages/patches/ghostscript-CVE-2018-10194.patch, gnu/packages/patches/ghostscript-runpath.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. * gnu/packages/ghostscript.scm (ghostscript): Update to 9.24. (ghostscript/fixed): Remove variable. --- gnu/local.mk | 2 - gnu/packages/ghostscript.scm | 57 +++++----------------- .../patches/ghostscript-CVE-2018-10194.patch | 52 -------------------- gnu/packages/patches/ghostscript-runpath.patch | 18 ------- 4 files changed, 13 insertions(+), 116 deletions(-) delete mode 100644 gnu/packages/patches/ghostscript-CVE-2018-10194.patch delete mode 100644 gnu/packages/patches/ghostscript-runpath.patch diff --git a/gnu/local.mk b/gnu/local.mk index c3cd1d4084..fbc9628227 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -728,13 +728,11 @@ 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-dont-pass-linker-flags-via-response-files.patch \ - %D%/packages/patches/ghostscript-CVE-2018-10194.patch \ %D%/packages/patches/ghostscript-CVE-2018-16509.patch \ %D%/packages/patches/ghostscript-bug-699708.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 \ - %D%/packages/patches/ghostscript-runpath.patch \ %D%/packages/patches/giflib-make-reallocarray-private.patch \ %D%/packages/patches/glib-networking-ssl-cert-file.patch \ %D%/packages/patches/glib-tests-timer.patch \ diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 3808d81524..b46451d94e 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -135,8 +135,7 @@ printing, and psresize, for adjusting page sizes.") (define-public ghostscript (package (name "ghostscript") - (replacement ghostscript/fixed) - (version "9.23") + (version "9.24") (source (origin (method url-fetch) @@ -146,9 +145,9 @@ printing, and psresize, for adjusting page sizes.") "/ghostscript-" version ".tar.xz")) (sha256 (base32 - "1ng8d9fm5lza7k1f7ybc791275c07z5hcmpkrl2i226nshkxrkhz")) - (patches (search-patches "ghostscript-runpath.patch" - "ghostscript-CVE-2018-10194.patch" + "1mk922rnml93w2g42yxiyn8xqanc50cm65irrgh0b6lp4kgifjfl")) + (patches (search-patches "ghostscript-CVE-2018-16509.patch" + "ghostscript-bug-699708.patch" "ghostscript-no-header-creationdate.patch" "ghostscript-no-header-id.patch" "ghostscript-no-header-uuid.patch")) @@ -167,7 +166,9 @@ printing, and psresize, for adjusting page sizes.") (arguments `(#:disallowed-references ("doc") #:configure-flags - (list "--with-system-libtiff" + (list (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + "--with-system-libtiff" "LIBS=-lz" (string-append "ZLIBDIR=" (assoc-ref %build-inputs "zlib") "/include") @@ -185,6 +186,12 @@ printing, and psresize, for adjusting page sizes.") '())) #:phases (modify-phases %standard-phases + (add-before 'configure 'create-output-directory + (lambda* (#:key outputs #:allow-other-keys) + ;; The configure script refuses to function if the directory + ;; specified as -rpath does not already exist. + (mkdir-p (string-append (assoc-ref outputs "out") "/lib")) + #t)) (add-after 'configure 'remove-doc-reference (lambda _ ;; Don't retain a reference to the 'doc' output in 'gs'. @@ -255,44 +262,6 @@ output file formats and printers.") (home-page "https://www.ghostscript.com/") (license license:agpl3+))) -(define-public ghostscript/fixed - (hidden-package - (package - (inherit ghostscript) - (version "9.24") - (source - (origin - (inherit (package-source ghostscript)) - (uri (string-append "https://github.com/ArtifexSoftware/" - "ghostpdl-downloads/releases/download/gs" - (string-delete #\. version) - "/ghostscript-" version ".tar.xz")) - (sha256 - (base32 - "1mk922rnml93w2g42yxiyn8xqanc50cm65irrgh0b6lp4kgifjfl")) - (patches (search-patches "ghostscript-CVE-2018-16509.patch" - "ghostscript-bug-699708.patch" - "ghostscript-no-header-creationdate.patch" - "ghostscript-no-header-id.patch" - "ghostscript-no-header-uuid.patch")))) - (arguments - (substitute-keyword-arguments (package-arguments ghostscript) - ((#:configure-flags flags) - ;; Notice that we removed the 'ghostscript-runpath' patch above. - ;; The reason is that it conflicts with an upstream change that - ;; takes LDFLAGS into account. - `(cons (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib") - ,flags)) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'create-output-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; Unfortunately the configure script refuses to function if - ;; the directory specified as -rpath does not already exist. - (mkdir-p (string-append (assoc-ref outputs "out") "/lib")) - #t))))))))) - (define-public ghostscript/x (package/inherit ghostscript (name (string-append (package-name ghostscript) "-with-x")) diff --git a/gnu/packages/patches/ghostscript-CVE-2018-10194.patch b/gnu/packages/patches/ghostscript-CVE-2018-10194.patch deleted file mode 100644 index 242e57c27c..0000000000 --- a/gnu/packages/patches/ghostscript-CVE-2018-10194.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix CVE-2018-10194: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10194 -https://bugs.ghostscript.com/show_bug.cgi?id=699255 - -Patch copied from upstream source repository: - -https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=39b1e54b2968620723bf32e96764c88797714879 - -From 39b1e54b2968620723bf32e96764c88797714879 Mon Sep 17 00:00:00 2001 -From: Ken Sharp -Date: Wed, 18 Apr 2018 15:46:32 +0100 -Subject: [PATCH] pdfwrite - Guard against trying to output an infinite number - -Bug #699255 " Buffer overflow on pprintg1 due to mishandle postscript file data to pdf" - -The file uses an enormous parameter to xyxhow, causing an overflow in -the calculation of text positioning (value > 1e39). - -Since this is basically a nonsense value, and PostScript only supports -real values up to 1e38, this patch follows the same approach as for -a degenerate CTM, and treats it as 0. - -Adobe Acrobat Distiller throws a limitcheck error, so we could do that -instead if this approach proves to be a problem. ---- - devices/vector/gdevpdts.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/devices/vector/gdevpdts.c b/devices/vector/gdevpdts.c -index 848ad781f..172fe6bc3 100644 ---- a/devices/vector/gdevpdts.c -+++ b/devices/vector/gdevpdts.c -@@ -103,9 +103,14 @@ append_text_move(pdf_text_state_t *pts, double dw) - static int - set_text_distance(gs_point *pdist, double dx, double dy, const gs_matrix *pmat) - { -- int code = gs_distance_transform_inverse(dx, dy, pmat, pdist); -+ int code; - double rounded; - -+ if (dx > 1e38 || dy > 1e38) -+ code = gs_error_undefinedresult; -+ else -+ code = gs_distance_transform_inverse(dx, dy, pmat, pdist); -+ - if (code == gs_error_undefinedresult) { - /* The CTM is degenerate. - Can't know the distance in user space. --- -2.18.0 - diff --git a/gnu/packages/patches/ghostscript-runpath.patch b/gnu/packages/patches/ghostscript-runpath.patch deleted file mode 100644 index 9f161e45b3..0000000000 --- a/gnu/packages/patches/ghostscript-runpath.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/base/unix-dll.mak b/base/unix-dll.mak -index 9d57a99..36ef1ff 100644 ---- a/base/unix-dll.mak -+++ b/base/unix-dll.mak -@@ -171,11 +171,11 @@ gpdl-so-links-subtarget: $(GPDL_SO) $(UNIX_DLL_MAK) $(MAKEDIRS) - # Build the small Ghostscript loaders, with Gtk+ and without - $(GSSOC_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS) - $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \ -- -L$(BINDIR) -l$(GS_SO_BASE) -+ -L$(BINDIR) -l$(GS_SO_BASE) -Wl,-rpath=$(libdir) - - $(GSSOX_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS) - $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \ -- -L$(BINDIR) -l$(GS_SO_BASE) $(SOC_LIBS) -+ -L$(BINDIR) -l$(GS_SO_BASE) $(SOC_LIBS) -Wl,-rpath=$(libdir) - - $(PCLSOC_XE): gpcl6-so-links-subtarget $(PLSRC)$(REALMAIN_SRC).c $(UNIX_DLL_MAK) $(MAKEDIRS) - $(GLCC) -g -o $(PCLSOC_XE) $(PLSRC)$(REALMAIN_SRC).c -L$(BINDIR) -l$(PCL_SO_BASE) -- cgit v1.2.3 From 16676fc3b1736781d085b0c047dbb6ae296ac4f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 17:55:33 +0200 Subject: gnu: curl: Remove graft for 7.61.1. * gnu/packages/curl.scm (curl): Update to 7.61.1. (curl-7.61.1): Remove variable. --- gnu/packages/curl.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index d4a620f1b3..b09afe328e 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -50,15 +50,14 @@ (define-public curl (package (name "curl") - (version "7.61.0") - (replacement curl-7.61.1) + (version "7.61.1") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "080p9r2kln8cbfj0rqfn6wqp5kdn9k5wp720nirkcw845lcmavpg")))) + "148qv1f32290r9pwg07mccawihz4srznkzsdwdl2xllvlgb16n9x")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -142,19 +141,6 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define-public curl-7.61.1 - (package - (inherit curl) - (version "7.61.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.xz")) - (sha256 - (base32 - "148qv1f32290r9pwg07mccawihz4srznkzsdwdl2xllvlgb16n9x")))))) - (define-public kurly (package (name "kurly") -- cgit v1.2.3 From 0171019418435888afb6024d04702683482d0294 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 17:57:39 +0200 Subject: gnu: openssl: Update to 1.0.2p. * gnu/packages/patches/openssl-1.0.2-CVE-2018-0495.patch, gnu/packages/patches/openssl-1.0.2-CVE-2018-0732.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. * gnu/packages/tls.scm (openssl): Update to 1.0.2p. [source](patches): Remove obsolete. --- gnu/local.mk | 2 - .../patches/openssl-1.0.2-CVE-2018-0495.patch | 215 --------------------- .../patches/openssl-1.0.2-CVE-2018-0732.patch | 50 ----- gnu/packages/tls.scm | 6 +- 4 files changed, 2 insertions(+), 271 deletions(-) delete mode 100644 gnu/packages/patches/openssl-1.0.2-CVE-2018-0495.patch delete mode 100644 gnu/packages/patches/openssl-1.0.2-CVE-2018-0732.patch diff --git a/gnu/local.mk b/gnu/local.mk index fbc9628227..ce1f8cc173 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1010,8 +1010,6 @@ dist_patch_DATA = \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/opensmtpd-fix-crash.patch \ %D%/packages/patches/openssl-runpath.patch \ - %D%/packages/patches/openssl-1.0.2-CVE-2018-0495.patch \ - %D%/packages/patches/openssl-1.0.2-CVE-2018-0732.patch \ %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ diff --git a/gnu/packages/patches/openssl-1.0.2-CVE-2018-0495.patch b/gnu/packages/patches/openssl-1.0.2-CVE-2018-0495.patch deleted file mode 100644 index 2d54ed03b9..0000000000 --- a/gnu/packages/patches/openssl-1.0.2-CVE-2018-0495.patch +++ /dev/null @@ -1,215 +0,0 @@ -Fix CVE-2018-0495: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-0495 -https://www.nccgroup.trust/us/our-research/technical-advisory-return-of-the-hidden-number-problem/ - -Patch copied from upstream source repository: - -https://github.com/openssl/openssl/commit/949ff36623eafc3523a9f91784992965018ffb05 - -From 949ff36623eafc3523a9f91784992965018ffb05 Mon Sep 17 00:00:00 2001 -From: Matt Caswell -Date: Fri, 25 May 2018 12:10:13 +0100 -Subject: [PATCH] Add blinding to an ECDSA signature - -Keegan Ryan (NCC Group) has demonstrated a side channel attack on an -ECDSA signature operation. During signing the signer calculates: - -s:= k^-1 * (m + r * priv_key) mod order - -The addition operation above provides a sufficient signal for a -flush+reload attack to derive the private key given sufficient signature -operations. - -As a mitigation (based on a suggestion from Keegan) we add blinding to -the operation so that: - -s := k^-1 * blind^-1 (blind * m + blind * r * priv_key) mod order - -Since this attack is a localhost side channel only no CVE is assigned. - -Reviewed-by: Rich Salz ---- - CHANGES | 4 ++ - crypto/ecdsa/ecdsatest.c | 9 ++++- - crypto/ecdsa/ecs_ossl.c | 82 ++++++++++++++++++++++++++++++++-------- - 3 files changed, 79 insertions(+), 16 deletions(-) - -diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c -index 0f301f86d9..a130fc9117 100644 ---- a/crypto/ecdsa/ecdsatest.c -+++ b/crypto/ecdsa/ecdsatest.c -@@ -137,7 +137,7 @@ int restore_rand(void) - return 1; - } - --static int fbytes_counter = 0; -+static int fbytes_counter = 0, use_fake = 0; - static const char *numbers[8] = { - "651056770906015076056810763456358567190100156695615665659", - "6140507067065001063065065565667405560006161556565665656654", -@@ -158,6 +158,11 @@ int fbytes(unsigned char *buf, int num) - int ret; - BIGNUM *tmp = NULL; - -+ if (use_fake == 0) -+ return old_rand->bytes(buf, num); -+ -+ use_fake = 0; -+ - if (fbytes_counter >= 8) - return 0; - tmp = BN_new(); -@@ -199,11 +204,13 @@ int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in) - /* create the key */ - if ((key = EC_KEY_new_by_curve_name(nid)) == NULL) - goto x962_int_err; -+ use_fake = 1; - if (!EC_KEY_generate_key(key)) - goto x962_int_err; - BIO_printf(out, "."); - (void)BIO_flush(out); - /* create the signature */ -+ use_fake = 1; - signature = ECDSA_do_sign(digest, 20, key); - if (signature == NULL) - goto x962_int_err; -diff --git a/crypto/ecdsa/ecs_ossl.c b/crypto/ecdsa/ecs_ossl.c -index 16d4f59b9b..1d37551803 100644 ---- a/crypto/ecdsa/ecs_ossl.c -+++ b/crypto/ecdsa/ecs_ossl.c -@@ -252,6 +252,7 @@ static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dgst_len, - { - int ok = 0, i; - BIGNUM *kinv = NULL, *s, *m = NULL, *tmp = NULL, *order = NULL; -+ BIGNUM *blind = NULL, *blindm = NULL; - const BIGNUM *ckinv; - BN_CTX *ctx = NULL; - const EC_GROUP *group; -@@ -269,14 +270,25 @@ static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dgst_len, - } - - ret = ECDSA_SIG_new(); -- if (!ret) { -+ if (ret == NULL) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE); - return NULL; - } - s = ret->s; - -- if ((ctx = BN_CTX_new()) == NULL || (order = BN_new()) == NULL || -- (tmp = BN_new()) == NULL || (m = BN_new()) == NULL) { -+ ctx = BN_CTX_new(); -+ if (ctx == NULL) { -+ ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE); -+ goto err; -+ } -+ -+ BN_CTX_start(ctx); -+ order = BN_CTX_get(ctx); -+ tmp = BN_CTX_get(ctx); -+ m = BN_CTX_get(ctx); -+ blind = BN_CTX_get(ctx); -+ blindm = BN_CTX_get(ctx); -+ if (blindm == NULL) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE); - goto err; - } -@@ -315,26 +327,70 @@ static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dgst_len, - } - } - -- if (!BN_mod_mul(tmp, priv_key, ret->r, order, ctx)) { -+ /* -+ * The normal signature calculation is: -+ * -+ * s := k^-1 * (m + r * priv_key) mod order -+ * -+ * We will blind this to protect against side channel attacks -+ * -+ * s := k^-1 * blind^-1 * (blind * m + blind * r * priv_key) mod order -+ */ -+ -+ /* Generate a blinding value */ -+ do { -+ if (!BN_rand(blind, BN_num_bits(order) - 1, -1, 0)) -+ goto err; -+ } while (BN_is_zero(blind)); -+ BN_set_flags(blind, BN_FLG_CONSTTIME); -+ BN_set_flags(blindm, BN_FLG_CONSTTIME); -+ BN_set_flags(tmp, BN_FLG_CONSTTIME); -+ -+ /* tmp := blind * priv_key * r mod order */ -+ if (!BN_mod_mul(tmp, blind, priv_key, order, ctx)) { -+ ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); -+ goto err; -+ } -+ if (!BN_mod_mul(tmp, tmp, ret->r, order, ctx)) { -+ ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); -+ goto err; -+ } -+ -+ /* blindm := blind * m mod order */ -+ if (!BN_mod_mul(blindm, blind, m, order, ctx)) { -+ ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); -+ goto err; -+ } -+ -+ /* s : = (blind * priv_key * r) + (blind * m) mod order */ -+ if (!BN_mod_add_quick(s, tmp, blindm, order)) { -+ ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); -+ goto err; -+ } -+ -+ /* s:= s * blind^-1 mod order */ -+ if (BN_mod_inverse(blind, blind, order, ctx) == NULL) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); - goto err; - } -- if (!BN_mod_add_quick(s, tmp, m, order)) { -+ if (!BN_mod_mul(s, s, blind, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); - goto err; - } -+ -+ /* s := s * k^-1 mod order */ - if (!BN_mod_mul(s, s, ckinv, order, ctx)) { - ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB); - goto err; - } -+ - if (BN_is_zero(s)) { - /* - * if kinv and r have been supplied by the caller don't to - * generate new kinv and r values - */ - if (in_kinv != NULL && in_r != NULL) { -- ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, -- ECDSA_R_NEED_NEW_SETUP_VALUES); -+ ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ECDSA_R_NEED_NEW_SETUP_VALUES); - goto err; - } - } else -@@ -349,15 +405,11 @@ static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dgst_len, - ECDSA_SIG_free(ret); - ret = NULL; - } -- if (ctx) -+ if (ctx != NULL) { -+ BN_CTX_end(ctx); - BN_CTX_free(ctx); -- if (m) -- BN_clear_free(m); -- if (tmp) -- BN_clear_free(tmp); -- if (order) -- BN_free(order); -- if (kinv) -+ } -+ if (kinv != NULL) - BN_clear_free(kinv); - return ret; - } --- -2.17.1 - diff --git a/gnu/packages/patches/openssl-1.0.2-CVE-2018-0732.patch b/gnu/packages/patches/openssl-1.0.2-CVE-2018-0732.patch deleted file mode 100644 index 50b95306a5..0000000000 --- a/gnu/packages/patches/openssl-1.0.2-CVE-2018-0732.patch +++ /dev/null @@ -1,50 +0,0 @@ -Fix CVE-2018-0732: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-0732 - -Patch copied from upstream source repository: - -https://github.com/openssl/openssl/commit/3984ef0b72831da8b3ece4745cac4f8575b19098 - -From 3984ef0b72831da8b3ece4745cac4f8575b19098 Mon Sep 17 00:00:00 2001 -From: Guido Vranken -Date: Mon, 11 Jun 2018 19:38:54 +0200 -Subject: [PATCH] Reject excessively large primes in DH key generation. - -CVE-2018-0732 - -Signed-off-by: Guido Vranken - -(cherry picked from commit 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe) - -Reviewed-by: Tim Hudson -Reviewed-by: Matt Caswell -(Merged from https://github.com/openssl/openssl/pull/6457) ---- - crypto/dh/dh_key.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c -index 387558f146..f235e0d682 100644 ---- a/crypto/dh/dh_key.c -+++ b/crypto/dh/dh_key.c -@@ -130,10 +130,15 @@ static int generate_key(DH *dh) - int ok = 0; - int generate_new_key = 0; - unsigned l; -- BN_CTX *ctx; -+ BN_CTX *ctx = NULL; - BN_MONT_CTX *mont = NULL; - BIGNUM *pub_key = NULL, *priv_key = NULL; - -+ if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) { -+ DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE); -+ return 0; -+ } -+ - ctx = BN_CTX_new(); - if (ctx == NULL) - goto err; --- -2.17.1 - diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f638c6094c..6cb739eb1f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -262,7 +262,7 @@ required structures.") (define-public openssl (package (name "openssl") - (version "1.0.2o") + (version "1.0.2p") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -274,10 +274,8 @@ required structures.") "/" name "-" version ".tar.gz"))) (sha256 (base32 - "0kcy13l701054nhpbd901mz32v1kn4g311z0nifd83xs2jbmqgzc")) + "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah")) (patches (search-patches "openssl-runpath.patch" - "openssl-1.0.2-CVE-2018-0495.patch" - "openssl-1.0.2-CVE-2018-0732.patch" "openssl-c-rehash-in.patch")))) (build-system gnu-build-system) (outputs '("out" -- cgit v1.2.3 From 6bbbdb1a34607690ca8413f29bb7bf5cacae2bcc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 31 Aug 2018 16:11:59 +0200 Subject: gnu: oath-toolkit: Fix FTBFS with Glibc >= 2.28. * gnu/packages/patches/oath-toolkit-glibc-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/authentication.scm (oath-toolkit)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/authentication.scm | 2 + .../patches/oath-toolkit-glibc-compat.patch | 90 ++++++++++++++++++++++ 3 files changed, 93 insertions(+) create mode 100644 gnu/packages/patches/oath-toolkit-glibc-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index ce1f8cc173..39cd55f105 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -994,6 +994,7 @@ dist_patch_DATA = \ %D%/packages/patches/nvi-db4.patch \ %D%/packages/patches/nyacc-binary-literals.patch \ %D%/packages/patches/nyx-show-header-stats-with-python3.patch \ + %D%/packages/patches/oath-toolkit-glibc-compat.patch \ %D%/packages/patches/ocaml-bisect-fix-camlp4-in-another-directory.patch \ %D%/packages/patches/ocaml-bitstring-fix-configure.patch \ %D%/packages/patches/ocaml-CVE-2015-8869.patch \ diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm index a58eac9890..68a6459828 100644 --- a/gnu/packages/authentication.scm +++ b/gnu/packages/authentication.scm @@ -17,6 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages authentication) + #:use-module (gnu packages) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (guix build-system gnu) @@ -35,6 +36,7 @@ (method url-fetch) (uri (string-append "https://download.savannah.nongnu.org/releases/" name "/" name "-" version ".tar.gz")) + (patches (search-patches "oath-toolkit-glibc-compat.patch")) (sha256 (base32 "182ah8vfbg0yhv6mh1b6ap944d0na6x7lpfkwkmzb6jl9gx4cd5h")))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/oath-toolkit-glibc-compat.patch b/gnu/packages/patches/oath-toolkit-glibc-compat.patch new file mode 100644 index 0000000000..22814599e5 --- /dev/null +++ b/gnu/packages/patches/oath-toolkit-glibc-compat.patch @@ -0,0 +1,90 @@ +Adjust the bundled Gnulib to cope with removal of libio interface in Glibc 2.28. + +Based on this upstream gnulib patch: +https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e + +--- a/liboath/gl/fflush.c ++++ b/liboath/gl/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 @@ + + #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 @@ + 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); + +--- a/liboath/gl/fpurge.c ++++ b/liboath/gl/fpurge.c +@@ -62,7 +62,7 @@ + /* 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. */ +--- a/libaoth/gl/freading.c ++++ b/liboath/gl/freading.c +@@ -31,7 +31,7 @@ + /* 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)); +--- a/liboath/gl/fseeko.c ++++ b/liboath/gl/fseeko.c +@@ -47,7 +47,7 @@ + #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 @@ + 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__ +--- a/liboath/gl/stdio-impl.h ++++ b/liboath/gl/stdio-impl.h +@@ -18,6 +18,11 @@ + 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, so define it here for now. */ ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN ++# define _IO_IN_BACKUP 0x100 ++#endif ++ + /* BSD stdio derived implementations. */ + + #if defined __NetBSD__ /* NetBSD */ -- cgit v1.2.3 From 436969904cef613b2fa0809cfa453d3db7e18d52 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Sep 2018 13:31:41 +0200 Subject: gnu: vigra: Fix FTBFS with Numpy >= 1.15. * gnu/packages/image.scm (vigra)[arguments]: Disable one more test. --- gnu/packages/image.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 03f08a614f..d3fad5d37a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -832,11 +832,15 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.") `(#:test-target "check" #:phases (modify-phases %standard-phases - ;; See https://github.com/ukoethe/vigra/issues/432 - (add-after 'unpack 'disable-broken-test + (add-after 'unpack 'disable-broken-tests (lambda _ + ;; See https://github.com/ukoethe/vigra/issues/432 (substitute* "test/fourier/CMakeLists.txt" (("VIGRA_ADD_TEST.*") "")) + ;; This test fails with Numpy 1.15: + ;; . + (substitute* "vigranumpy/test/CMakeLists.txt" + (("test1\\.py") "")) #t))) #:configure-flags (list "-Wno-dev" ; suppress developer mode with lots of warnings -- cgit v1.2.3 From f6f8645cc9337309eeae21e0d036a3167c4a85bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Sep 2018 13:32:54 +0200 Subject: gnu: libcmis: Fix FTBFS with Boost >= 1.68.0. * gnu/packages/libreoffice.scm (libcmis)[arguments]: Add phase to substitute header file name. --- gnu/packages/libreoffice.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 3dc7a4bbf2..690fa80512 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -316,7 +316,16 @@ working with graphics in the WPG (WordPerfect Graphics) format.") ;; During configure, the boost headers are found, but linking ;; fails without the following flag. (string-append "--with-boost=" - (assoc-ref %build-inputs "boost"))))) + (assoc-ref %build-inputs "boost"))) + #:phases (modify-phases %standard-phases + (add-before 'build 'fix-boost-include + (lambda _ + ;; This library moved in Boost and the compatibility + ;; redirect is no longer available since version 1.68.0. + (substitute* "src/libcmis/xml-utils.cxx" + (("boost/uuid/sha1.hpp") + "boost/uuid/detail/sha1.hpp")) + #t))))) (home-page "https://github.com/tdf/libcmis") (synopsis "CMIS client library") (description "LibCMIS is a C++ client library for the CMIS interface. It -- cgit v1.2.3 From 6cd715adef33e9ad6215e2183f5ab8e7ab0802d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Sep 2018 14:17:06 +0200 Subject: gnu: python-scipy: Update to 1.1.0. * gnu/packages/python.scm (python-scipy): Update to 1.1.0. --- 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 56176529c9..df98778c0f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3623,14 +3623,14 @@ functions.") (define-public python-scipy (package (name "python-scipy") - (version "1.0.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (pypi-uri "scipy" version)) (sha256 (base32 - "1fj0r7bg0cfk5clvl57ga06y9bfh05iwlv1dqqs1r6pd89wccfc7")))) + "1lfg686w6vv2m2dfs8v9d0bf2i18z7wz5vgzjnkgmpr4hi0550w7")))) (build-system python-build-system) (propagated-inputs `(("python-numpy" ,python-numpy) -- cgit v1.2.3 From 529c36225a623aa1b89d3b10c589db7e5cae0f99 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 14:28:46 +0200 Subject: gnu: fontconfig: Update to 2.13.1. * gnu/packages/fontutils.scm (fontconfig): Update to 2.13.1. --- 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 69e35cda0e..2ea4ff049e 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -237,14 +237,14 @@ fonts to/from the WOFF2 format.") (define-public fontconfig (package (name "fontconfig") - (version "2.13.0") + (version "2.13.1") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/fontconfig/release/fontconfig-" version ".tar.bz2")) (sha256 (base32 - "1fgf28zgsqh7x6dw30n6zi9z679gx6dyfyahp55z7dsm454yipci")))) + "0hb700a68kk0ip51wdlnjjc682kvlrmb6q920mzajykdk0mdsmgn")))) (build-system gnu-build-system) ;; In Requires or Requires.private of fontconfig.pc. (propagated-inputs `(("expat" ,expat) -- cgit v1.2.3 From ad8ae693c8518c927ec119e2aabe05bdf86e2912 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 17:36:04 +0200 Subject: gnu: python-pytest: Update to 3.8.0. * gnu/packages/check.scm (python-pytest): Update to 3.8.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 e3edff50a5..a2e156683e 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -619,14 +619,14 @@ standard library.") (define-public python-pytest (package (name "python-pytest") - (version "3.7.2") + (version "3.8.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest" version)) (sha256 (base32 - "00jv750alrj62r586hcmvpqlmkqszqfm1x7n6qnqacjmmlis2n9l")))) + "17grcfvd6ggvvqmprwv5y8g319nayam70hr43ssjwj40ws27z858")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 5d948c0c5de68187ea7c9397641b2332a66ad2ba Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 17:36:26 +0200 Subject: gnu: python-hypothesis: Update to 3.70.3. * gnu/packages/check.scm (python-hypothesis): Update to 3.70.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 a2e156683e..1373f17865 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1415,13 +1415,13 @@ normally the case.") (define-public python-hypothesis (package (name "python-hypothesis") - (version "3.68.2") + (version "3.70.3") (source (origin (method url-fetch) (uri (pypi-uri "hypothesis" version)) (sha256 (base32 - "15wlbdy148h3z0ckylf7zkszrfnnk254a6ld3qaf37lkf7hyp4r0")))) + "1rshs1japfmwgar98yrkq4hg4z2q76hlnq7w2n3lfbjnscn1jd9b")))) (build-system python-build-system) (native-inputs `(("python-flake8" ,python-flake8) -- cgit v1.2.3 From 9bb8b563a895132f2345d415b5877accbc1cd0b8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 18:48:50 +0200 Subject: gnu: meson: Update to 0.47.2. * gnu/packages/build-tools.scm (meson): Update to 0.47.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 1c9b41ef5b..8fcf128135 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -101,7 +101,7 @@ generate such a compilation database.") (define-public meson (package (name "meson") - (version "0.47.1") + (version "0.47.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -109,7 +109,7 @@ generate such a compilation database.") version ".tar.gz")) (sha256 (base32 - "19mdap2ncvczajx220bd73xmwhd8x906382y18cn9c5syxwxwwyn")))) + "1swmycf6p9p0ag6yiywyyri42ffkxxj38r2ic7in24km47cszn4j")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH -- cgit v1.2.3 From 9adaf1f4085e16667a034fc58984af847cab6b05 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 20:04:05 +0200 Subject: gnu: OpenBLAS: Update to 0.3.3. * gnu/packages/maths.scm (openblas): Update to 0.3.3. --- 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 01bd03c600..84459d5bea 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2842,7 +2842,7 @@ parts of it.") (define-public openblas (package (name "openblas") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) @@ -2851,7 +2851,7 @@ parts of it.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0b20km2jv7m6qiylrlvhq2vnmkmilb633mr8rhqmgbn1wqrp58jq")))) + "0cvlixnpc3cdvvn3f30phfvsgnqljqix6wn72ps9rj7xdhvw06jg")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From 589aca1c183ef1dfdef54d40fdd6a258bbcd39d0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 20:19:32 +0200 Subject: gnu: Python: Delete broken test. * gnu/packages/python.scm (python-3.7)[source](snippet): Delete test which may crash some systems. --- gnu/packages/python.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index df98778c0f..a057e2a6a3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -342,9 +342,15 @@ data types.") (snippet '(begin (for-each delete-file - '("Lib/ctypes/test/test_win32.py" ; fails on aarch64 - "Lib/test/test_fcntl.py" ; fails on aarch64 - "Lib/test/test_posix.py")) ; fails on aarch64 + '(;; This test may hang and eventually run out of + ;; memory on some systems: + ;; + "Lib/test/test_socket.py" + + ;; These tests fail on AArch64. + "Lib/ctypes/test/test_win32.py" + "Lib/test/test_fcntl.py" + "Lib/test/test_posix.py")) #t)))) (arguments (substitute-keyword-arguments (package-arguments python-2) -- cgit v1.2.3 From 2246c19218ca2d55f1126c15e82c666685af8540 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 21:28:22 +0200 Subject: gnu: mesa: Update to 18.1.8. * gnu/packages/gl.scm (mesa): Update to 18.1.8. --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 7c9e20e2ee..067b41b476 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -224,7 +224,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "18.1.7") + (version "18.1.8") (source (origin (method url-fetch) @@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "01kk42m2sjyc4k1nfw6k1lnzipjbbmp5js47drgdvp9vrqr3npk5")) + "06y28hpynb8w1qagznr85ml48hf8264w4ji6cmvm2fy7x5zyc6xx")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 7b1ad8b1d979b68313d6070134dcc449fe6f2626 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 21:54:21 +0200 Subject: gnu: gtk+: Update to 3.24.0. * gnu/packages/gtk.scm (gtk+): Update to 3.24.0. --- 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 7a70239684..111b6159d1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -672,7 +672,7 @@ application suites.") (name "gtk+") ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in ;; mate.scm will also need to be updated. - (version "3.22.30") + (version "3.24.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -680,7 +680,7 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "0rv5k8fyi2i19k4zncai6vf429s6zy3kncr8vb6f3m034z0sb951")) + "1a1jbsh9fg5ykmwrcl3svy7xfvx0b87d314qsx9n483pj8w93s82")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) -- cgit v1.2.3 From a34ce3308e8ac6cd515bf027ed191e722fb48e8d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 7 Sep 2018 22:26:44 +0200 Subject: gnu: gdk-pixbuf: Update to 2.38.0. * gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.38.0. [build-system]: Switch to MESON-BUILD-SYSTEM. [arguments]: Don't explicitly enable x11 in #:configure-flags. Prevent tests from getting installed. Adjust test substitutions. Add phase to fix install. [native-inputs]: Add GETTEXT-MINIMAL. (gdk-pixbuf+svg)[arguments]: Adjust accordingly. --- gnu/packages/gtk.scm | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 111b6159d1..b1a65a14c7 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -443,7 +443,7 @@ highlighting and other features typical of a source code editor.") (define-public gdk-pixbuf (package (name "gdk-pixbuf") - (version "2.36.12") + (version "2.38.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -451,26 +451,35 @@ highlighting and other features typical of a source code editor.") name "-" version ".tar.xz")) (sha256 (base32 - "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z")))) - (build-system gnu-build-system) + "0ixfmnxjylx06mjaw116apymwi1a8rnkmkbbvqaxxg2pfwy9fl6x")))) + (build-system meson-build-system) (arguments - '(#:configure-flags '("--with-x11") + '(#:configure-flags '("-Dinstalled-tests=false") #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-failing-tests (lambda _ - (substitute* "tests/Makefile.in" + (substitute* "tests/meson.build" ;; XXX FIXME: This test fails on armhf machines with: ;; SKIP Not enough memory to load bitmap image ;; ERROR: cve-2015-4491 - too few tests run (expected 4, got 2) - (("cve-2015-4491\\$\\(EXEEXT\\) ") "") + ((".*'cve-2015-4491'.*") "") ;; XXX FIXME: This test fails with: ;; ERROR:pixbuf-jpeg.c:74:test_type9_rotation_exif_tag: ;; assertion failed (error == NULL): Data differ ;; (gdk-pixbuf-error-quark, 0) - (("pixbuf-jpeg\\$\\(EXEEXT\\) ") "")) - #t))))) + ((".*'pixbuf-jpeg'.*") "")) + #t)) + (add-before 'configure 'aid-install-script + (lambda* (#:key outputs #:allow-other-keys) + ;; "build-aux/post-install.sh" invokes `gdk-pixbuf-query-loaders` + ;; for updating loader.cache, but it's not on PATH. Make it use + ;; the one we're installing. XXX: Won't work when cross-compiling. + (substitute* "build-aux/post-install.sh" + (("gdk-pixbuf-query-loaders" match) + (string-append (assoc-ref outputs "out") "/bin/" match))) + #t))))) (propagated-inputs `(;; Required by gdk-pixbuf-2.0.pc ("glib" ,glib) @@ -483,6 +492,7 @@ highlighting and other features typical of a source code editor.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config) + ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. (synopsis "GNOME image loading and manipulation library") @@ -502,7 +512,7 @@ in the GNOME project.") `(("librsvg" ,librsvg) ,@(package-inputs gdk-pixbuf))) (arguments - '(#:configure-flags '("--with-x11") + '(#:configure-flags '("-Dinstalled-tests=false") #:tests? #f ; tested by the gdk-pixbuf package already #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 334bd08c425efe9827d6baed415e7651a957e497 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Sep 2018 07:07:32 +0200 Subject: gnu: cmake: Update to 3.12.2. * gnu/packages/cmake.scm (cmake): Update to 3.12.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 03bce8b68d..5abf087557 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -44,7 +44,7 @@ (define-public cmake (package (name "cmake") - (version "3.12.1") + (version "3.12.2") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -52,7 +52,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "1ckswlaid3p2is1a80fmr4hgwpfsiif66giyx1z9ayhxx0n5qgf5")) + "19410mxgcyvk5q42phaclb1hz6rl08z4yj8iriq706p5k5bli5qg")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From de781c05e7dafde6468d371a8e34502b6930fe0a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 11:58:45 +0200 Subject: gnu: util-linux: Remove static library reference from '.la' files. * gnu/packages/linux.scm (util-linux)[arguments]: Substitute all '.la' files. --- 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 fc071a1338..dad5ba97b6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -645,7 +645,14 @@ providing the system administrator with some help in common tasks.") (rename-file file (string-append static "/" file))) - (find-files "lib" "\\.a$"))) + (find-files "lib" "\\.a$")) + + ;; Remove references to the static library from the '.la' + ;; files so that Libtool does the right thing when both + ;; the shared and static library is available. + (substitute* (find-files "lib" "\\.la$") + (("old_library=.*") "old_library=''\n"))) + #t)))))) (inputs `(("zlib" ,zlib) ("ncurses" ,ncurses) -- cgit v1.2.3 From 5e537222498d7f47ddda666de54ab5e0b3828462 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 12:59:11 +0200 Subject: gnu: jbig2dec: Don't build libjbig2dec.a. * gnu/packages/image.scm (jbig2dec)[arguments]: New field. --- gnu/packages/image.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index d3fad5d37a..451e7b14a1 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -497,6 +497,7 @@ arithmetic ops.") (base32 "0k01hp0q4275fj4rbr1gy64svfraw5w7wvwl08yjhvsnpb1rid11")) (patches (search-patches "jbig2dec-ignore-testtest.patch")))) (build-system gnu-build-system) + (arguments '(#:configure-flags '("--disable-static"))) (synopsis "Decoder of the JBIG2 image compression format") (description "JBIG2 is designed for lossy or lossless encoding of 'bilevel' (1-bit -- cgit v1.2.3 From 1d957c79b698241df612fc64b57a1c55cc7b55be Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 13:19:50 +0200 Subject: gnu: mariadb: Update to 10.1.36. * gnu/packages/databases.scm (mariadb): Update to 10.1.36. [arguments]: Disable one new test. --- gnu/packages/databases.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c652f39b12..e01ab88c2c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -621,7 +621,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.35") + (version "10.1.36") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.org/f/" @@ -629,7 +629,7 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0k9walaglwmwdwmkq48ir17g98n83vliyyg5wck22rjgxn2xk4cy")) + "0n5aj76mn9rxc21l2kjmfrg10bmsyy4cic68khjr94iby262wx5d")) (patches (search-patches "mariadb-client-test-32bit.patch")) (modules '((guix build utils))) (snippet @@ -707,6 +707,7 @@ Language.") ;; See . "main.join_cache" "main.explain_non_select" + "main.stat_tables_innodb" "roles.acl_statistics" ;; FIXME: This test fails on i686: -- cgit v1.2.3 From 4333d48a825c2327c22464de631cf81d05dd2719 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 13:22:43 +0200 Subject: gnu: mariadb: Move unbundle substitutions to source snippet. * gnu/packages/databases.scm (mariadb)[source](snippet): Add two substitutions from ... [arguments]: The 'unbundle' phase here. Rename to 'fix-pcre-detection. --- gnu/packages/databases.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e01ab88c2c..ff33088cb4 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -636,6 +636,13 @@ Language.") '(begin ;; Delete bundled snappy and xz. (delete-file-recursively "storage/tokudb/PerconaFT/third_party") + (substitute* "storage/tokudb/PerconaFT/CMakeLists.txt" + ;; This file checks that the bundled sources are present and + ;; declares build procedures for them. + (("^include\\(TokuThirdParty\\)") "")) + (substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt" + ;; Don't attempt to use the procedures we just removed. + ((" build_lzma build_snappy") "")) ;; Preserve CMakeLists.txt for these. (for-each (lambda (file) @@ -679,7 +686,7 @@ Language.") "-DINSTALL_SHAREDIR=share") #:phases (modify-phases %standard-phases - (add-after 'unpack 'unbundle + (add-after 'unpack 'fix-pcre-detection (lambda _ ;; The bundled PCRE in MariaDB has a patch that was upstreamed ;; in version 8.34. Unfortunately the upstream patch behaves @@ -688,16 +695,6 @@ Language.") ;; XXX: Consider patching PCRE instead. (substitute* "cmake/pcre.cmake" ((" OR NOT PCRE_STACK_SIZE_OK") "")) - - (substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt" - ;; Remove dependency on these CMake targets. - ((" build_lzma build_snappy") "")) - - (substitute* "storage/tokudb/PerconaFT/CMakeLists.txt" - ;; This file checks that the bundled sources are present and - ;; declares build procedures for them. We don't need that. - (("^include\\(TokuThirdParty\\)") "")) - #t)) (add-after 'unpack 'adjust-tests (lambda _ -- cgit v1.2.3 From c36d972531efd1afdc9e4e0dd4e73f5bb4146229 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Sun, 9 Sep 2018 21:59:08 +0200 Subject: gnu: Update texmaker to 5.0.2. * gnu/packages/tex.scm (texmaker): Update to 5.0.2. --- gnu/packages/tex.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 6ab999b2d5..be75bda7dd 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4244,14 +4244,14 @@ PDF documents.") (define-public texmaker (package (name "texmaker") - (version "4.5") + (version "5.0.2") (source (origin (method url-fetch) (uri (string-append "http://www.xm1math.net/texmaker/texmaker-" version ".tar.bz2")) (sha256 (base32 - "056njk6j8wma23mlp7xa3rgfaxx0q8ynwx8wkmj7iy0b85p9ds9c")))) + "0y81mjm89b99pr9svcwpaf4iz2q9pc9hjas5kiwd1pbgl5vqskm9")))) (build-system gnu-build-system) (arguments `(#:phases @@ -4262,9 +4262,9 @@ PDF documents.") (let ((out (assoc-ref outputs "out"))) (invoke "qmake" (string-append "PREFIX=" out) - (string-append "DESKTOPDIR=" out - "/share/applications") + (string-append "DESKTOPDIR=" out "/share/applications") (string-append "ICONDIR=" out "/share/pixmaps") + (string-append "METAINFODIR=" out "/share/metainfo") "texmaker.pro"))))))) (inputs `(("poppler-qt5" ,poppler-qt5) -- cgit v1.2.3 From 35c076e619c0a7c25456fceb2e694f76e0315db5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 9 Sep 2018 15:35:54 +0200 Subject: gnu: r-chippeakanno: Update to 3.14.2. * gnu/packages/bioconductor.scm (r-chippeakanno): Update to 3.14.2. --- gnu/packages/bioconductor.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a47a5aad05..108f3c398f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -410,14 +410,14 @@ determining dependencies between variables, code improvement suggestions.") (define-public r-chippeakanno (package (name "r-chippeakanno") - (version "3.14.1") + (version "3.14.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPpeakAnno" version)) (sha256 (base32 - "1cn1hfc3nvsf2n3563lkmvwjxfbiygx7f84zk683p89gy7zi1gyj")))) + "13rksc65lxxzyw11galh6xzvgzp5ii0gwiwpvrm395v2r17rhwsc")))) (properties `((upstream-name . "ChIPpeakAnno"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ab50580a9d9379b62b9d3e9db5f3402b8462dd98 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 9 Sep 2018 15:36:10 +0200 Subject: gnu: r-annotationhub: Update to 2.12.1. * gnu/packages/bioinformatics.scm (r-annotationhub): Update to 2.12.1. --- 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 2d5ec6d170..6580cac531 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9866,14 +9866,14 @@ Shiny-based display methods for Bioconductor objects.") (define-public r-annotationhub (package (name "r-annotationhub") - (version "2.12.0") + (version "2.12.1") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationHub" version)) (sha256 (base32 - "11gh7qkgazs90czdqgv74gh2hz26xrmdp6wsz9x5pygbxls8xdw3")))) + "02ls279k1qlch147vw8kwvlhcqyzvi495bgv110m0xnnbpgbln6g")))) (properties `((upstream-name . "AnnotationHub"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 45350539aa2c977ae04bfda0483834a2bd638fb3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 9 Sep 2018 15:36:19 +0200 Subject: gnu: r-chron: Update to 2.3-53. * gnu/packages/statistics.scm (r-chron): Update to 2.3-53. --- 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 ce7335619b..04979ffe25 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1749,13 +1749,13 @@ and density estimation.") (define-public r-chron (package (name "r-chron") - (version "2.3-52") + (version "2.3-53") (source (origin (method url-fetch) (uri (cran-uri "chron" version)) (sha256 (base32 - "185lfp75cv3l4cavg64sccj8lgc5sivch13n6gkannv3pd5cyzy4")))) + "02bkywwsxwrxc035hv51dxgdm1fjxdm7dn19ivifln59dfs1862j")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/chron") (synopsis "Chronological R objects which can handle dates and times") -- cgit v1.2.3 From 80ec1b73d2ca9745ea3b056bbfcecf3c33a4de5f Mon Sep 17 00:00:00 2001 From: Sahithi Yarlagadda Date: Tue, 4 Sep 2018 17:32:26 +0200 Subject: ui: Add support for colorization. * guix/ui.scm (ansi-color-tables): New variable. (color, colorize-string): New procedures. Signed-off-by: Ricardo Wurmus --- guix/ui.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/guix/ui.scm b/guix/ui.scm index 29c0b2b9ce..f8f2cad69f 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -10,6 +10,8 @@ ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 Benz Schenk ;;; Copyright © 2018 Kyle Meyer +;;; Copyright © 2013, 2014 Free Software Foundation, Inc. +;;; Copyright © 2018 Sahithi Yarlagadda ;;; ;;; This file is part of GNU Guix. ;;; @@ -115,7 +117,8 @@ guix-warning-port warning info - guix-main)) + guix-main + colorize-string)) ;;; Commentary: ;;; @@ -1622,4 +1625,54 @@ and signal handling has already been set up." (initialize-guix) (apply run-guix args)) +(define color-table + `((CLEAR . "0") + (RESET . "0") + (BOLD . "1") + (DARK . "2") + (UNDERLINE . "4") + (UNDERSCORE . "4") + (BLINK . "5") + (REVERSE . "6") + (CONCEALED . "8") + (BLACK . "30") + (RED . "31") + (GREEN . "32") + (YELLOW . "33") + (BLUE . "34") + (MAGENTA . "35") + (CYAN . "36") + (WHITE . "37") + (ON-BLACK . "40") + (ON-RED . "41") + (ON-GREEN . "42") + (ON-YELLOW . "43") + (ON-BLUE . "44") + (ON-MAGENTA . "45") + (ON-CYAN . "46") + (ON-WHITE . "47"))) + +(define (color . lst) + "Return a string containing the ANSI escape sequence for producing the +requested set of attributes in LST. Unknown attributes are ignored." + (let ((color-list + (remove not + (map (lambda (color) (assq-ref color-table color)) + lst)))) + (if (null? color-list) + "" + (string-append + (string #\esc #\[) + (string-join color-list ";" 'infix) + "m")))) + +(define (colorize-string str . color-list) + "Return a copy of STR colorized using ANSI escape sequences according to the +attributes STR. At the end of the returned string, the color attributes will +be reset such that subsequent output will not have any colors in effect." + (string-append + (apply color color-list) + str + (color 'RESET))) + ;;; ui.scm ends here -- cgit v1.2.3 From 15cc7e6adfa503a1cf168d19a952fae02f91ab2d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 4 Sep 2018 17:32:27 +0200 Subject: ui: Add soft port for styling and filtering build output. * guix/ui.scm (build-output-port): New procedure. * guix/scripts/package.scm (%default-options): Print build trace. (guix-package): Use build-output-port. * guix/scripts/build.scm (guix-build): Use build-output-port. Co-authored-by: Sahithi Yarlagadda --- guix/scripts/build.scm | 2 +- guix/scripts/package.scm | 39 ++++++++++------- guix/ui.scm | 109 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 132 insertions(+), 18 deletions(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 4dd4fbccdf..3fa3c2c20f 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -735,7 +735,7 @@ needed." (parameterize ((current-build-output-port (if quiet? (%make-void-port "w") - (current-error-port)))) + (build-output-port #:verbose? #t)))) (let* ((mode (assoc-ref opts 'build-mode)) (drv (options->derivations store opts)) (urls (map (cut string-append <> "/log") diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 97bcc699d9..73cbccba3b 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -329,7 +329,8 @@ ENTRIES, a list of manifest entries, in the context of PROFILE." `((verbosity . 0) (graft? . #t) (substitutes? . #t) - (build-hook? . #t))) + (build-hook? . #t) + (print-build-trace? . #t))) (define (show-help) (display (G_ "Usage: guix package [OPTION]... @@ -930,18 +931,24 @@ processed, #f otherwise." (arg-handler arg result) (leave (G_ "~A: extraneous argument~%") arg))) - (let ((opts (parse-command-line args %options (list %default-options #f) - #:argument-handler handle-argument))) - (with-error-handling - (or (process-query opts) - (parameterize ((%store (open-connection)) - (%graft? (assoc-ref opts 'graft?))) - (set-build-options-from-command-line (%store) opts) - - (parameterize ((%guile-for-build - (package-derivation - (%store) - (if (assoc-ref opts 'bootstrap?) - %bootstrap-guile - (canonical-package guile-2.2))))) - (process-actions (%store) opts))))))) + (define opts + (parse-command-line args %options (list %default-options #f) + #:argument-handler handle-argument)) + (define verbose? + (assoc-ref opts 'verbose?)) + + (with-error-handling + (or (process-query opts) + (parameterize ((%store (open-connection)) + (%graft? (assoc-ref opts 'graft?))) + (set-build-options-from-command-line (%store) opts) + + (parameterize ((%guile-for-build + (package-derivation + (%store) + (if (assoc-ref opts 'bootstrap?) + %bootstrap-guile + (canonical-package guile-2.2)))) + (current-build-output-port + (build-output-port #:verbose? verbose?))) + (process-actions (%store) opts)))))) diff --git a/guix/ui.scm b/guix/ui.scm index f8f2cad69f..1bbd37c255 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018 Kyle Meyer ;;; Copyright © 2013, 2014 Free Software Foundation, Inc. ;;; Copyright © 2018 Sahithi Yarlagadda +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -118,7 +119,7 @@ warning info guix-main - colorize-string)) + build-output-port)) ;;; Commentary: ;;; @@ -1675,4 +1676,110 @@ be reset such that subsequent output will not have any colors in effect." str (color 'RESET))) +(define* (build-output-port #:key + (colorize? #t) + verbose? + (port (current-error-port))) + "Return a soft port that processes build output. By default it colorizes +phase announcements and replaces any other output with a spinner." + (define spun? #f) + (define spin! + (let ((steps (circular-list "\\" "|" "/" "-"))) + (lambda () + (match steps + ((first . rest) + (set! steps rest) + (set! spun? #t) ; remember to erase spinner + first))))) + + (define use-color? + (and colorize? + (not (or (getenv "NO_COLOR") + (getenv "INSIDE_EMACS") + (not (isatty? port)))))) + + (define handle-string + (let* ((proc (if use-color? + colorize-string + (lambda (s . _) s))) + (rules `(("^(@ build-started) (.*) (.*)" + #:transform + ,(lambda (m) + (string-append + (proc "Building " 'BLUE 'BOLD) + (match:substring m 2) "\n"))) + ("^(@ build-failed) (.*) (.*)" + #:transform + ,(lambda (m) + (string-append + (proc "Build failed: " 'RED 'BOLD) + (match:substring m 2) "\n"))) + ("^(@ build-succeeded) (.*) (.*)" + #:transform + ,(lambda (m) + (string-append + (proc "Built " 'GREEN 'BOLD) + (match:substring m 2) "\n"))) + ("^(@ substituter-started) (.*) (.*)" + #:transform + ,(lambda (m) + (string-append + (proc "Substituting " 'BLUE 'BOLD) + (match:substring m 2) "\n"))) + ("^(@ substituter-failed) (.*) (.*) (.*)" + #:transform + ,(lambda (m) + (string-append + (proc "Substituter failed: " 'RED 'BOLD) + (match:substring m 2) "\n" + (match:substring m 3) ": " + (match:substring m 4) "\n"))) + ("^(@ substituter-succeeded) (.*)" + #:transform + ,(lambda (m) + (string-append + (proc "Substituted " 'GREEN 'BOLD) + (match:substring m 2) "\n"))) + ("^(starting phase )(.*)" + BLUE GREEN) + ("^(phase)(.*)(succeeded after)(.*)(seconds)(.*)" + GREEN BLUE GREEN BLUE GREEN BLUE) + ("^(phase)(.*)(failed after)(.*)(seconds)(.*)" + RED BLUE RED BLUE RED BLUE)))) + (lambda (str) + (let ((processed + (any (match-lambda + ((pattern #:transform transform) + (and=> (string-match pattern str) + transform)) + ((pattern . colors) + (and=> (string-match pattern str) + (lambda (m) + (let ((substrings + (map (cut match:substring m <>) + (iota (- (match:count m) 1) 1)))) + (string-join (map proc substrings colors) "")))))) + rules))) + (when spun? + (display (string #\backspace) port)) + (if processed + (begin + (display processed port) + (set! spun? #f)) + ;; Print unprocessed line, or replace with spinner + (display (if verbose? str (spin!)) port)))))) + (make-soft-port + (vector + ;; procedure accepting one character for output + (cut write <> port) + ;; procedure accepting a string for output + handle-string + ;; thunk for flushing output + (lambda () (force-output port)) + ;; thunk for getting one character + (const #t) + ;; thunk for closing port (not by garbage collection) + (lambda () (close port))) + "w")) + ;;; ui.scm ends here -- cgit v1.2.3 From ced98c7e89a22c551dd23acd7a1b4f861958d876 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 9 Sep 2018 17:48:24 -0400 Subject: gnu: libgd: Fix CVE-2018-{5711,1000222}. * gnu/packages/patches/gd-CVE-2018-1000222.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gd.scm (gd/fixed): New variable. * gnu/packages/php.scm (gd-for-php)[source]: Use 'gd-CVE-2018-1000222.patch'. --- gnu/local.mk | 1 + gnu/packages/gd.scm | 11 ++++ gnu/packages/patches/gd-CVE-2018-1000222.patch | 87 ++++++++++++++++++++++++++ gnu/packages/php.scm | 3 +- 4 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gd-CVE-2018-1000222.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0407fdc597..374e25165e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -719,6 +719,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcr-disable-failing-tests.patch \ %D%/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch \ %D%/packages/patches/gd-CVE-2018-5711.patch \ + %D%/packages/patches/gd-CVE-2018-1000222.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ %D%/packages/patches/gdm-CVE-2018-14424.patch \ diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index c374695524..327a1f1545 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -39,6 +39,7 @@ (define-public gd (package (name "gd") + (replacement gd/fixed) ;; Note: With libgd.org now pointing to github.com, genuine old ;; tarballs are no longer available. Notably, versions 2.0.x are ;; missing. @@ -91,6 +92,16 @@ most common applications of GD involve website development.") "See COPYING file in the distribution.")) (properties '((cpe-name . "libgd"))))) +(define-public gd/fixed + (hidden-package + (package + (inherit gd) + (source (origin + (inherit (package-source gd)) + (patches (append (origin-patches (package-source gd)) + (search-patches "gd-CVE-2018-5711.patch" + "gd-CVE-2018-1000222.patch")))))))) + (define-public perl-gd (package (name "perl-gd") diff --git a/gnu/packages/patches/gd-CVE-2018-1000222.patch b/gnu/packages/patches/gd-CVE-2018-1000222.patch new file mode 100644 index 0000000000..7e94295bb6 --- /dev/null +++ b/gnu/packages/patches/gd-CVE-2018-1000222.patch @@ -0,0 +1,87 @@ +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/php.scm b/gnu/packages/php.scm index 121ffab767..4981c60554 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -57,7 +57,8 @@ (inherit (package-source gd)) (patches (search-patches "gd-fix-tests-on-i686.patch" "gd-freetype-test-failure.patch" - "gd-CVE-2018-5711.patch")))))) + "gd-CVE-2018-5711.patch" + "gd-CVE-2018-1000222.patch")))))) (define-public php (package -- cgit v1.2.3 From d4bd2453ec6c2342d071cb9a9708280cf45b23ca Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 9 Sep 2018 16:38:22 -0400 Subject: gnu: certbot: Update to 0.27.1. * gnu/packages/tls.scm (python-acme): Update to 0.27.1. [arguments]: Use invoke. (certbot): Update to 0.27.1. [native-inputs]: Use python-sphinx-1.6. --- gnu/packages/tls.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e42b6dfc6c..5e49509ddd 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -518,20 +518,20 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "0.26.1") + (version "0.27.1") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "1glhwqj6yyb11820lspgd0gl5dqdfljn43kcy4ar5caccpsbbrw6")))) + "142gynlfx7yv0sdba3gpdxlnhg9chhz7hpdxdrp630z17h1bk9ri")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (add-after 'build 'build-documentation (lambda _ - (zero? (system* "make" "-C" "docs" "man" "info")))) + (invoke "make" "-C" "docs" "man" "info"))) (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -575,7 +575,7 @@ netcat implementation that supports TLS.") (uri (pypi-uri name version)) (sha256 (base32 - "0rnayqhdabm0rljxh76blqd11h51dqnwlwvql0j6xwzpccym30s9")))) + "0anh3vjy9sif1bkp25nj76ii37xx8hh0igcx60ppag12xlabsw1m")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) @@ -596,7 +596,7 @@ netcat implementation that supports TLS.") `(("python-nose" ,python-nose) ("python-mock" ,python-mock) ;; For documentation - ("python-sphinx" ,python-sphinx) + ("python-sphinx" ,python-sphinx-1.6) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) ("python-sphinx-repoze-autointerface" ,python-sphinx-repoze-autointerface) ("python-sphinxcontrib-programoutput" ,python-sphinxcontrib-programoutput) -- cgit v1.2.3 From 18784d8f11f62a3ebeb4050ff2d8be5e3623dbbf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 00:54:03 +0200 Subject: gnu: OpenSSL: Remove obsolete workaround. * gnu/packages/tls.scm (openssl)[arguments]: Remove workaround that is not needed for GCC version 5.3 and later. --- gnu/packages/tls.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 6cb739eb1f..22fcf6e96b 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -317,15 +317,7 @@ required structures.") (string-append "--openssldir=" out "/share/openssl-" ,version) - (string-append "--prefix=" out) - - ;; XXX FIXME: Work around a code generation bug in GCC - ;; 4.9.3 on ARM when compiled with -mfpu=neon. See: - ;; - ,@(if (and (not (%current-target-system)) - (string-prefix? "armhf" (%current-system))) - '("-mfpu=vfpv3") - '()))))) + (string-append "--prefix=" out))))) (add-after 'install 'make-libraries-writable (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From fb94354a69cacbeed1a24d30c46ba7f056186b65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 01:00:26 +0200 Subject: gnu: jbig2dec: Remove graft for 0.15. * gnu/packages/image.scm (jbig2dec): Update to 0.15. [source]: Reindent. (jbig2dec-0.15): Remove variable. --- gnu/packages/image.scm | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 451e7b14a1..62fc26ab91 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -485,17 +485,16 @@ arithmetic ops.") (define-public jbig2dec (package (name "jbig2dec") - (version "0.14") - (replacement jbig2dec-0.15) - (source - (origin - (method url-fetch) - (uri - (string-append "https://github.com/ArtifexSoftware/ghostpdl-downloads/" - "releases/download/gs922/" name "-" version ".tar.gz")) - (sha256 - (base32 "0k01hp0q4275fj4rbr1gy64svfraw5w7wvwl08yjhvsnpb1rid11")) - (patches (search-patches "jbig2dec-ignore-testtest.patch")))) + (version "0.15") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/ArtifexSoftware" + "/ghostpdl-downloads/releases/download" + "/gs924/" name "-" version ".tar.gz")) + (sha256 + (base32 + "0m1qwpbjbirgw2fqznbajdhdhh35d6xa2csr64lpjz735pvimykb")) + (patches (search-patches "jbig2dec-ignore-testtest.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) (synopsis "Decoder of the JBIG2 image compression format") @@ -512,21 +511,6 @@ work.") (home-page "https://jbig2dec.com") (license license:gpl2+))) -;; This is a bugfix release from an ongoing Ghostscript security audit. -;; It was released alongside Ghostscript 9.24. -(define-public jbig2dec-0.15 - (package - (inherit jbig2dec) - (version "0.15") - (source (origin - (inherit (package-source jbig2dec)) - (uri (string-append "https://github.com/ArtifexSoftware" - "/ghostpdl-downloads/releases/download/gs924/" - "jbig2dec-" version ".tar.gz")) - (sha256 - (base32 - "0m1qwpbjbirgw2fqznbajdhdhh35d6xa2csr64lpjz735pvimykb")))))) - (define-public openjpeg (package (name "openjpeg") -- cgit v1.2.3 From 68a08dfbe53301fb5c15470b52185e0578b5293e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 01:30:06 +0200 Subject: gnu: libgd: Incorporate grafted changes. * gnu/packages/gd.scm (gd)[replacement]: Remove field. [source](patches): Add "gd-CVE-2018-5711.patch" and "gd-CVE-2018-1000222.patch". (gd/fixed): Remove variable. * gnu/packages/php.scm (gd-for-php): Remove variable. (php)[inputs]: Change GD-FOR-PHP to GD. --- gnu/packages/gd.scm | 16 ++++------------ gnu/packages/php.scm | 12 +----------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 327a1f1545..1fe69577fd 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -39,7 +39,6 @@ (define-public gd (package (name "gd") - (replacement gd/fixed) ;; Note: With libgd.org now pointing to github.com, genuine old ;; tarballs are no longer available. Notably, versions 2.0.x are ;; missing. @@ -52,7 +51,10 @@ (sha256 (base32 "0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c")) - (patches (search-patches "gd-fix-tests-on-i686.patch" + + (patches (search-patches "gd-CVE-2018-5711.patch" + "gd-CVE-2018-1000222.patch" + "gd-fix-tests-on-i686.patch" "gd-freetype-test-failure.patch")))) (build-system gnu-build-system) (arguments @@ -92,16 +94,6 @@ most common applications of GD involve website development.") "See COPYING file in the distribution.")) (properties '((cpe-name . "libgd"))))) -(define-public gd/fixed - (hidden-package - (package - (inherit gd) - (source (origin - (inherit (package-source gd)) - (patches (append (origin-patches (package-source gd)) - (search-patches "gd-CVE-2018-5711.patch" - "gd-CVE-2018-1000222.patch")))))))) - (define-public perl-gd (package (name "perl-gd") diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 4981c60554..0efbec8057 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -50,16 +50,6 @@ #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:)) -(define gd-for-php - (package - (inherit gd) - (source (origin - (inherit (package-source gd)) - (patches (search-patches "gd-fix-tests-on-i686.patch" - "gd-freetype-test-failure.patch" - "gd-CVE-2018-5711.patch" - "gd-CVE-2018-1000222.patch")))))) - (define-public php (package (name "php") @@ -312,7 +302,7 @@ ("curl" ,curl) ("cyrus-sasl" ,cyrus-sasl) ("freetype" ,freetype) - ("gd" ,gd-for-php) + ("gd" ,gd) ("gdbm" ,gdbm) ("glibc" ,glibc) ("gmp" ,gmp) -- cgit v1.2.3 From 2bdc73fb26fda3a212a8efd358a6f3fd2adae9c0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 01:17:50 +0200 Subject: gnu: double-conversion: Don't use unstable tarball. * gnu/packages/maths.scm (double-conversion)[source]: Use GIT-FETCH. --- gnu/packages/maths.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 84459d5bea..1288cdc2c3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -279,12 +279,13 @@ enough to be used effectively as a scientific calculator.") (version "3.0.0") (home-page "https://github.com/google/double-conversion") (source (origin - (method url-fetch) - (uri (string-append home-page "/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "059r1czs28ljjd388pn6l3njg1ghbf1cv3q9nkxv3dj2a8siabqm")))) + "05m78wlwrg310mxh1cl3d8d0ishzfvzh84x64xmvng252m0vc8yz")))) (build-system cmake-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From 02107081daaa4086744ee11870ce7a3529de4410 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 01:19:17 +0200 Subject: gnu: double-conversion: Update to 3.1.0. * gnu/packages/maths.scm (double-conversion): Update to 3.1.0. --- gnu/packages/maths.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1288cdc2c3..4ac07dd98c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -276,16 +276,15 @@ enough to be used effectively as a scientific calculator.") (define-public double-conversion (package (name "double-conversion") - (version "3.0.0") + (version "3.1.0") (home-page "https://github.com/google/double-conversion") (source (origin (method git-fetch) - (uri (git-reference (url home-page) - (commit (string-append "v" version)))) + (uri (git-reference (url home-page) (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "05m78wlwrg310mxh1cl3d8d0ishzfvzh84x64xmvng252m0vc8yz")))) + "123rb2p4snqagrybw66vnapchqdwn2rfpr1wcq0ya9gwbyl7xccx")))) (build-system cmake-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From de15ff1a6c319a46046093d26baa6117c6a22e73 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 8 Aug 2018 01:00:13 -0400 Subject: gnu: Add asignify. * gnu/packages/crypto.scm (asignify): New variable. --- gnu/packages/crypto.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index d9111135e8..33f4abb5ae 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -816,3 +816,41 @@ which is also used in the Advanced Encryption Standard (AES, see @url{http://www.nist.gov/aes}). This cipher is believed to provide very strong security.") (license license:gpl2))) + +(define-public asignify + (let ((commit "f58e7977a599f040797975d649ed318e25cbd2d5") + (revision "0")) + (package + (name "asignify") + (version (git-version "1.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vstakhov/asignify.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zl68qq6js6fdahxzyhvhrpyrwlv8c2zhdplycnfxyr1ckkhq8dw")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--enable-openssl" + (string-append "--with-openssl=" + (assoc-ref %build-inputs "openssl"))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (inputs + `(("openssl" ,openssl-next))) + (home-page "https://github.com/vstakhov/asignify") + (synopsis "Cryptographic authentication and encryption tool and library") + (description "Asignify offers public cryptographic signatures and +encryption with a library or a command-line tool. The tool is heavily inspired +by signify as used in OpenBSD. The main goal of this project is to define a +high level API for signing files, validating signatures and encrypting using +public-key cryptography. Asignify is designed to be portable and self-contained +with zero external dependencies. Asignify can verify OpenBSD signatures, but it +cannot sign messages in OpenBSD format yet.") + (license license:bsd-2)))) -- cgit v1.2.3 From d930374014eb159ef1e01d7c54d04fadd4889e4a Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sat, 8 Sep 2018 23:50:57 +0800 Subject: gnu: youtube-dl: Update to 2018.08.04. * gnu/packages/video.scm (youtube-dl): Update to 2018.08.04. --- 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 3e074e6c3f..900575b828 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1270,7 +1270,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2018.08.04") + (version "2018.09.08") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1278,7 +1278,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "1hcx99qbbyigc8k98c8bcc6a2wnhq6493fmrkl7rysc8krlxr0pm")))) + "0vwc4faqdddrb3nm4fzmkr60n5rc2zwyy8jwrrjad60kcp8isf05")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 19de8273eefceac1ba6ddc8d7e374a13f57c678b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Sep 2018 22:29:40 +0200 Subject: services: tailon: Move to (gnu services web). This allows (gnu services admin) to remain deeper in the module graph and to be used by (gnu services web). * gnu/services/admin.scm () (tailon-configuration-files-string) (tailon-configuration-file-compiler, ) (tailon-shepherd-service, %tailon-accounts) (tailon-service-type): Move to... * gnu/services/web.scm: ... here. * gnu/tests/admin.scm: Remove. Move test to... * gnu/tests/web.scm (%tailon-os) (run-tailon-test, %test-tailon): ... here. --- gnu/local.mk | 1 - gnu/services/admin.scm | 174 +------------------------------------------------ gnu/services/web.scm | 172 +++++++++++++++++++++++++++++++++++++++++++++++- gnu/tests/admin.scm | 127 ------------------------------------ gnu/tests/web.scm | 99 +++++++++++++++++++++++++++- 5 files changed, 270 insertions(+), 303 deletions(-) delete mode 100644 gnu/tests/admin.scm diff --git a/gnu/local.mk b/gnu/local.mk index 374e25165e..bc01a3cd36 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -529,7 +529,6 @@ GNU_SYSTEM_MODULES = \ %D%/build/vm.scm \ \ %D%/tests.scm \ - %D%/tests/admin.scm \ %D%/tests/audio.scm \ %D%/tests/base.scm \ %D%/tests/databases.scm \ diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index aaf0b904fd..f08c896334 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -20,19 +20,14 @@ (define-module (gnu services admin) #:use-module (gnu packages admin) #:use-module (gnu packages base) - #:use-module (gnu packages logging) #:use-module (gnu services) #:use-module (gnu services mcron) #:use-module (gnu services shepherd) - #:use-module (gnu services web) - #:use-module (gnu system shadow) #:use-module (guix gexp) - #:use-module (guix store) #:use-module (guix packages) #:use-module (guix records) #:use-module (srfi srfi-1) #:use-module (ice-9 vlist) - #:use-module (ice-9 match) #:export (%default-rotations %rotated-files @@ -46,29 +41,7 @@ rottlog-configuration rottlog-configuration? rottlog-service - rottlog-service-type - - - tailon-configuration-file - tailon-configuration-file? - tailon-configuration-file-files - tailon-configuration-file-bind - tailon-configuration-file-relative-root - tailon-configuration-file-allow-transfers? - tailon-configuration-file-follow-names? - tailon-configuration-file-tail-lines - tailon-configuration-file-allowed-commands - tailon-configuration-file-debug? - tailon-configuration-file-http-auth - tailon-configuration-file-users - - - tailon-configuration - tailon-configuration? - tailon-configuration-config-file - tailon-configuration-package - - tailon-service-type)) + rottlog-service-type)) ;;; Commentary: ;;; @@ -203,149 +176,4 @@ Old log files are removed or compressed according to the configuration.") rotations))))) (default-value (rottlog-configuration)))) - -;;; -;;; Tailon -;;; - -(define-record-type* - tailon-configuration-file make-tailon-configuration-file - tailon-configuration-file? - (files tailon-configuration-file-files - (default '("/var/log"))) - (bind tailon-configuration-file-bind - (default "localhost:8080")) - (relative-root tailon-configuration-file-relative-root - (default #f)) - (allow-transfers? tailon-configuration-file-allow-transfers? - (default #t)) - (follow-names? tailon-configuration-file-follow-names? - (default #t)) - (tail-lines tailon-configuration-file-tail-lines - (default 200)) - (allowed-commands tailon-configuration-file-allowed-commands - (default '("tail" "grep" "awk"))) - (debug? tailon-configuration-file-debug? - (default #f)) - (wrap-lines tailon-configuration-file-wrap-lines - (default #t)) - (http-auth tailon-configuration-file-http-auth - (default #f)) - (users tailon-configuration-file-users - (default #f))) - -(define (tailon-configuration-files-string files) - (string-append - "\n" - (string-join - (map - (lambda (x) - (string-append - " - " - (cond - ((string? x) - (simple-format #f "'~A'" x)) - ((list? x) - (string-join - (cons (simple-format #f "'~A':" (car x)) - (map - (lambda (x) (simple-format #f " - '~A'" x)) - (cdr x))) - "\n")) - (else (error x))))) - files) - "\n"))) - -(define-gexp-compiler (tailon-configuration-file-compiler - (file ) system target) - (match file - (($ files bind relative-root - allow-transfers? follow-names? - tail-lines allowed-commands debug? - wrap-lines http-auth users) - (text-file - "tailon-config.yaml" - (string-concatenate - (filter-map - (match-lambda - ((key . #f) #f) - ((key . value) (string-append key ": " value "\n"))) - - `(("files" . ,(tailon-configuration-files-string files)) - ("bind" . ,bind) - ("relative-root" . ,relative-root) - ("allow-transfers" . ,(if allow-transfers? "true" "false")) - ("follow-names" . ,(if follow-names? "true" "false")) - ("tail-lines" . ,(number->string tail-lines)) - ("commands" . ,(string-append "[" - (string-join allowed-commands ", ") - "]")) - ("debug" . ,(if debug? "true" #f)) - ("wrap-lines" . ,(if wrap-lines "true" "false")) - ("http-auth" . ,http-auth) - ("users" . ,(if users - (string-concatenate - (cons "\n" - (map (match-lambda - ((user . pass) - (string-append - " " user ":" pass))) - users))) - #f))))))))) - -(define-record-type* - tailon-configuration make-tailon-configuration - tailon-configuration? - (config-file tailon-configuration-config-file - (default (tailon-configuration-file))) - (package tailon-configuration-package - (default tailon))) - -(define tailon-shepherd-service - (match-lambda - (($ config-file package) - (list (shepherd-service - (provision '(tailon)) - (documentation "Run the tailon daemon.") - (start #~(make-forkexec-constructor - `(,(string-append #$package "/bin/tailon") - "-c" ,#$config-file) - #:user "tailon" - #:group "tailon")) - (stop #~(make-kill-destructor))))))) - -(define %tailon-accounts - (list (user-group (name "tailon") (system? #t)) - (user-account - (name "tailon") - (group "tailon") - (system? #t) - (comment "tailon") - (home-directory "/var/empty") - (shell (file-append shadow "/sbin/nologin"))))) - -(define tailon-service-type - (service-type - (name 'tailon) - (description - "Run Tailon, a Web application for monitoring, viewing, and searching log -files.") - (extensions - (list (service-extension shepherd-root-service-type - tailon-shepherd-service) - (service-extension account-service-type - (const %tailon-accounts)))) - (compose concatenate) - (extend (lambda (parameter files) - (tailon-configuration - (inherit parameter) - (config-file - (let ((old-config-file - (tailon-configuration-config-file parameter))) - (tailon-configuration-file - (inherit old-config-file) - (files (append (tailon-configuration-file-files old-config-file) - files)))))))) - (default-value (tailon-configuration)))) - ;;; admin.scm ends here diff --git a/gnu/services/web.scm b/gnu/services/web.scm index df82a6de61..16e77f8243 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 nee ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2017 Christopher Baines ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,9 +33,11 @@ #:use-module (gnu packages web) #:use-module (gnu packages php) #:use-module (gnu packages guile) + #:use-module (gnu packages logging) #:use-module (guix records) #:use-module (guix modules) #:use-module (guix gexp) + #:use-module ((guix store) #:select (text-file)) #:use-module ((guix utils) #:select (version-major)) #:use-module ((guix packages) #:select (package-version)) #:use-module (srfi srfi-1) @@ -164,7 +167,29 @@ hpcguix-web-configuration hpcguix-web-configuration? - hpcguix-web-service-type)) + hpcguix-web-service-type + + + tailon-configuration-file + tailon-configuration-file? + tailon-configuration-file-files + tailon-configuration-file-bind + tailon-configuration-file-relative-root + tailon-configuration-file-allow-transfers? + tailon-configuration-file-follow-names? + tailon-configuration-file-tail-lines + tailon-configuration-file-allowed-commands + tailon-configuration-file-debug? + tailon-configuration-file-http-auth + tailon-configuration-file-users + + + tailon-configuration + tailon-configuration? + tailon-configuration-config-file + tailon-configuration-package + + tailon-service-type)) ;;; Commentary: ;;; @@ -980,3 +1005,148 @@ a webserver.") (const %hpcguix-web-activation)) (service-extension shepherd-root-service-type (compose list hpcguix-web-shepherd-service)))))) + + +;;; +;;; Tailon +;;; + +(define-record-type* + tailon-configuration-file make-tailon-configuration-file + tailon-configuration-file? + (files tailon-configuration-file-files + (default '("/var/log"))) + (bind tailon-configuration-file-bind + (default "localhost:8080")) + (relative-root tailon-configuration-file-relative-root + (default #f)) + (allow-transfers? tailon-configuration-file-allow-transfers? + (default #t)) + (follow-names? tailon-configuration-file-follow-names? + (default #t)) + (tail-lines tailon-configuration-file-tail-lines + (default 200)) + (allowed-commands tailon-configuration-file-allowed-commands + (default '("tail" "grep" "awk"))) + (debug? tailon-configuration-file-debug? + (default #f)) + (wrap-lines tailon-configuration-file-wrap-lines + (default #t)) + (http-auth tailon-configuration-file-http-auth + (default #f)) + (users tailon-configuration-file-users + (default #f))) + +(define (tailon-configuration-files-string files) + (string-append + "\n" + (string-join + (map + (lambda (x) + (string-append + " - " + (cond + ((string? x) + (simple-format #f "'~A'" x)) + ((list? x) + (string-join + (cons (simple-format #f "'~A':" (car x)) + (map + (lambda (x) (simple-format #f " - '~A'" x)) + (cdr x))) + "\n")) + (else (error x))))) + files) + "\n"))) + +(define-gexp-compiler (tailon-configuration-file-compiler + (file ) system target) + (match file + (($ files bind relative-root + allow-transfers? follow-names? + tail-lines allowed-commands debug? + wrap-lines http-auth users) + (text-file + "tailon-config.yaml" + (string-concatenate + (filter-map + (match-lambda + ((key . #f) #f) + ((key . value) (string-append key ": " value "\n"))) + + `(("files" . ,(tailon-configuration-files-string files)) + ("bind" . ,bind) + ("relative-root" . ,relative-root) + ("allow-transfers" . ,(if allow-transfers? "true" "false")) + ("follow-names" . ,(if follow-names? "true" "false")) + ("tail-lines" . ,(number->string tail-lines)) + ("commands" . ,(string-append "[" + (string-join allowed-commands ", ") + "]")) + ("debug" . ,(if debug? "true" #f)) + ("wrap-lines" . ,(if wrap-lines "true" "false")) + ("http-auth" . ,http-auth) + ("users" . ,(if users + (string-concatenate + (cons "\n" + (map (match-lambda + ((user . pass) + (string-append + " " user ":" pass))) + users))) + #f))))))))) + +(define-record-type* + tailon-configuration make-tailon-configuration + tailon-configuration? + (config-file tailon-configuration-config-file + (default (tailon-configuration-file))) + (package tailon-configuration-package + (default tailon))) + +(define tailon-shepherd-service + (match-lambda + (($ config-file package) + (list (shepherd-service + (provision '(tailon)) + (documentation "Run the tailon daemon.") + (start #~(make-forkexec-constructor + `(,(string-append #$package "/bin/tailon") + "-c" ,#$config-file) + #:user "tailon" + #:group "tailon")) + (stop #~(make-kill-destructor))))))) + +(define %tailon-accounts + (list (user-group (name "tailon") (system? #t)) + (user-account + (name "tailon") + (group "tailon") + (system? #t) + (comment "tailon") + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin"))))) + +(define tailon-service-type + (service-type + (name 'tailon) + (description + "Run Tailon, a Web application for monitoring, viewing, and searching log +files.") + (extensions + (list (service-extension shepherd-root-service-type + tailon-shepherd-service) + (service-extension account-service-type + (const %tailon-accounts)))) + (compose concatenate) + (extend (lambda (parameter files) + (tailon-configuration + (inherit parameter) + (config-file + (let ((old-config-file + (tailon-configuration-config-file parameter))) + (tailon-configuration-file + (inherit old-config-file) + (files (append (tailon-configuration-file-files old-config-file) + files)))))))) + (default-value (tailon-configuration)))) diff --git a/gnu/tests/admin.scm b/gnu/tests/admin.scm deleted file mode 100644 index a5abbe9ad4..0000000000 --- a/gnu/tests/admin.scm +++ /dev/null @@ -1,127 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Christopher Baines -;;; Copyright © 2018 Clément Lassieur -;;; -;;; 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 tests admin) - #:use-module (gnu tests) - #:use-module (gnu system) - #:use-module (gnu system file-systems) - #:use-module (gnu system shadow) - #:use-module (gnu system vm) - #:use-module (gnu services) - #:use-module (gnu services admin) - #:use-module (gnu services networking) - #:use-module (guix gexp) - #:use-module (guix store) - #:use-module (guix monads) - #:export (%test-tailon)) - -(define %tailon-os - ;; Operating system under test. - (simple-operating-system - (dhcp-client-service) - (service tailon-service-type - (tailon-configuration - (config-file - (tailon-configuration-file - (bind "0.0.0.0:8080"))))))) - -(define* (run-tailon-test #:optional (http-port 8081)) - "Run tests in %TAILON-OS, which has tailon running and listening on -HTTP-PORT." - (define os - (marionette-operating-system - %tailon-os - #:imported-modules '((gnu services herd) - (guix combinators)))) - - (define vm - (virtual-machine - (operating-system os) - (port-forwardings `((,http-port . 8080))))) - - (define test - (with-imported-modules '((gnu build marionette)) - #~(begin - (use-modules (srfi srfi-11) (srfi srfi-64) - (ice-9 match) - (gnu build marionette) - (web uri) - (web client) - (web response)) - - (define marionette - ;; Forward the guest's HTTP-PORT, where tailon is listening, to - ;; port 8080 in the host. - (make-marionette (list #$vm))) - - (mkdir #$output) - (chdir #$output) - - (test-begin "tailon") - - (test-assert "service running" - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (start-service 'tailon)) - marionette)) - - (define* (retry-on-error f #:key times delay) - (let loop ((attempt 1)) - (match (catch - #t - (lambda () - (cons #t - (f))) - (lambda args - (cons #f - args))) - ((#t . return-value) - return-value) - ((#f . error-args) - (if (>= attempt times) - error-args - (begin - (sleep delay) - (loop (+ 1 attempt)))))))) - - (test-equal "http-get" - 200 - (retry-on-error - (lambda () - (let-values (((response text) - (http-get #$(format - #f - "http://localhost:~A/" - http-port) - #:decode-body? #t))) - (response-code response))) - #:times 10 - #:delay 5)) - - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) - - (gexp->derivation "tailon-test" test)) - -(define %test-tailon - (system-test - (name "tailon") - (description "Connect to a running Tailon server.") - (value (run-tailon-test)))) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 73d502dd0e..45fcb668fb 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -33,7 +33,8 @@ #:export (%test-httpd %test-nginx %test-php-fpm - %test-hpcguix-web)) + %test-hpcguix-web + %test-tailon)) (define %index.html-contents ;; Contents of the /index.html file. @@ -359,3 +360,99 @@ HTTP-PORT, along with php-fpm." (name "hpcguix-web") (description "Connect to a running hpcguix-web server.") (value (run-hpcguix-web-server-test name %hpcguix-web-os)))) + + +(define %tailon-os + ;; Operating system under test. + (simple-operating-system + (dhcp-client-service) + (service tailon-service-type + (tailon-configuration + (config-file + (tailon-configuration-file + (bind "0.0.0.0:8080"))))))) + +(define* (run-tailon-test #:optional (http-port 8081)) + "Run tests in %TAILON-OS, which has tailon running and listening on +HTTP-PORT." + (define os + (marionette-operating-system + %tailon-os + #:imported-modules '((gnu services herd) + (guix combinators)))) + + (define vm + (virtual-machine + (operating-system os) + (port-forwardings `((,http-port . 8080))))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (srfi srfi-11) (srfi srfi-64) + (ice-9 match) + (gnu build marionette) + (web uri) + (web client) + (web response)) + + (define marionette + ;; Forward the guest's HTTP-PORT, where tailon is listening, to + ;; port 8080 in the host. + (make-marionette (list #$vm))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "tailon") + + (test-assert "service running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'tailon)) + marionette)) + + (define* (retry-on-error f #:key times delay) + (let loop ((attempt 1)) + (match (catch + #t + (lambda () + (cons #t + (f))) + (lambda args + (cons #f + args))) + ((#t . return-value) + return-value) + ((#f . error-args) + (if (>= attempt times) + error-args + (begin + (sleep delay) + (loop (+ 1 attempt)))))))) + + (test-equal "http-get" + 200 + (retry-on-error + (lambda () + (let-values (((response text) + (http-get #$(format + #f + "http://localhost:~A/" + http-port) + #:decode-body? #t))) + (response-code response))) + #:times 10 + #:delay 5)) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "tailon-test" test)) + +(define %test-tailon + (system-test + (name "tailon") + (description "Connect to a running Tailon server.") + (value (run-tailon-test)))) -- cgit v1.2.3 From 81317071fb9ad704ee75d40b5e8830650d37b34b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 7 Sep 2018 22:47:34 +0200 Subject: services: hpcguix-web: Produce a log file and rotate it. * gnu/services/web.scm (%hpcguix-web-log-file) (%hpcguix-web-log-rotations): New variables. (hpcguix-web-shepherd-service): Pass #:log-file. (hpcguix-web-service-type): Extend ROTTLOG-SERVICE-TYPE. --- gnu/services/web.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 16e77f8243..1c38e7d8d3 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson -;;; Copyright © 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2016 Nils Gillmann ;;; Copyright © 2016, 2017, 2018 Julien Lepiller ;;; Copyright © 2017 Christopher Baines @@ -27,6 +27,7 @@ (define-module (gnu services web) #:use-module (gnu services) #:use-module (gnu services shepherd) + #:use-module (gnu services admin) #:use-module (gnu system pam) #:use-module (gnu system shadow) #:use-module (gnu packages admin) @@ -974,6 +975,14 @@ a webserver.") (chown home-dir (passwd:uid user) (passwd:gid user)) (chmod home-dir #o755)))) +(define %hpcguix-web-log-file + "/var/log/hpcguix-web.log") + +(define %hpcguix-web-log-rotations + (list (log-rotation + (files (list %hpcguix-web-log-file)) + (frequency 'weekly)))) + (define (hpcguix-web-shepherd-service config) (let ((specs (hpcguix-web-configuration-specs config)) (hpcguix-web (hpcguix-web-package config))) @@ -991,7 +1000,8 @@ a webserver.") #:group "hpcguix-web" #:environment-variables (list "XDG_CACHE_HOME=/var/cache" - "SSL_CERT_DIR=/etc/ssl/certs"))) + "SSL_CERT_DIR=/etc/ssl/certs") + #:log-file #$%hpcguix-web-log-file)) (stop #~(make-kill-destructor)))))) (define hpcguix-web-service-type @@ -1003,6 +1013,8 @@ a webserver.") (const %hpcguix-web-accounts)) (service-extension activation-service-type (const %hpcguix-web-activation)) + (service-extension rottlog-service-type + (const %hpcguix-web-log-rotations)) (service-extension shepherd-root-service-type (compose list hpcguix-web-shepherd-service)))))) -- cgit v1.2.3 From 94b3b6041d8b141b99e79f4cf95c5a31a3739d17 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 10 Sep 2018 12:18:14 +0200 Subject: gnu: hpcguix-web: Update to 53e09ea. * gnu/packages/web.scm (hpcguix-web): Update to 53e09ea. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9567254424..6ff53a69e4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6708,8 +6708,8 @@ compressed JSON header blocks. (license l:expat))) (define-public hpcguix-web - (let ((commit "9ff40fcc77f248901d861756dbbddc80270c380c") - (revision "2")) + (let ((commit "53e09ea59ec0380b41a4cbda32df8bdb9a10004d") + (revision "3")) (package (name "hpcguix-web") (version (git-version "0.0.1" revision commit)) @@ -6721,7 +6721,7 @@ compressed JSON header blocks. (file-name (git-file-name name version)) (sha256 (base32 - "0lxcj9s3wxrv1l7lrxxx374jwzx7h60gxwkbgr46lzcbgvb3k26s")))) + "1ah4pn9697vazhbvd45n4b1rrkx2nbhnw384cr0b941q3sz1dfyc")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From e5eef324459291a7d48661e5d80954d6160f2a55 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:13:36 +0200 Subject: gnu: perl-module-runtime: Update to 0.016. * gnu/packages/perl.scm (perl-module-runtime): Update to 0.016. --- 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 4792b6fb49..46c1ce8010 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5224,7 +5224,7 @@ examine the contents, and perform some simple tasks. It can also load the (define-public perl-module-runtime (package (name "perl-module-runtime") - (version "0.014") + (version "0.016") (source (origin (method url-fetch) @@ -5232,7 +5232,7 @@ examine the contents, and perform some simple tasks. It can also load the "Module-Runtime-" version ".tar.gz")) (sha256 (base32 - "19326f094jmjs6mgpwkyisid54k67w34br8yfh0gvaaml87gwi2c")))) + "097hy2czwkxlppri32m599ph0xfvfsbf0a5y23a4fdc38v32wc38")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) (home-page "https://metacpan.org/release/Module-Runtime") -- cgit v1.2.3 From d4c04e509bb58e34ae14f76f05c54f1d7c1334d5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:24:34 +0200 Subject: gnu: Remove python-contextlib2. This package is part of the Python standard library since version 3.2. * gnu/packages/python.scm (python-contextlib2): Rename to ... (python2-contextlib2): ... this. Remove previous incarnation. [arguments]: Set #:python. --- gnu/packages/python.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a057e2a6a3..344de73603 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7159,9 +7159,9 @@ be set via config files and/or environment variables.") @code{ArgumentParser} object.") (license license:asl2.0))) -(define-public python-contextlib2 +(define-public python2-contextlib2 (package - (name "python-contextlib2") + (name "python2-contextlib2") (version "0.4.0") (source (origin @@ -7172,7 +7172,8 @@ be set via config files and/or environment variables.") "0cmp131dlh0d0zvw0aza1zd13glvngzk8lb4avks0hm7yxwdr9am")))) (build-system python-build-system) (arguments - `(#:phases + `(#:python ,python-2 + #:phases (modify-phases %standard-phases (replace 'check (lambda _ (zero? @@ -7187,9 +7188,6 @@ managers. It also contains additional features that are not part of the standard library.") (license license:psfl))) -(define-public python2-contextlib2 - (package-with-python2 python-contextlib2)) - (define-public python-texttable (package (name "python-texttable") -- cgit v1.2.3 From d06940882dad48607a99b1cb42f41a8609fac924 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:25:25 +0200 Subject: gnu: python2-contextlib2: Update to 0.5.5. * gnu/packages/python.scm (python2-contextlib2): Update to 0.5.5. [native-inputs]: Add PYTHON2-UNITTEST2. --- gnu/packages/python.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 344de73603..6c94c070a7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7162,14 +7162,14 @@ be set via config files and/or environment variables.") (define-public python2-contextlib2 (package (name "python2-contextlib2") - (version "0.4.0") + (version "0.5.5") (source (origin (method url-fetch) (uri (pypi-uri "contextlib2" version)) (sha256 (base32 - "0cmp131dlh0d0zvw0aza1zd13glvngzk8lb4avks0hm7yxwdr9am")))) + "0j6ad6lwwyc9kv71skj098v5l7x5biyj2hs4lc5x1kcixqcr97sh")))) (build-system python-build-system) (arguments `(#:python ,python-2 @@ -7179,6 +7179,8 @@ be set via config files and/or environment variables.") (lambda _ (zero? (system* "python" "test_contextlib2.py" "-v"))))))) + (native-inputs + `(("python2-unittest2" ,python2-unittest2))) (home-page "http://contextlib2.readthedocs.org/") (synopsis "Tools for decorators and context managers") (description "This module is primarily a backport of the Python -- cgit v1.2.3 From 073705e7253d59cfc2b3c629566027edd25308f1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:28:42 +0200 Subject: gnu: python2-contextlib2: Use 'invoke' instead of 'system*'. * gnu/packages/python.scm (python2-contextlib2)[arguments]: Use INVOKE. --- gnu/packages/python.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6c94c070a7..7f208c01a2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7176,9 +7176,7 @@ be set via config files and/or environment variables.") #:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? - (system* - "python" "test_contextlib2.py" "-v"))))))) + (lambda _ (invoke "python" "test_contextlib2.py" "-v")))))) (native-inputs `(("python2-unittest2" ,python2-unittest2))) (home-page "http://contextlib2.readthedocs.org/") -- cgit v1.2.3 From 4d19a14e777a2f53700453844504fedb7fb51946 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:29:40 +0200 Subject: gnu: python-llfuse: Update to 1.3.5. * gnu/packages/python.scm (python-llfuse): Update to 1.3.5. --- 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 7f208c01a2..8165e47349 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5983,13 +5983,13 @@ should be stored on various operating systems.") (define-public python-llfuse (package (name "python-llfuse") - (version "1.3.3") + (version "1.3.5") (source (origin (method url-fetch) (uri (pypi-uri "llfuse" version ".tar.bz2")) (sha256 (base32 - "1rqww632y2zz71xmr6ch7yq80kvza9mhqr2z773k0d8l1lwzl575")))) + "1n7a90jww3ly49fm7x27m3xw3la3qfrnykcakga654g6kcyjlhbf")))) (build-system python-build-system) (inputs `(("fuse" ,fuse) -- cgit v1.2.3 From 57d70dbabc5a274a63c0a2892bbd739520774f7a Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Sat, 8 Sep 2018 22:54:58 +0200 Subject: gnu: Add yad. * gnu/packages/gtk.scm (yad): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/gtk.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4daaad0ebc..0b85a1723f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1658,3 +1658,46 @@ Parcellite and adds bugfixes and features.") it does not deal with windowing system surfaces, drawing, scene graphs, or input.") (license license:expat))) + +(define-public yad + (package + (name "yad") + (version "0.40.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/v1cont/yad.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vpgbjbkkbk5plicyklzpf65j1vlig4n4bi3qpvrz5bb09ic5alw")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + '("--with-gtk=gtk3" + "--enable-html" + "--enable-gio" + "--enable-spell" + "--enable-icon-browser") + #:phases + (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + (invoke "autoreconf" "-vif") + (invoke "intltoolize" "--force" "--automake") + #t))))) + (inputs + `(("gtk+" ,gtk+))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (home-page "https://sourceforge.net/projects/yad-dialog/") + (synopsis "GTK+ dialog boxes for shell scripts") + (description + "This program allows you to display GTK+ dialog boxes from command line or +shell scripts. Example of how to use @code{yad} can be consulted at +@url{https://sourceforge.net/p/yad-dialog/wiki/browse_pages/}.") + (license license:gpl3+))) -- cgit v1.2.3 From f2d4944086e16e2e60d47b64189d2f04c1a3fb75 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 14:49:46 +0200 Subject: gnu: guile-xcb: Install compiled files to "lib" instead of "share". This follows up commit b03f270e3d5ab5315b50ef3ebac35735cc28d4a2 which removes the previous install location from Guiles search path. * gnu/packages/guile-wm.scm (guile-xcb)[arguments]: Amend #:configure-flags. --- gnu/packages/guile-wm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index 364477be72..3755282403 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -56,7 +56,7 @@ (string-append "--with-guile-site-ccache-dir=" (assoc-ref %outputs "out") - "/share/guile/site/2.2")))) + "/lib/guile/2.2/site-ccache")))) (native-inputs `(("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) (inputs `(("guile" ,guile-2.2) -- cgit v1.2.3 From f6c8a97a048131db67ffd275cbdebb5046247b91 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 21:45:48 +0200 Subject: gnu: spectrwm: Update to 3.2.0. * gnu/packages/wm.scm (spectrwm): Update to 3.2.0. [arguments]: Remove 'fix-freetype-include' phase. --- gnu/packages/wm.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 1a78b2ac94..08f82ba2d2 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -848,7 +848,7 @@ Keybinder works with GTK-based applications using the X Window System.") (define-public spectrwm (package (name "spectrwm") - (version "3.1.0") + (version "3.2.0") (source (origin (method url-fetch) @@ -859,7 +859,7 @@ Keybinder works with GTK-based applications using the X Window System.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "16lxcharxslf9rc39wxa3mr2nx5d8kzm9ls7p7dal8yrwr7y59dp")))) + "0z7gjmp1x6y8q3dnw6swvbv8x2wd4ykzjvi3ibk2sxhgc910907v")))) (build-system gnu-build-system) (arguments `(#:make-flags (let ((pkg-config (lambda (flag) @@ -871,7 +871,7 @@ Keybinder works with GTK-based applications using the X Window System.") (string-append "PREFIX=" %output) (string-append "INCS=-I. " (pkg-config "--cflags")) (string-append "LIBS=" (pkg-config "--libs") " -lm"))) - #:tests? #f ;No test suite + #:tests? #f ;no test suite #:phases (modify-phases %standard-phases (add-before 'build 'change-dir @@ -881,13 +881,7 @@ Keybinder works with GTK-based applications using the X Window System.") (lambda _ (substitute* "Makefile" (("-g") "")))) - (add-after 'change-dir 'fix-freetype-include - (lambda _ - (substitute* "Makefile" - (("/usr/include/freetype2") - (string-append (assoc-ref %build-inputs "freetype") - "/include/freetype2"))))) - (delete 'configure)))) ;no 'configure' exists + (delete 'configure)))) ;no 'configure' exists (inputs `(("freetype" ,freetype) ("fontconfig" ,fontconfig) -- cgit v1.2.3 From 419aa05e1b38d53e21c851baf89327d53fca07f3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Sep 2018 21:57:05 +0200 Subject: gnu: tinyproxy: Update to 1.10.0. * gnu/packages/web.scm (tinyproxy): Update to 1.10.0. [native-inputs]: Remove asciidoc. --- gnu/packages/web.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6ff53a69e4..b6bee57f9f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -889,7 +889,7 @@ used to validate and fix HTML data.") (define-public tinyproxy (package (name "tinyproxy") - (version "1.8.4") + (version "1.10.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/tinyproxy/tinyproxy/" @@ -897,7 +897,7 @@ used to validate and fix HTML data.") version ".tar.xz")) (sha256 (base32 - "002hi97687czhfkwsjkr174yvlp10224qi6gd5s53z230bgls7x4")))) + "10jnk6y2swld25mm47mjc0nkffyzsfysnsxwr7cs0ns1kil8ggjr")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -912,9 +912,6 @@ used to validate and fix HTML data.") ;; (substitute* "docs/man5/Makefile" (("a2x") "a2x -v")) ;; (setenv "XML_DEBUG_CATALOG" "1") #t))))) - ;; All of the below are used to generate the documentation - ;; (Should they be propagated inputs of asciidoc ??) - (native-inputs `(("asciidoc" ,asciidoc))) (home-page "https://tinyproxy.github.io/") (synopsis "Light-weight HTTP/HTTPS proxy daemon") (description "Tinyproxy is a light-weight HTTP/HTTPS proxy -- cgit v1.2.3 From 82d5c7c6de164df56d582ed779f02c6bbfd90b33 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 06:03:53 +0200 Subject: gnu: python-typing: Update to 3.6.6. * gnu/packages/python.scm (python-typing): Update to 3.6.6. --- 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 8c7c9d3c33..ea1093cf5e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13234,14 +13234,14 @@ source bytes using the UTF-8 encoding and then rewrites Python 3.6 style (define-public python-typing (package (name "python-typing") - (version "3.6.4") + (version "3.6.6") (source (origin (method url-fetch) (uri (pypi-uri "typing" version)) (sha256 (base32 - "1wmk9nkh30n37cbrqwkbggmj2390lhrlagjkd0ikm02l88saj06l")))) + "0ba9acs4awx15bf9v3nrs781msbd2nx826906nj6fqks2bvca9s0")))) (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 fc6256725174ec726caa05a33116b64974037509 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:54:50 +0200 Subject: gnu: Add python-dill. * gnu/packages/python.scm (python-dill): New variable. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ea1093cf5e..6f9a557c36 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14018,3 +14018,30 @@ scalable way of keeping track of data together with learned annotations and reduces the code overhead typically encountered when using a mostly object-oriented library such as @code{scikit-learn}.") (license license:bsd-3))) + +(define-public python-dill + (package + (name "python-dill") + (version "0.2.8.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "dill" version)) + (sha256 + (base32 + "1cymzn9fxwdy33h21zkk4gqgzvd25110hh3zdqnvnwa3p52c4kb2")))) + (build-system python-build-system) + ;; FIXME: The check phase fails with "don't know how to make test". + (arguments '(#:tests? #f)) + (home-page "https://pypi.org/project/dill") + (synopsis "Serialize all of Python") + (description "Dill extends Python's @code{pickle} module for serializing +and de-serializing Python objects to the majority of the built-in Python +types. Dill provides the user the same interface as the @code{pickle} module, +and also includes some additional features. In addition to pickling Python +objects, @code{dill} provides the ability to save the state of an interpreter +session in a single command. Hence, it would be feasable to save a +interpreter session, close the interpreter, ship the pickled file to another +computer, open a new interpreter, unpickle the session and thus continue from +the saved state of the original interpreter session.") + (license license:bsd-3))) -- cgit v1.2.3 From 943a4cb60158c28da1348e3b490e958551557d6a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:54:51 +0200 Subject: gnu: Add python-multiprocess. * gnu/packages/python.scm (python-multiprocess): New variable. --- gnu/packages/python.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6f9a557c36..59b62fec14 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14045,3 +14045,25 @@ interpreter session, close the interpreter, ship the pickled file to another computer, open a new interpreter, unpickle the session and thus continue from the saved state of the original interpreter session.") (license license:bsd-3))) + +(define-public python-multiprocess + (package + (name "python-multiprocess") + (version "0.70.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "multiprocess" version)) + (sha256 + (base32 + "1ip5caz67b3q0553mr8gm8xwsb8x500jn8ml0gihgyfy52m2ypcq")))) + (build-system python-build-system) + (propagated-inputs + `(("python-dill" ,python-dill))) + (home-page "https://pypi.org/project/multiprocess") + (synopsis "Multiprocessing and multithreading in Python") + (description + "This package is a fork of the multiprocessing Python package, a package +which supports the spawning of processes using the API of the standard +library's @code{threading} module.") + (license license:bsd-3))) -- cgit v1.2.3 From 7cd51cd28e401fc610ad49e3d0d3c8da1598d111 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:54:52 +0200 Subject: gnu: Add python-toolz. * gnu/packages/python.scm (python-toolz): New variable. --- gnu/packages/python.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 59b62fec14..eff28a9102 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14067,3 +14067,25 @@ the saved state of the original interpreter session.") which supports the spawning of processes using the API of the standard library's @code{threading} module.") (license license:bsd-3))) + +(define-public python-toolz + (package + (name "python-toolz") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "toolz" version)) + (sha256 + (base32 + "1j9i7fdjnx9dz35fdj5gvgxx6585ja9sxgaiv65if77nlxz0m7wj")))) + (build-system python-build-system) + ;; FIXME: tests cannot be computed: "Can't perform this operation for + ;; unregistered loader type" + (arguments '(#:tests? #f)) + (home-page "https://github.com/pytoolz/toolz/") + (synopsis "List processing tools and functional utilities") + (description + "This package provides a set of utility functions for iterators, +functions, and dictionaries.") + (license license:bsd-3))) -- cgit v1.2.3 From 098cb1e9c4548ccd78405141b32b6ec6d556c4b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:54:53 +0200 Subject: gnu: Add python-cytoolz. * gnu/packages/python.scm (python-cytoolz): New variable. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index eff28a9102..b6665ce3b5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14089,3 +14089,30 @@ library's @code{threading} module.") "This package provides a set of utility functions for iterators, functions, and dictionaries.") (license license:bsd-3))) + +(define-public python-cytoolz + (package + (name "python-cytoolz") + (version "0.9.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cytoolz" version)) + (sha256 + (base32 + "1r80p88hm3f3r4zpixzr047y5hw4bzy41m4xywnhycda83x0dk44")))) + (build-system python-build-system) + ;; FIXME: tests fail with "module 'cytoolz.curried' has no attribute + ;; 'exceptions'" + (arguments '(#:tests? #f)) + (propagated-inputs + `(("python-toolz" ,python-toolz))) + (native-inputs + `(("python-cython" ,python-cython))) + (home-page "https://github.com/pytoolz/cytoolz") + (synopsis "High performance functional utilities") + (description + "The cytoolz package implements the same API as provided by toolz. The +main differences are that @code{cytoolz} is faster and cytoolz offers a C API +that is accessible to other projects developed in Cython.") + (license license:bsd-3))) -- cgit v1.2.3 From 3d352cb9cf2d6ddd63e345a1eb2df7e3624d66a2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:54:54 +0200 Subject: gnu: Add python-sortedcontainers. * gnu/packages/python.scm (python-sortedcontainers): New variable. --- gnu/packages/python.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b6665ce3b5..b87c4787db 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14116,3 +14116,24 @@ functions, and dictionaries.") main differences are that @code{cytoolz} is faster and cytoolz offers a C API that is accessible to other projects developed in Cython.") (license license:bsd-3))) + +(define-public python-sortedcontainers + (package + (name "python-sortedcontainers") + (version "2.0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sortedcontainers" version)) + (sha256 + (base32 + "10hrk2k0hbf9x78vd3f0lj277m1yzfhzzxr0hja718liwb398wk0")))) + (build-system python-build-system) + (native-inputs + `(("python-tox" ,python-tox))) + (home-page "http://www.grantjenks.com/docs/sortedcontainers/") + (synopsis "Sorted List, Sorted Dict, Sorted Set") + (description + "This package provides a sorted collections library, written in +pure-Python.") + (license license:asl2.0))) -- cgit v1.2.3 From 930ba31d20f204ca0cee9ea6fedf1aab24195d49 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:59:56 +0200 Subject: gnu: Add python-cloudpickle. * gnu/packages/python.scm (python-cloudpickle): New variable. --- gnu/packages/python.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b87c4787db..c029fd1410 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14137,3 +14137,37 @@ that is accessible to other projects developed in Cython.") "This package provides a sorted collections library, written in pure-Python.") (license license:asl2.0))) + +(define-public python-cloudpickle + (package + (name "python-cloudpickle") + (version "0.5.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cloudpickle" version)) + (sha256 + (base32 + "0gdg5n025v4wqmdg65rm0n6fvp6731ip30ji0rmn2kqsyr4bb93f")))) + (build-system python-build-system) + ;; FIXME: there are 5 errors in 122 tests: + ;; ERROR: test_function_pickle_compat_0_4_0 (tests.cloudpickle_test.CloudPickleTest) + ;; ERROR: test_function_pickle_compat_0_4_1 (tests.cloudpickle_test.CloudPickleTest) + ;; ERROR: test_function_pickle_compat_0_4_0 (tests.cloudpickle_test.Protocol2CloudPickleTest) + ;; ERROR: test_function_pickle_compat_0_4_1 (tests.cloudpickle_test.Protocol2CloudPickleTest) + ;; ERROR: test_temp_file (tests.cloudpickle_file_test.CloudPickleFileTests) + ;; TypeError: cannot serialize '_io.BufferedRandom' object + (arguments '(#:tests? #f)) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-mock" ,python-mock) + ("python-tornado" ,python-tornado))) + (home-page "https://github.com/cloudpipe/cloudpickle") + (synopsis "Extended pickling support for Python objects") + (description + "Cloudpickle makes it possible to serialize Python constructs not +supported by the default pickle module from the Python standard library. It +is especially useful for cluster computing where Python expressions are +shipped over the network to execute on remote hosts, possibly close to the +data.") + (license license:bsd-3))) -- cgit v1.2.3 From b2b8226244ce176de63ca9f412efca1e3d80984c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:59:57 +0200 Subject: gnu: Add python-locket. * gnu/packages/python.scm (python-locket): New variable. --- gnu/packages/python.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c029fd1410..0a77355fba 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14171,3 +14171,22 @@ is especially useful for cluster computing where Python expressions are shipped over the network to execute on remote hosts, possibly close to the data.") (license license:bsd-3))) + +(define-public python-locket + (package + (name "python-locket") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "locket" version)) + (sha256 + (base32 + "1d4z2zngrpqkrfhnd4yhysh66kjn4mblys2l06sh5dix2p0n7vhz")))) + (build-system python-build-system) + (home-page "https://github.com/mwilliamson/locket.py") + (synopsis "File-based locks for Python") + (description + "Locket implements a lock that can be used by multiple processes provided +they use the same path.") + (license license:bsd-2))) -- cgit v1.2.3 From c27a9d8a880a07a3c108dac85d84d38bf287b2be Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:59:58 +0200 Subject: gnu: Add python-blosc. * gnu/packages/python.scm (python-blosc): New variable. --- gnu/packages/python.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0a77355fba..97b4ca86cd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14190,3 +14190,34 @@ data.") "Locket implements a lock that can be used by multiple processes provided they use the same path.") (license license:bsd-2))) + +(define-public python-blosc + (package + (name "python-blosc") + (version "1.5.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "blosc" version)) + (sha256 + (base32 + "1cm91c6r431yla2mbs4895bgiianjf30dfz14vvv99dslygd65jw")))) + (build-system python-build-system) + ;; FIXME: all tests pass, but then this error is printed: + ;; TypeError: calling returned None, not a test + (arguments '(#:tests? #f)) + (propagated-inputs + `(("python-numpy" ,python-numpy))) + (home-page "https://github.com/blosc/python-blosc") + (synopsis "Python wrapper for the Blosc data compressor library") + (description "Blosc is a high performance compressor optimized for binary +data. It has been designed to transmit data to the processor cache faster +than the traditional, non-compressed, direct memory fetch approach via a +@code{memcpy()} system call. + +Blosc works well for compressing numerical arrays that contains data with +relatively low entropy, like sparse data, time series, grids with +regular-spaced values, etc. + +This Python package wraps the Blosc library.") + (license license:bsd-3))) -- cgit v1.2.3 From 035989c403252f22015e363124bdc82a1116907f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 15:59:59 +0200 Subject: gnu: Add python-partd. * gnu/packages/python.scm (python-partd): New variable. --- gnu/packages/python.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 97b4ca86cd..b771452629 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14221,3 +14221,28 @@ regular-spaced values, etc. This Python package wraps the Blosc library.") (license license:bsd-3))) + +(define-public python-partd + (package + (name "python-partd") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "partd" version)) + (sha256 + (base32 + "03s0i5qfgkx6y24bmfgyd5hnsjznkbbfafwb2khf7k9790f1yab7")))) + (build-system python-build-system) + (propagated-inputs + `(("python-blosc" ,python-blosc) + ("python-locket" ,python-locket) + ("python-numpy" ,python-numpy) + ("python-pandas" ,python-pandas) + ("python-pyzmq" ,python-pyzmq) + ("python-toolz" ,python-toolz))) + (home-page "https://github.com/dask/partd/") + (synopsis "Appendable key-value storage") + (description "Partd stores key-value pairs. Values are raw bytes. We +append on old values. Partd excels at shuffling operations.") + (license license:bsd-3))) -- cgit v1.2.3 From a6a7156aa970b08821a00599d7941740d8a22b70 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 16:00:00 +0200 Subject: gnu: Add python-dask. * gnu/packages/python.scm (python-dask): New variable. --- gnu/packages/python.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b771452629..1d4b069d09 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14246,3 +14246,48 @@ This Python package wraps the Blosc library.") (description "Partd stores key-value pairs. Values are raw bytes. We append on old values. Partd excels at shuffling operations.") (license license:bsd-3))) + +(define-public python-dask + (package + (name "python-dask") + (version "0.19.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "dask" version)) + (sha256 + (base32 + "1pm1163qb6s22p8fnvj0zlfazihvs7hxjn8l2n52bzs7shw6kdz3")))) + (build-system python-build-system) + ;; A single test out of 5000+ fails. This test is marked as xfail when + ;; pytest-xdist is used. + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-broken-test + (lambda _ + (substitute* "dask/tests/test_threaded.py" + (("def test_interrupt\\(\\)" m) + (string-append "@pytest.mark.skip(reason=\"Disabled by Guix\")\n" + m))) + #t))))) + (propagated-inputs + `(("python-cloudpickle" ,python-cloudpickle) + ("python-numpy" ,python-numpy) + ("python-pandas" ,python-pandas) + ("python-partd" ,python-partd) + ("python-toolz" ,python-toolz) + ("python-pyyaml" ,python-pyyaml))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) + (home-page "https://github.com/dask/dask/") + (synopsis "Parallel computing with task scheduling") + (description + "Dask is a flexible parallel computing library for analytics. It +consists of two components: dynamic task scheduling optimized for computation, +and large data collections like parallel arrays, dataframes, and lists that +extend common interfaces like NumPy, Pandas, or Python iterators to +larger-than-memory or distributed environments. These parallel collections +run on top of the dynamic task schedulers. ") + (license license:bsd-3))) -- cgit v1.2.3 From a9d496b353e71f22e5ace5bff9319fc74dfb6643 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 16:00:01 +0200 Subject: gnu: Add python-intervaltree. * gnu/packages/bioinformatics.scm (python-intervaltree): New variable. --- gnu/packages/bioinformatics.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6580cac531..dd8ed725d8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13504,3 +13504,31 @@ reference transcripts provided in a annotation file (also in GTF/GFF3 format). (list license:expat ;license for gffcompare license:artistic2.0))))) ;license for gclib + +(define-public python-intervaltree + (package + (name "python-intervaltree") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "intervaltree" version)) + (sha256 + (base32 + "02w191m9zxkcjqr1kv2slxvhymwhj3jnsyy3a28b837pi15q19dc")))) + (build-system python-build-system) + ;; FIXME: error when collecting tests + (arguments '(#:tests? #f)) + (propagated-inputs + `(("python-sortedcontainers" ,python-sortedcontainers))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/chaimleib/intervaltree") + (synopsis "Editable interval tree data structure") + (description + "This package provides a mutable, self-balancing interval tree +implementation for Python. Queries may be by point, by range overlap, or by +range envelopment. This library was designed to allow tagging text and time +intervals, where the intervals include the lower bound but not the upper +bound.") + (license license:asl2.0))) -- cgit v1.2.3 From 1f41f01c1499fb0aa5933b9b60d2a18c2bef9d5c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 16:00:02 +0200 Subject: gnu: Add python-pypairix. * gnu/packages/bioinformatics.scm (python-pypairix): New variable. --- gnu/packages/bioinformatics.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index dd8ed725d8..9b047c21b8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13532,3 +13532,27 @@ range envelopment. This library was designed to allow tagging text and time intervals, where the intervals include the lower bound but not the upper bound.") (license license:asl2.0))) + +(define-public python-pypairix + (package + (name "python-pypairix") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pypairix" version)) + (sha256 + (base32 + "0zs92b74s5v4xy2h16s15f3z6l4nnbw8x8zyif7xx5xpafjn0xss")))) + (build-system python-build-system) + ;; FIXME: the tests fail because test.support cannot be loaded: + ;; ImportError: cannot import name 'support' + (arguments '(#:tests? #f)) + (inputs + `(("zlib" ,zlib))) + (home-page "https://github.com/4dn-dcic/pairix") + (synopsis "Support for querying pairix-indexed bgzipped text files") + (description + "Pypairix is a Python module for fast querying on a pairix-indexed +bgzipped text file that contains a pair of genomic coordinates per line.") + (license license:expat))) -- cgit v1.2.3 From 80f4db91b17ff5d82260c9194ec09a408f854455 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 16:00:03 +0200 Subject: gnu: Add python-pyfaidx. * gnu/packages/bioinformatics.scm (python-pyfaidx): New variable. --- gnu/packages/bioinformatics.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9b047c21b8..d66d9ef40e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13556,3 +13556,25 @@ bound.") "Pypairix is a Python module for fast querying on a pairix-indexed bgzipped text file that contains a pair of genomic coordinates per line.") (license license:expat))) + +(define-public python-pyfaidx + (package + (name "python-pyfaidx") + (version "0.5.4.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyfaidx" version)) + (sha256 + (base32 + "0y5zyjksj1rdglj601xd2bbni5abhdh622y3ck76chyzxz9z4rx8")))) + (build-system python-build-system) + (propagated-inputs + `(("python-setuptools" ,python-setuptools) + ("python-six" ,python-six))) + (home-page "http://mattshirley.com") + (synopsis "Random access to fasta subsequences") + (description + "This package provides procedures for efficient pythonic random access to +fasta subsequences.") + (license license:bsd-3))) -- cgit v1.2.3 From 5bb9e0af8dce2d4a9e66c9f673daa3af8fbae99b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 16:00:04 +0200 Subject: gnu: Add python-cooler. * gnu/packages/bioinformatics.scm (python-cooler): New variable. --- gnu/packages/bioinformatics.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d66d9ef40e..65da049c79 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13578,3 +13578,40 @@ bgzipped text file that contains a pair of genomic coordinates per line.") "This package provides procedures for efficient pythonic random access to fasta subsequences.") (license license:bsd-3))) + +(define-public python-cooler + (package + (name "python-cooler") + (version "0.7.11") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cooler" version)) + (sha256 + (base32 + "08k5nxnxa6qsbk15z5z0q01n28042k87wi4905hh95rzqib15mhx")))) + (build-system python-build-system) + (propagated-inputs + `(("python-biopython" ,python-biopython) + ("python-click" ,python-click) + ("python-cytoolz" ,python-cytoolz) + ("python-dask" ,python-dask) + ("python-h5py" ,python-h5py) + ("python-multiprocess" ,python-multiprocess) + ("python-pandas" ,python-pandas) + ("python-pyfaidx" ,python-pyfaidx) + ("python-pypairix" ,python-pypairix) + ("python-pysam" ,python-pysam) + ("python-scipy" ,python-scipy))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-nose" ,python-nose) + ("python-numpydoc" ,python-numpydoc) + ("python-sphinx" ,python-sphinx))) + (home-page "https://github.com/mirnylab/cooler") + (synopsis "Sparse binary format for genomic interaction matrices") + (description + "Cooler is a support library for a sparse, compressed, binary persistent +storage format, called @code{cool}, used to store genomic interaction data, +such as Hi-C contact matrices.") + (license license:bsd-3))) -- cgit v1.2.3 From 1189c7f1b050aa495b0ec6d9436c644ee308695f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 16:07:27 +0200 Subject: gnu: Add python-hicexplorer. * gnu/packages/bioinformatics.scm (python-hicexplorer): New variable. --- gnu/packages/bioinformatics.scm | 53 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 65da049c79..7e6d76e022 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13615,3 +13615,56 @@ fasta subsequences.") storage format, called @code{cool}, used to store genomic interaction data, such as Hi-C contact matrices.") (license license:bsd-3))) + +(define-public python-hicexplorer + (package + (name "python-hicexplorer") + (version "2.1.4") + (source + (origin + ;; The latest version is not available on Pypi. + (method git-fetch) + (uri (git-reference + (url "https://github.com/deeptools/HiCExplorer.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0q5gpbzmrkvygqgw524q36b4nrivcmyi5v194vsx0qw7b3gcmq08")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'loosen-up-requirements + (lambda _ + (substitute* "setup.py" + (("==") ">=")) + #t))))) + (propagated-inputs + `(("python-biopython" ,python-biopython) + ("python-configparser" ,python-configparser) + ("python-cooler" ,python-cooler) + ("python-future" ,python-future) + ("python-intervaltree" ,python-intervaltree) + ("python-jinja2" ,python-jinja2) + ("python-matplotlib" ,python-matplotlib) + ("python-numpy" ,python-numpy) + ("python-pandas" ,python-pandas) + ("python-pybigwig" ,python-pybigwig) + ("python-pysam" ,python-pysam) + ("python-scipy" ,python-scipy) + ("python-six" ,python-six) + ("python-tables" ,python-tables) + ("python-unidecode" ,python-unidecode))) + (home-page "http://hicexplorer.readthedocs.io") + (synopsis "Process, analyze and visualize Hi-C data") + (description + "HiCExplorer is a powerful and easy to use set of tools to process, +normalize and visualize Hi-C data. HiCExplorer facilitates the creation of +contact matrices, correction of contacts, TAD detection, A/B compartments, +merging, reordering or chromosomes, conversion from different formats +including cooler and detection of long-range contacts. Moreover, it allows +the visualization of multiple contact matrices along with other types of data +like genes, compartments, ChIP-seq coverage tracks (and in general any type of +genomic scores), long range contacts and the visualization of viewpoints.") + (license license:gpl3))) -- cgit v1.2.3 From 5bfa7510d144c3a35bc9022d79fdf4192d4aa1f8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 5 Sep 2018 16:07:28 +0200 Subject: gnu: Add python-pygenometracks. * gnu/packages/bioinformatics.scm (python-pygenometracks): New variable. --- gnu/packages/bioinformatics.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7e6d76e022..fc8be4d7db 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13668,3 +13668,34 @@ the visualization of multiple contact matrices along with other types of data like genes, compartments, ChIP-seq coverage tracks (and in general any type of genomic scores), long range contacts and the visualization of viewpoints.") (license license:gpl3))) + +(define-public python-pygenometracks + (package + (name "python-pygenometracks") + (version "2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyGenomeTracks" version)) + (sha256 + (base32 + "1fws6bqsyy9kj3qiabhkqx4wd4i775gsxnhszqd3zg7w67sc1ic5")))) + (build-system python-build-system) + (propagated-inputs + `(("python-configparser" ,python-configparser) + ("python-future" ,python-future) + ("python-hicexplorer" ,python-hicexplorer) + ("python-intervaltree" ,python-intervaltree) + ("python-matplotlib" ,python-matplotlib) + ("python-numpy" ,python-numpy) + ("python-pybigwig" ,python-pybigwig))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://pygenometracks.readthedocs.io") + (synopsis "Program and library to plot beautiful genome browser tracks") + (description + "This package aims to produce high-quality genome browser tracks that +are highly customizable. Currently, it is possible to plot: bigwig, bed (many +options), bedgraph, links (represented as arcs), and Hi-C matrices. +pyGenomeTracks can make plots with or without Hi-C data.") + (license license:gpl3+))) -- cgit v1.2.3 From 5d78cf0b6cc271ca8269036f2aa2e57f858b5f00 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sun, 9 Sep 2018 22:27:57 +0300 Subject: gnu: emacs-bui: Update to 1.2.0. * gnu/packages/emacs.scm (emacs-bui): Update to 1.2.0. Change source from github to notabug. --- gnu/packages/emacs.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1f64a5e84a..f84588997e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1635,20 +1635,20 @@ and stored in memory.") (define-public emacs-bui (package (name "emacs-bui") - (version "1.1.0") + (version "1.2.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/alezost/bui.el/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://notabug.org/alezost/emacs-bui.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "112k0mq6xpy0r47vk66miw7rxbkv3d06pv3pd0vcmrhcnhnnk486")))) + "0ixia5s41f2nbal3wsixacbhbc0mk9yb75ir1amqakip30sq4apv")))) (build-system emacs-build-system) (propagated-inputs `(("dash" ,emacs-dash))) - (home-page "https://github.com/alezost/bui.el") + (home-page "https://notabug.org/alezost/emacs-bui") (synopsis "Buffer interface library for Emacs") (description "BUI (Buffer User Interface) is a library for making @code{list} and -- cgit v1.2.3 From fdf68c232d94fa5d3d65561a1ee938307e2f83c0 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sun, 9 Sep 2018 22:29:19 +0300 Subject: gnu: emacs-build-farm: Update to 0.2.1. * gnu/packages/emacs.scm (emacs-build-farm): Update to 0.2.1. Change source from gitlab to notabug. --- gnu/packages/emacs.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index f84588997e..98e7b1c6a4 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1729,21 +1729,21 @@ management tasks from Emacs. To begin with, run @code{M-x guix-about} or (define-public emacs-build-farm (package (name "emacs-build-farm") - (version "0.2") + (version "0.2.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/alezost-emacs/build-farm") - (commit "fa7fa54901416fc5c216a5014394cbd73a61efc6"))) + (url "https://notabug.org/alezost/emacs-build-farm.git") + (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1zw3pivma6cv9j7k7qm02jd6wnxmsc1v2mjcssd50im99zzrqflh")))) + "1a4ky0hca26p7f3i2c2s5517ygkyaaz52vs0vxy6f5q95rhlgdhd")))) (build-system emacs-build-system) (propagated-inputs `(("bui" ,emacs-bui) ("magit-popup" ,emacs-magit-popup))) - (home-page "https://gitlab.com/alezost-emacs/build-farm") + (home-page "https://notabug.org/alezost/emacs-build-farm") (synopsis "Emacs interface for Hydra and Cuirass build farms") (description "This Emacs package provides an interface for Hydra and -- cgit v1.2.3 From 8a8662d28693ec4085df7653bafb073ad1b6f8a3 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Mon, 10 Sep 2018 18:33:03 +0300 Subject: gnu: emacs-guix: Update to 0.5. * gnu/packages/emacs.scm (emacs-guix): Update to 0.5. [propagated-inputs]: Add 'guile-gcrypt'. [arguments]: Adjust #:configure-flags accordingly. --- gnu/packages/emacs.scm | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 98e7b1c6a4..bf163d8109 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1659,38 +1659,42 @@ type, for example: packages, buffers, files, etc.") (define-public emacs-guix (package (name "emacs-guix") - (version "0.4.1.1") + (version "0.5") (source (origin (method url-fetch) (uri (string-append "https://emacs-guix.gitlab.io/website/" "releases/emacs-guix-" version ".tar.gz")) (sha256 (base32 - "0jbnrcazbks7h50rngpw5l40a6vn2794kb53cpva3yzdjmrc1955")))) + "09zxd8x674vrpigmcx8l00ifhaxh35xwkwjb8dw9kydnhv9hyyi1")))) (build-system gnu-build-system) (arguments `(#:configure-flags (let ((guix (assoc-ref %build-inputs "guix")) + (gcrypt (assoc-ref %build-inputs "guile-gcrypt")) (geiser (assoc-ref %build-inputs "geiser")) (dash (assoc-ref %build-inputs "dash")) (bui (assoc-ref %build-inputs "bui")) (magit-popup (assoc-ref %build-inputs "magit-popup")) (edit-indirect (assoc-ref %build-inputs "edit-indirect")) - (site-lisp "/share/emacs/site-lisp")) + (site-lisp "/share/emacs/site-lisp") + (site-scm "/share/guile/site") + (site-go "/lib/guile") + (guile-dir (lambda (dir) + (car (find-files dir + (lambda (file stat) + (string-prefix? + "2." (basename file))) + #:directories? #t))))) (list (string-append "--with-guix-site-dir=" - (car (find-files (string-append guix - "/share/guile/site") - (lambda (file stat) - (string-prefix? - "2." - (basename file))) - #:directories? #t))) + (guile-dir (string-append guix site-scm))) (string-append "--with-guix-site-ccache-dir=" - (car (find-files (string-append guix "/lib/guile") - (lambda (file stat) - (string-prefix? - "2." (basename file))) - #:directories? #t)) + (guile-dir (string-append guix site-go)) + "/site-ccache") + (string-append "--with-guile-gcrypt-site-dir=" + (guile-dir (string-append gcrypt site-scm))) + (string-append "--with-guile-gcrypt-site-ccache-dir=" + (guile-dir (string-append gcrypt site-go)) "/site-ccache") (string-append "--with-geiser-lispdir=" geiser site-lisp) (string-append "--with-dash-lispdir=" @@ -1713,6 +1717,7 @@ type, for example: packages, buffers, files, etc.") ("guix" ,guix))) (propagated-inputs `(("geiser" ,geiser) + ("guile-gcrypt" ,guile-gcrypt) ("dash" ,emacs-dash) ("bui" ,emacs-bui) ("edit-indirect" ,emacs-edit-indirect) -- cgit v1.2.3 From f8121329b1dcebb55d6dfbae553bfa69d557eede Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 10 Sep 2018 14:45:19 +0200 Subject: syscalls: Report lack of a libc symbol as ENOSYS. * guix/build/syscalls.scm (syscall->procedure): Throw to 'system-error with ENOSYS when NAME cannot be found. --- guix/build/syscalls.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 74cb675fcf..56a689f667 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -385,8 +385,8 @@ the returned procedure is called." #:return-errno? #t))) (lambda args (lambda _ - (error (format #f "~a: syscall->procedure failed: ~s" - name args)))))) + (throw 'system-error name "~A" (list (strerror ENOSYS)) + (list ENOSYS)))))) (define-syntax define-as-needed (syntax-rules () -- cgit v1.2.3 From 7d05868847c477c75d2c5af3aa4d7baae862191c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 10 Sep 2018 14:46:00 +0200 Subject: substitute: Ignore exceptions thrown by 'set-thread-name'. Fixes . Reported by Ricardo Wurmus . * guix/scripts/substitute.scm (guix-substitute): Swallow 'system-error' exceptions around 'set-thread-name' call. --- guix/scripts/substitute.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index cd300195d8..6d31dfdaa4 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -1087,7 +1087,10 @@ default value." (#f #f) (locale (false-if-exception (setlocale LC_ALL locale)))) - (set-thread-name "guix substitute") + (catch 'system-error + (lambda () + (set-thread-name "guix substitute")) + (const #t)) ;GNU/Hurd lacks 'prctl' (with-networking (with-error-handling ; for signature errors -- cgit v1.2.3 From f80d6ea251601c63580f63ad5df5ca5c0151dfa0 Mon Sep 17 00:00:00 2001 From: Benjamin Slade Date: Mon, 10 Sep 2018 15:21:25 +0200 Subject: gnu: Add hstr. * gnu/packages/shellutils.scm (hstr): New variable. --- gnu/packages/shellutils.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 650fe98ef3..425713a91f 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Christopher Baines ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Benjamin Slade ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,10 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (gnu packages autotools) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages readline) + #:use-module (gnu packages pkg-config) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) @@ -158,3 +163,45 @@ fzy is designed to be used both as an editor plugin and on the command line. Rather than clearing the screen, fzy displays its interface directly below the current cursor position, scrolling the screen if necessary.") (license expat))) + +(define-public hstr + (package + (name "hstr") + (version "2.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/dvorka/" name "/archive/" + version ".tar.gz")) + (sha256 + (base32 + "0yk2008bl48hv0v3c90ngq4y45h3nxif2ik6s3l7kag1zs5yv4wd")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'adjust-ncurses-includes + (lambda* (#:key make-flags outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "src/include/hstr_curses.h" + (("ncursesw\\/curses.h") "ncurses.h")) + (substitute* "src/include/hstr.h" + (("ncursesw\\/curses.h") "ncurses.h"))) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("ncurses" ,ncurses) + ("readline" ,readline))) + (synopsis "Navigate and search command history with shell history suggest box") + (description "HSTR (HiSToRy) is a command-line utility that brings +improved Bash and Zsh command completion from the history. It aims to make +completion easier and more efficient than with @kbd{Ctrl-R}. It allows you to +easily view, navigate, and search your command history with suggestion boxes. +HSTR can also manage your command history (for instance you can remove +commands that are obsolete or contain a piece of sensitive information) or +bookmark your favourite commands.") + (home-page "http://me.mindforger.com/projects/hh.html") + (license asl2.0))) -- cgit v1.2.3 From 633e8aab6990b9eff1f2f0e77d27dc17f163bbc4 Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Sun, 9 Sep 2018 17:57:42 +0200 Subject: gnu: ldc: Update to 1.10.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ldc.scm (ldc): Update to 1.10.0. [native-inputs]: Switch to LLVM and CLANG. (ldc-bootstrap)[synopsis, description]: Tweak. * gnu/packages/patches/ldc-disable-phobos-tests.patch: New file. * gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch: Remove. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 +- gnu/packages/ldc.scm | 26 ++++--- .../patches/ldc-1.7.0-disable-phobos-tests.patch | 88 ---------------------- .../patches/ldc-disable-phobos-tests.patch | 22 ++++++ 4 files changed, 37 insertions(+), 101 deletions(-) delete mode 100644 gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch create mode 100644 gnu/packages/patches/ldc-disable-phobos-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index bc01a3cd36..4123459aaa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -852,7 +852,7 @@ dist_patch_DATA = \ %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \ %D%/packages/patches/laby-make-install.patch \ %D%/packages/patches/ldc-bootstrap-disable-tests.patch \ - %D%/packages/patches/ldc-1.7.0-disable-phobos-tests.patch \ + %D%/packages/patches/ldc-disable-phobos-tests.patch \ %D%/packages/patches/ledger-fix-uninitialized.patch \ %D%/packages/patches/ledger-revert-boost-python-fix.patch \ %D%/packages/patches/liba52-enable-pic.patch \ diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm index 2613db0abd..f35494284d 100644 --- a/gnu/packages/ldc.scm +++ b/gnu/packages/ldc.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016 Roel Janssen -;;; Copyright © 2015 Pjotr Prins +;;; Copyright © 2015, 2018 Pjotr Prins ;;; Copyright © 2017 Frederick Muriithi ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Tobias Geerinckx-Rice @@ -172,9 +172,9 @@ and freshness without requiring additional information from the user.") (base32 "0z6ch930wjkg2vlnqkbliwxxxifad6ydsdpwdxwnajkb2kaxsjx4")))))) (home-page "http://wiki.dlang.org/LDC") - (synopsis "LLVM compiler for the D programming language") + (synopsis "LLVM-based compiler for the D programming language") (description - "LDC is a compiler for the D programming language. It is based on + "LDC is an LLVM compiler for the D programming language. It is based on the latest DMD compiler that was written in C and is used for bootstrapping more recent compilers written in D.") ;; Most of the code is released under BSD-3, except for code originally @@ -188,11 +188,11 @@ bootstrapping more recent compilers written in D.") ;; Phobos, druntime and dmd-testsuite library dependencies do ;; not always have a newer release than the compiler, hence we ;; retain this variable. - (let ((older-version "1.7.0")) + (let ((older-version "1.10.0")) ;; retain this because sometimes the libs are older (package (inherit ldc-bootstrap) (name "ldc") - (version "1.7.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (string-append @@ -201,7 +201,7 @@ bootstrapping more recent compilers written in D.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0rqchmlbhz1pd8ksl1vfhfd5s3cp9h9pqi4k4w2np9sq0zr7abwn")))) + "16b1h9kwfggjw6ykc6sfs26ak6vypylsx9wmvp5m6x3cvi6g70yi")))) (arguments `(#:phases (modify-phases %standard-phases @@ -235,6 +235,8 @@ bootstrapping more recent compilers written in D.") (delete-file "tests/compilable/ctfe_math.d") (delete-file "tests/debuginfo/nested_gdb.d") (delete-file "tests/debuginfo/classtypes_gdb.d") + ;; the following tests plugins we don't have. + (delete-file "tests/plugins/addFuncEntryCall/testPlugin.d") ;; the following tests requires AVX instruction set in the CPU. (substitute* "tests/d2/dmd-testsuite/runnable/test_cdvecfill.d" (("^// DISABLED: ") "^// DISABLED: linux64 ")) @@ -246,8 +248,8 @@ bootstrapping more recent compilers written in D.") (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) (invoke "make" "test" "-j" (number->string (parallel-job-count)))))))) (native-inputs - `(("llvm" ,llvm-3.8) - ("clang" ,clang-3.8) + `(("llvm" ,llvm) + ("clang" ,clang) ("ldc" ,ldc-bootstrap) ("python-lit" ,python-lit) ("python-wrapper" ,python-wrapper) @@ -261,7 +263,7 @@ bootstrapping more recent compilers written in D.") older-version ".tar.gz")) (sha256 (base32 - "042hn3v0zk353r0h6yclq56z86hi437y969bckyb2qsnv00h60hi")) + "0cpmrww00xf1qx38bcc22rr05qw41p00p45yb5fbwnfaccfwdn0s")) ;; This patch deactivates some tests that depend on network access ;; to pass. It also deactivates some tests that have some reliance ;; on timezone. @@ -271,7 +273,7 @@ bootstrapping more recent compilers written in D.") ;; that is being pursued at ;; . ;; It also deactivates a test that requires /root - (patches (search-patches "ldc-1.7.0-disable-phobos-tests.patch")))) + (patches (search-patches "ldc-disable-phobos-tests.patch")))) ("druntime-src" ,(origin (method url-fetch) @@ -280,7 +282,7 @@ bootstrapping more recent compilers written in D.") older-version ".tar.gz")) (sha256 (base32 - "0pvabk70zw8c1gbmvy2i486bg22bn0l5nbacjz0qwmhf0w9y9ylh")))) + "1akh2vdi98jih8642yjbvv2vavxzrmq24kz8i3kfidg5ndqyv222")))) ("dmd-testsuite-src" ,(origin (method url-fetch) @@ -289,7 +291,7 @@ bootstrapping more recent compilers written in D.") older-version ".tar.gz")) (sha256 (base32 - "1i8j1raah7b26bprwkdick443ivdsihgi1l14sn9rh4a95rnrpd9"))))))))) + "0z5x07qrbkpksshaymp11ir6jlmg9wjicxn6zhp8cya6i1ha9p99"))))))))) (define-public dub (package diff --git a/gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch b/gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch deleted file mode 100644 index ccc136cc76..0000000000 --- a/gnu/packages/patches/ldc-1.7.0-disable-phobos-tests.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/std/path.d b/std/path.d -index a9f0bd8..f47d103 100644 ---- a/std/path.d -+++ b/std/path.d -@@ -4041,7 +4041,7 @@ version(unittest) import std.process : environment; - else version (Android) - { - } -- else -+ else version (HasRoot) - { - assert(expandTilde("~root") == "/root", expandTilde("~root")); - assert(expandTilde("~root/") == "/root/", expandTilde("~root/")); - -diff --git a/std/process.d b/std/process.d -index df83296..d921cdb 100644 ---- a/std/process.d -+++ b/std/process.d -@@ -1171,7 +1171,7 @@ version (Posix) @system unittest - assert(exists(buildPath(directory, "bar"))); - } - --@system unittest // Specifying a bad working directory. -+@system version(skipunittest) unittest // Specifying a bad working directory. - { - import std.exception : assertThrown; - TestScript prog = "/bin/echo"; -diff --git a/std/socket.d b/std/socket.d -index 8a261d5..c1b87b6 100644 ---- a/std/socket.d -+++ b/std/socket.d -@@ -484,7 +484,7 @@ class Protocol - // Skip this test on Android because getprotobyname/number are - // unimplemented in bionic. - version(CRuntime_Bionic) {} else --@safe unittest -+@safe version(hasNetwork) unittest - { - softUnittest({ - Protocol proto = new Protocol; -@@ -804,7 +804,7 @@ class InternetHost - } - - /// --@safe unittest -+@safe version(hasNetwork) unittest - { - InternetHost ih = new InternetHost; - -@@ -959,7 +959,7 @@ AddressInfo[] getAddressInfo(T...)(in char[] node, T options) - return () @trusted { return getAddressInfoImpl(node, service, &hints); }(); - } - --@system unittest -+@system version(hasNetwork) unittest - { - struct Oops - { -@@ -1010,7 +1010,7 @@ private AddressInfo[] getAddressInfoImpl(in char[] node, in char[] service, addr - } - - --@safe unittest -+@safe version(hasNetwork) unittest - { - softUnittest({ - if (getaddrinfoPointer) -diff --git a/std/stdio.d b/std/stdio.d -index 10106a5..4b0590e 100644 ---- a/std/stdio.d -+++ b/std/stdio.d -@@ -1426,8 +1426,7 @@ Removes the lock over the specified file segment. - g.unlock(); - } - -- version(Posix) -- @system unittest -+ @system version(skip) unittest - { - static import std.file; - auto deleteme = testFilename(); -@@ -1483,7 +1482,6 @@ Removes the lock over the specified file segment. - f.unlock(); - } - -- - /** - Writes its arguments in text format to the file. diff --git a/gnu/packages/patches/ldc-disable-phobos-tests.patch b/gnu/packages/patches/ldc-disable-phobos-tests.patch new file mode 100644 index 0000000000..f8a9743d59 --- /dev/null +++ b/gnu/packages/patches/ldc-disable-phobos-tests.patch @@ -0,0 +1,22 @@ +diff --git a/std/socket.d b/std/socket.d +index 111cd17..6d23da9 100644 +--- a/std/socket.d ++++ b/std/socket.d +@@ -448,7 +448,7 @@ class Protocol + // Skip this test on Android because getprotobyname/number are + // unimplemented in bionic. + version(CRuntime_Bionic) {} else +-@safe unittest ++@safe version(hasNetwork) unittest + { + // import std.stdio : writefln; + softUnittest({ +@@ -770,7 +770,7 @@ class InternetHost + } + + /// +-@safe unittest ++@safe version(hasNetwork) unittest + { + InternetHost ih = new InternetHost; + -- cgit v1.2.3 From 98d6543f86d01486c2f6e808eedd97c601ba3e7a Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Mon, 10 Sep 2018 17:46:58 +0200 Subject: gnu: Rename ldc.scm to dlang.scm. * gnu/packages/ldc.scm: Rename to... * gnu/packages/dlang.scm: ... this. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. --- gnu/local.mk | 2 +- gnu/packages/dlang.scm | 338 +++++++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/ldc.scm | 338 ------------------------------------------------- 3 files changed, 339 insertions(+), 339 deletions(-) create mode 100644 gnu/packages/dlang.scm delete mode 100644 gnu/packages/ldc.scm diff --git a/gnu/local.mk b/gnu/local.mk index 4123459aaa..7317cc5a02 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -135,6 +135,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/display-managers.scm \ %D%/packages/django.scm \ %D%/packages/djvu.scm \ + %D%/packages/dlang.scm \ %D%/packages/dns.scm \ %D%/packages/docbook.scm \ %D%/packages/docker.scm \ @@ -245,7 +246,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/key-mon.scm \ %D%/packages/kodi.scm \ %D%/packages/language.scm \ - %D%/packages/ldc.scm \ %D%/packages/lego.scm \ %D%/packages/less.scm \ %D%/packages/lesstif.scm \ diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm new file mode 100644 index 0000000000..76988b2dbf --- /dev/null +++ b/gnu/packages/dlang.scm @@ -0,0 +1,338 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2015, 2016 Roel Janssen +;;; Copyright © 2015, 2018 Pjotr Prins +;;; Copyright © 2017 Frederick Muriithi +;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; +;;; 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 dlang) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) + #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages check) + #:use-module (gnu packages compression) + #:use-module (gnu packages curl) + #:use-module (gnu packages gdb) + #:use-module (gnu packages libedit) + #:use-module (gnu packages llvm) + #:use-module (gnu packages python) + #:use-module (gnu packages textutils)) + +(define-public rdmd + (package + (name "rdmd") + (version "2.077.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/dlang/tools/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0c8w373rv6iz3xfid94w40ncv2lr2ncxi662qsr4lda4aghczmq7")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) ; There is no Makefile, so there's no 'make check'. + (replace + 'build + (lambda _ + (invoke "ldc2" "rdmd.d"))) + (replace + 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (install-file "rdmd" bin))))))) + (native-inputs + `(("ldc" ,ldc))) + (home-page "https://github.com/D-Programming-Language/tools/") + (synopsis "Specialized equivalent to 'make' for the D language") + (description + "rdmd is a companion to the dmd compiler that simplifies the typical +edit-compile-link-run or edit-make-run cycle to a rapid edit-run cycle. Like +make and other tools, rdmd uses the relative dates of the files involved to +minimize the amount of work necessary. Unlike make, rdmd tracks dependencies +and freshness without requiring additional information from the user.") + (license license:boost1.0))) + +(define-public ldc-bootstrap + (package + (name "ldc") + (version "0.17.4") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/ldc/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kw0j378k6bh0k66dvx99bjq8ilp8bb24w3jrmibn8rhmqv0d5q8")))) + (build-system cmake-build-system) + (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux")) + (properties + ;; Some of the tests take a very long time on ARMv7. See + ;; . + `((max-silent-time . ,(* 3600 3)))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-submodule-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((unpack (lambda (source target) + (with-directory-excursion target + (zero? (system* "tar" "xvf" + (assoc-ref inputs source) + "--strip-components=1")))))) + (and (unpack "phobos-src" "runtime/phobos") + (unpack "druntime-src" "runtime/druntime") + (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite"))))) + (add-after 'unpack-submodule-sources 'patch-dmd2 + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "dmd2/root/port.c" + ((" ::isnan") " isnan") + ((" ::isinf") " isinf") + (("#undef isnan") "") + (("#undef isinf") "")) + #t)) + (add-after 'unpack-submodule-sources 'patch-phobos + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "runtime/phobos/std/process.d" + (("/bin/sh") (which "sh")) + (("echo") (which "echo"))) + (substitute* "runtime/phobos/std/datetime.d" + (("/usr/share/zoneinfo/") + (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) + (("tzName == \"[+]VERSION\"") + "(tzName == \"+VERSION\" || std.algorithm.endsWith(tzName, \"/leapseconds\"))")) + (substitute* "tests/d2/dmd-testsuite/Makefile" + (("/bin/bash") (which "bash"))) + ;; FIXME: this test cannot be linked. + (delete-file "tests/d2/dmd-testsuite/runnable/cppa.d") + ;; the following two tests fail on i686 + (for-each delete-file '("tests/ir/attributes.d" "tests/ir/align.d"))))))) + (inputs + `(("libconfig" ,libconfig) + ("libedit" ,libedit) + ("tzdata" ,tzdata) + ("zlib" ,zlib))) + (native-inputs + `(("llvm" ,llvm-3.8) + ("clang" ,clang-3.8) + ("python-lit" ,python-lit) + ("python-wrapper" ,python-wrapper) + ("unzip" ,unzip) + ("phobos-src" + ,(origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/phobos/archive/ldc-v" + version ".tar.gz")) + (sha256 + (base32 + "16x36kp46mqiihxx7jvr1d3mv3b96yfmhinb9lzinh2m4clr85wz")) + (patches (search-patches "ldc-bootstrap-disable-tests.patch")))) + ("druntime-src" + ,(origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/druntime/archive/ldc-v" + version ".tar.gz")) + (sha256 + (base32 + "0iw2xxhcbsc5f1707dgdzhff528363l4faqdk513gaxs2dhfx8vx")))) + ("dmd-testsuite-src" + ,(origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v" + version ".tar.gz")) + (sha256 + (base32 + "0z6ch930wjkg2vlnqkbliwxxxifad6ydsdpwdxwnajkb2kaxsjx4")))))) + (home-page "http://wiki.dlang.org/LDC") + (synopsis "LLVM-based compiler for the D programming language") + (description + "LDC is an LLVM compiler for the D programming language. It is based on +the latest DMD compiler that was written in C and is used for +bootstrapping more recent compilers written in D.") + ;; Most of the code is released under BSD-3, except for code originally + ;; written for GDC, which is released under GPLv2+, and the DMD frontend, + ;; which is released under the "Boost Software License version 1.0". + (license (list license:bsd-3 + license:gpl2+ + license:boost1.0)))) + +(define-public ldc + ;; Phobos, druntime and dmd-testsuite library dependencies do + ;; not always have a newer release than the compiler, hence we + ;; retain this variable. + (let ((older-version "1.10.0")) ;; retain this because sometimes the libs are older + (package + (inherit ldc-bootstrap) + (name "ldc") + (version "1.10.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/ldc/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16b1h9kwfggjw6ykc6sfs26ak6vypylsx9wmvp5m6x3cvi6g70yi")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-submodule-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((unpack (lambda (source target) + (with-directory-excursion target + (zero? (system* "tar" "xvf" + (assoc-ref inputs source) + "--strip-components=1")))))) + (and (unpack "phobos-src" "runtime/phobos") + (unpack "druntime-src" "runtime/druntime") + (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite"))))) + (add-after 'unpack-submodule-sources 'patch-phobos + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("runtime/phobos/std/process.d" + "tests/linking/linker_switches.d") + (("/bin/sh") (which "sh")) + (("echo") (which "echo"))) + (substitute* "tests/d2/dmd-testsuite/Makefile" + (("/bin/bash") (which "bash"))) + ;; disable unittests in the following files. We are discussing with + ;; upstream + (substitute* '("runtime/phobos/std/net/curl.d" + "runtime/phobos/std/datetime/systime.d" + "runtime/phobos/std/datetime/timezone.d" + ) + (("version(unittest)") "version(skipunittest)") + ((" unittest") " version(skipunittest) unittest")) + ;; the following tests require a more recent LLVM + (delete-file "tests/compilable/ctfe_math.d") + (delete-file "tests/debuginfo/nested_gdb.d") + (delete-file "tests/debuginfo/classtypes_gdb.d") + ;; the following tests plugins we don't have. + (delete-file "tests/plugins/addFuncEntryCall/testPlugin.d") + ;; the following tests requires AVX instruction set in the CPU. + (substitute* "tests/d2/dmd-testsuite/runnable/test_cdvecfill.d" + (("^// DISABLED: ") "^// DISABLED: linux64 ")) + #t)) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; some tests call into gdb binary which needs SHELL and CC set + (setenv "SHELL" (which "sh")) + (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) + (invoke "make" "test" "-j" (number->string (parallel-job-count)))))))) + (native-inputs + `(("llvm" ,llvm) + ("clang" ,clang) + ("ldc" ,ldc-bootstrap) + ("python-lit" ,python-lit) + ("python-wrapper" ,python-wrapper) + ("unzip" ,unzip) + ("gdb" ,gdb) + ("phobos-src" + ,(origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/phobos/archive/ldc-v" + older-version ".tar.gz")) + (sha256 + (base32 + "0cpmrww00xf1qx38bcc22rr05qw41p00p45yb5fbwnfaccfwdn0s")) + ;; This patch deactivates some tests that depend on network access + ;; to pass. It also deactivates some tests that have some reliance + ;; on timezone. + ;; + ;; For the network tests, there's an effort to get a version flag + ;; added to deactivate these tests for distribution packagers + ;; that is being pursued at + ;; . + ;; It also deactivates a test that requires /root + (patches (search-patches "ldc-disable-phobos-tests.patch")))) + ("druntime-src" + ,(origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/druntime/archive/ldc-v" + older-version ".tar.gz")) + (sha256 + (base32 + "1akh2vdi98jih8642yjbvv2vavxzrmq24kz8i3kfidg5ndqyv222")))) + ("dmd-testsuite-src" + ,(origin + (method url-fetch) + (uri (string-append + "https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v" + older-version ".tar.gz")) + (sha256 + (base32 + "0z5x07qrbkpksshaymp11ir6jlmg9wjicxn6zhp8cya6i1ha9p99"))))))))) + +(define-public dub + (package + (name "dub") + (version "1.7.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/dlang/dub/archive/" + "v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1jvr1mmq8j77wnsrsg7x2xv8yfljqd6x8gn6yy7dd6h6y3cf408q")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; it would have tested itself by installing some packages (vibe etc) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'build + (lambda _ + (invoke "./build.sh"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "bin/dub" bin) + #t)))))) + (inputs + `(("curl" ,curl))) + (native-inputs + `(("ldc" ,ldc))) + (home-page "https://code.dlang.org/getting_started") + (synopsis "Package and build manager for D projects") + (description + "DUB is a package and build manager for applications and +libraries written in the D programming language. It can +automatically retrieve a project's dependencies and integrate +them in the build process. + +The design emphasis is on maximum simplicity for simple projects, +while providing the opportunity to customize things when +needed.") + (license license:expat))) diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm deleted file mode 100644 index f35494284d..0000000000 --- a/gnu/packages/ldc.scm +++ /dev/null @@ -1,338 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Roel Janssen -;;; Copyright © 2015, 2018 Pjotr Prins -;;; Copyright © 2017 Frederick Muriithi -;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017 Tobias Geerinckx-Rice -;;; -;;; 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 ldc) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (guix build-system cmake) - #:use-module (gnu packages) - #:use-module (gnu packages base) - #:use-module (gnu packages check) - #:use-module (gnu packages compression) - #:use-module (gnu packages curl) - #:use-module (gnu packages gdb) - #:use-module (gnu packages libedit) - #:use-module (gnu packages llvm) - #:use-module (gnu packages python) - #:use-module (gnu packages textutils)) - -(define-public rdmd - (package - (name "rdmd") - (version "2.077.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dlang/tools/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0c8w373rv6iz3xfid94w40ncv2lr2ncxi662qsr4lda4aghczmq7")))) - (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'check) ; There is no Makefile, so there's no 'make check'. - (replace - 'build - (lambda _ - (invoke "ldc2" "rdmd.d"))) - (replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (install-file "rdmd" bin))))))) - (native-inputs - `(("ldc" ,ldc))) - (home-page "https://github.com/D-Programming-Language/tools/") - (synopsis "Specialized equivalent to 'make' for the D language") - (description - "rdmd is a companion to the dmd compiler that simplifies the typical -edit-compile-link-run or edit-make-run cycle to a rapid edit-run cycle. Like -make and other tools, rdmd uses the relative dates of the files involved to -minimize the amount of work necessary. Unlike make, rdmd tracks dependencies -and freshness without requiring additional information from the user.") - (license license:boost1.0))) - -(define-public ldc-bootstrap - (package - (name "ldc") - (version "0.17.4") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/ldc/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1kw0j378k6bh0k66dvx99bjq8ilp8bb24w3jrmibn8rhmqv0d5q8")))) - (build-system cmake-build-system) - (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux")) - (properties - ;; Some of the tests take a very long time on ARMv7. See - ;; . - `((max-silent-time . ,(* 3600 3)))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-submodule-sources - (lambda* (#:key inputs #:allow-other-keys) - (let ((unpack (lambda (source target) - (with-directory-excursion target - (zero? (system* "tar" "xvf" - (assoc-ref inputs source) - "--strip-components=1")))))) - (and (unpack "phobos-src" "runtime/phobos") - (unpack "druntime-src" "runtime/druntime") - (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite"))))) - (add-after 'unpack-submodule-sources 'patch-dmd2 - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "dmd2/root/port.c" - ((" ::isnan") " isnan") - ((" ::isinf") " isinf") - (("#undef isnan") "") - (("#undef isinf") "")) - #t)) - (add-after 'unpack-submodule-sources 'patch-phobos - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "runtime/phobos/std/process.d" - (("/bin/sh") (which "sh")) - (("echo") (which "echo"))) - (substitute* "runtime/phobos/std/datetime.d" - (("/usr/share/zoneinfo/") - (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) - (("tzName == \"[+]VERSION\"") - "(tzName == \"+VERSION\" || std.algorithm.endsWith(tzName, \"/leapseconds\"))")) - (substitute* "tests/d2/dmd-testsuite/Makefile" - (("/bin/bash") (which "bash"))) - ;; FIXME: this test cannot be linked. - (delete-file "tests/d2/dmd-testsuite/runnable/cppa.d") - ;; the following two tests fail on i686 - (for-each delete-file '("tests/ir/attributes.d" "tests/ir/align.d"))))))) - (inputs - `(("libconfig" ,libconfig) - ("libedit" ,libedit) - ("tzdata" ,tzdata) - ("zlib" ,zlib))) - (native-inputs - `(("llvm" ,llvm-3.8) - ("clang" ,clang-3.8) - ("python-lit" ,python-lit) - ("python-wrapper" ,python-wrapper) - ("unzip" ,unzip) - ("phobos-src" - ,(origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/phobos/archive/ldc-v" - version ".tar.gz")) - (sha256 - (base32 - "16x36kp46mqiihxx7jvr1d3mv3b96yfmhinb9lzinh2m4clr85wz")) - (patches (search-patches "ldc-bootstrap-disable-tests.patch")))) - ("druntime-src" - ,(origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/druntime/archive/ldc-v" - version ".tar.gz")) - (sha256 - (base32 - "0iw2xxhcbsc5f1707dgdzhff528363l4faqdk513gaxs2dhfx8vx")))) - ("dmd-testsuite-src" - ,(origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v" - version ".tar.gz")) - (sha256 - (base32 - "0z6ch930wjkg2vlnqkbliwxxxifad6ydsdpwdxwnajkb2kaxsjx4")))))) - (home-page "http://wiki.dlang.org/LDC") - (synopsis "LLVM-based compiler for the D programming language") - (description - "LDC is an LLVM compiler for the D programming language. It is based on -the latest DMD compiler that was written in C and is used for -bootstrapping more recent compilers written in D.") - ;; Most of the code is released under BSD-3, except for code originally - ;; written for GDC, which is released under GPLv2+, and the DMD frontend, - ;; which is released under the "Boost Software License version 1.0". - (license (list license:bsd-3 - license:gpl2+ - license:boost1.0)))) - -(define-public ldc - ;; Phobos, druntime and dmd-testsuite library dependencies do - ;; not always have a newer release than the compiler, hence we - ;; retain this variable. - (let ((older-version "1.10.0")) ;; retain this because sometimes the libs are older - (package - (inherit ldc-bootstrap) - (name "ldc") - (version "1.10.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/ldc/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "16b1h9kwfggjw6ykc6sfs26ak6vypylsx9wmvp5m6x3cvi6g70yi")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-submodule-sources - (lambda* (#:key inputs #:allow-other-keys) - (let ((unpack (lambda (source target) - (with-directory-excursion target - (zero? (system* "tar" "xvf" - (assoc-ref inputs source) - "--strip-components=1")))))) - (and (unpack "phobos-src" "runtime/phobos") - (unpack "druntime-src" "runtime/druntime") - (unpack "dmd-testsuite-src" "tests/d2/dmd-testsuite"))))) - (add-after 'unpack-submodule-sources 'patch-phobos - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("runtime/phobos/std/process.d" - "tests/linking/linker_switches.d") - (("/bin/sh") (which "sh")) - (("echo") (which "echo"))) - (substitute* "tests/d2/dmd-testsuite/Makefile" - (("/bin/bash") (which "bash"))) - ;; disable unittests in the following files. We are discussing with - ;; upstream - (substitute* '("runtime/phobos/std/net/curl.d" - "runtime/phobos/std/datetime/systime.d" - "runtime/phobos/std/datetime/timezone.d" - ) - (("version(unittest)") "version(skipunittest)") - ((" unittest") " version(skipunittest) unittest")) - ;; the following tests require a more recent LLVM - (delete-file "tests/compilable/ctfe_math.d") - (delete-file "tests/debuginfo/nested_gdb.d") - (delete-file "tests/debuginfo/classtypes_gdb.d") - ;; the following tests plugins we don't have. - (delete-file "tests/plugins/addFuncEntryCall/testPlugin.d") - ;; the following tests requires AVX instruction set in the CPU. - (substitute* "tests/d2/dmd-testsuite/runnable/test_cdvecfill.d" - (("^// DISABLED: ") "^// DISABLED: linux64 ")) - #t)) - (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; some tests call into gdb binary which needs SHELL and CC set - (setenv "SHELL" (which "sh")) - (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) - (invoke "make" "test" "-j" (number->string (parallel-job-count)))))))) - (native-inputs - `(("llvm" ,llvm) - ("clang" ,clang) - ("ldc" ,ldc-bootstrap) - ("python-lit" ,python-lit) - ("python-wrapper" ,python-wrapper) - ("unzip" ,unzip) - ("gdb" ,gdb) - ("phobos-src" - ,(origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/phobos/archive/ldc-v" - older-version ".tar.gz")) - (sha256 - (base32 - "0cpmrww00xf1qx38bcc22rr05qw41p00p45yb5fbwnfaccfwdn0s")) - ;; This patch deactivates some tests that depend on network access - ;; to pass. It also deactivates some tests that have some reliance - ;; on timezone. - ;; - ;; For the network tests, there's an effort to get a version flag - ;; added to deactivate these tests for distribution packagers - ;; that is being pursued at - ;; . - ;; It also deactivates a test that requires /root - (patches (search-patches "ldc-disable-phobos-tests.patch")))) - ("druntime-src" - ,(origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/druntime/archive/ldc-v" - older-version ".tar.gz")) - (sha256 - (base32 - "1akh2vdi98jih8642yjbvv2vavxzrmq24kz8i3kfidg5ndqyv222")))) - ("dmd-testsuite-src" - ,(origin - (method url-fetch) - (uri (string-append - "https://github.com/ldc-developers/dmd-testsuite/archive/ldc-v" - older-version ".tar.gz")) - (sha256 - (base32 - "0z5x07qrbkpksshaymp11ir6jlmg9wjicxn6zhp8cya6i1ha9p99"))))))))) - -(define-public dub - (package - (name "dub") - (version "1.7.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dlang/dub/archive/" - "v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1jvr1mmq8j77wnsrsg7x2xv8yfljqd6x8gn6yy7dd6h6y3cf408q")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; it would have tested itself by installing some packages (vibe etc) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (replace 'build - (lambda _ - (invoke "./build.sh"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "bin/dub" bin) - #t)))))) - (inputs - `(("curl" ,curl))) - (native-inputs - `(("ldc" ,ldc))) - (home-page "https://code.dlang.org/getting_started") - (synopsis "Package and build manager for D projects") - (description - "DUB is a package and build manager for applications and -libraries written in the D programming language. It can -automatically retrieve a project's dependencies and integrate -them in the build process. - -The design emphasis is on maximum simplicity for simple projects, -while providing the opportunity to customize things when -needed.") - (license license:expat))) -- cgit v1.2.3 From 1f7fe26f83e7d501a7231adf98ac81d58a5d724e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 18:17:11 +0200 Subject: gnu: python-sockjs-tornado: Edit synopsis & description. * gnu/packages/python-web.scm (python-sockjs-tornado)[synopsis] [description]: Pick nits. --- gnu/packages/python-web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index fd76c0c60c..85097289dc 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -194,12 +194,12 @@ other HTTP libraries.") `(("python-tornado" ,python-tornado))) (home-page "https://github.com/mrjoes/sockjs-tornado/") (synopsis - "SockJS python server implementation on top of Tornado framework") + "SockJS Python server implementation on top of the Tornado framework") (description - "SockJS-tornado provides the server side counterpart to a SockJS client + "SockJS-tornado provides the server-side counterpart to a SockJS client library, through the Tornado framework. -SockJS provides a low latency, full duplex, cross-domain communication channel +SockJS provides a low-latency, full-duplex, cross-domain communication channel between a web browser and web server.") (license license:expat))) -- cgit v1.2.3 From 83397e07862198cf3145112c8100fd8dd142fd21 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 18:14:10 +0200 Subject: gnu: python-sockjs-tornado: Update to 1.0.5. * gnu/packages/python-web.scm (python-sockjs-tornado): Update to 1.0.5. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 85097289dc..9008ca5e72 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -177,14 +177,14 @@ other HTTP libraries.") (define-public python-sockjs-tornado (package (name "python-sockjs-tornado") - (version "1.0.3") + (version "1.0.5") (source (origin (method url-fetch) (uri (pypi-uri "sockjs-tornado" version)) (sha256 (base32 - "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd")))) + "0zhq8wnnhkfbvdnsggqrc3pp97pqpilsf7fh6ymvnf52r0rwyjsc")))) (build-system python-build-system) (arguments `(;; There are no tests, and running the test phase requires missing -- cgit v1.2.3 From 7c8b1bf66448d072be67682ed3ce618da831f72f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 18:01:51 +0200 Subject: gnu: python-genshi: Update to 0.7.1. * gnu/packages/python-web.scm (python-genshi): Update to 0.7.1. [source]: Use GIT-FETCH and GIT-FILE-NAME. Remove patches. * gnu/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch, gnu/packages/patches/python-genshi-buildable-on-python-2.7.patch, gnu/packages/patches/python-genshi-disable-speedups-on-python-3.3.patch, gnu/packages/patches/python-genshi-fix-tests-on-python-3.5.patch, gnu/packages/patches/python-genshi-isstring-helper.patch, gnu/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 6 - ...hon-genshi-add-support-for-python-3.4-AST.patch | 151 --------------------- .../python-genshi-buildable-on-python-2.7.patch | 25 ---- ...hon-genshi-disable-speedups-on-python-3.3.patch | 32 ----- .../python-genshi-fix-tests-on-python-3.5.patch | 112 --------------- .../patches/python-genshi-isstring-helper.patch | 37 ----- ...on-genshi-stripping-of-unsafe-script-tags.patch | 51 ------- gnu/packages/python-web.scm | 31 ++--- 8 files changed, 8 insertions(+), 437 deletions(-) delete mode 100644 gnu/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch delete mode 100644 gnu/packages/patches/python-genshi-buildable-on-python-2.7.patch delete mode 100644 gnu/packages/patches/python-genshi-disable-speedups-on-python-3.3.patch delete mode 100644 gnu/packages/patches/python-genshi-fix-tests-on-python-3.5.patch delete mode 100644 gnu/packages/patches/python-genshi-isstring-helper.patch delete mode 100644 gnu/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7317cc5a02..9b417bff6d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1078,12 +1078,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ %D%/packages/patches/python-fix-tests.patch \ - %D%/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch \ - %D%/packages/patches/python-genshi-buildable-on-python-2.7.patch \ - %D%/packages/patches/python-genshi-disable-speedups-on-python-3.3.patch \ - %D%/packages/patches/python-genshi-fix-tests-on-python-3.5.patch \ - %D%/packages/patches/python-genshi-isstring-helper.patch \ - %D%/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-networkx2-reproducible-build.patch \ %D%/packages/patches/python-pillow-fix-failing-tests.patch \ diff --git a/gnu/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch b/gnu/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch deleted file mode 100644 index 4e40c1daa1..0000000000 --- a/gnu/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 86b98a11559da7d1b21dc9b4c6b10511b9095bc4 Mon Sep 17 00:00:00 2001 -From: Simon Cross -Date: Sun, 16 Feb 2014 18:46:15 +0000 -Subject: [PATCH 05/16] Add support for Python 3.4 AST (support for - NameConstants and changes to existing to arguments node attributes). - ---- - genshi/template/astutil.py | 31 ++++++++++++++++++++++++++++--- - genshi/template/eval.py | 34 +++++++++++++++++++--------------- - 2 files changed, 47 insertions(+), 18 deletions(-) - -diff --git a/genshi/template/astutil.py b/genshi/template/astutil.py -index a4c21c8..a3946b4 100644 ---- a/genshi/template/astutil.py -+++ b/genshi/template/astutil.py -@@ -21,7 +21,7 @@ else: - def parse(source, mode): - return compile(source, '', mode, _ast.PyCF_ONLY_AST) - --from genshi.compat import IS_PYTHON2 -+from genshi.compat import IS_PYTHON2, isstring - - __docformat__ = 'restructuredtext en' - -@@ -103,8 +103,13 @@ class ASTCodeGenerator(object): - self._new_line() - return self.visit(node.body) - -+ # Python < 3.4 - # arguments = (expr* args, identifier? vararg, - # identifier? kwarg, expr* defaults) -+ # -+ # Python >= 3.4 -+ # arguments = (arg* args, arg? vararg, arg* kwonlyargs, expr* kw_defaults, -+ # arg? kwarg, expr* defaults) - def visit_arguments(self, node): - first = True - no_default_count = len(node.args) - len(node.defaults) -@@ -122,13 +127,21 @@ class ASTCodeGenerator(object): - self._write(', ') - else: - first = False -- self._write('*' + node.vararg) -+ self._write('*') -+ if isstring(node.vararg): -+ self._write(node.vararg) -+ else: -+ self.visit(node.vararg) - if getattr(node, 'kwarg', None): - if not first: - self._write(', ') - else: - first = False -- self._write('**' + node.kwarg) -+ self._write('**') -+ if isstring(node.kwarg): -+ self._write(node.kwarg) -+ else: -+ self.visit(node.kwarg) - - if not IS_PYTHON2: - # In Python 3 arguments get a special node -@@ -724,6 +737,17 @@ class ASTCodeGenerator(object): - def visit_Name(self, node): - self._write(node.id) - -+ # NameConstant(singleton value) -+ def visit_NameConstant(self, node): -+ if node.value is None: -+ self._write('None') -+ elif node.value is True: -+ self._write('True') -+ elif node.value is False: -+ self._write('False') -+ else: -+ raise Exception("Unknown NameConstant %r" % (node.value,)) -+ - # List(expr* elts, expr_context ctx) - def visit_List(self, node): - self._write('[') -@@ -829,6 +853,7 @@ class ASTTransformer(object): - visit_Attribute = _clone - visit_Subscript = _clone - visit_Name = _clone -+ visit_NameConstant = _clone - visit_List = _clone - visit_Tuple = _clone - -diff --git a/genshi/template/eval.py b/genshi/template/eval.py -index 89aec49..de4bc86 100644 ---- a/genshi/template/eval.py -+++ b/genshi/template/eval.py -@@ -24,7 +24,8 @@ from genshi.template.astutil import ASTTransformer, ASTCodeGenerator, \ - from genshi.template.base import TemplateRuntimeError - from genshi.util import flatten - --from genshi.compat import get_code_params, build_code_chunk, IS_PYTHON2 -+from genshi.compat import get_code_params, build_code_chunk, isstring, \ -+ IS_PYTHON2 - - __all__ = ['Code', 'Expression', 'Suite', 'LenientLookup', 'StrictLookup', - 'Undefined', 'UndefinedError'] -@@ -495,28 +496,31 @@ class TemplateASTTransformer(ASTTransformer): - def __init__(self): - self.locals = [CONSTANTS] - -+ def _process(self, names, node): -+ if not IS_PYTHON2 and isinstance(node, _ast.arg): -+ names.add(node.arg) -+ elif isstring(node): -+ names.add(node) -+ elif isinstance(node, _ast.Name): -+ names.add(node.id) -+ elif isinstance(node, _ast.alias): -+ names.add(node.asname or node.name) -+ elif isinstance(node, _ast.Tuple): -+ for elt in node.elts: -+ self._process(names, elt) -+ - def _extract_names(self, node): - names = set() -- def _process(node): -- if not IS_PYTHON2 and isinstance(node, _ast.arg): -- names.add(node.arg) -- if isinstance(node, _ast.Name): -- names.add(node.id) -- elif isinstance(node, _ast.alias): -- names.add(node.asname or node.name) -- elif isinstance(node, _ast.Tuple): -- for elt in node.elts: -- _process(elt) - if hasattr(node, 'args'): - for arg in node.args: -- _process(arg) -+ self._process(names, arg) - if hasattr(node, 'vararg'): -- names.add(node.vararg) -+ self._process(names, node.vararg) - if hasattr(node, 'kwarg'): -- names.add(node.kwarg) -+ self._process(names, node.kwarg) - elif hasattr(node, 'names'): - for elt in node.names: -- _process(elt) -+ self._process(names, elt) - return names - - def visit_Str(self, node): --- -2.12.0 - diff --git a/gnu/packages/patches/python-genshi-buildable-on-python-2.7.patch b/gnu/packages/patches/python-genshi-buildable-on-python-2.7.patch deleted file mode 100644 index 2bc516c697..0000000000 --- a/gnu/packages/patches/python-genshi-buildable-on-python-2.7.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 32bfaa7cc1c736fd62fcbb6414de9498dc20ed07 Mon Sep 17 00:00:00 2001 -From: Adriano Peluso -Date: Wed, 5 Apr 2017 15:13:06 +0200 -Subject: [PATCH 2/2] buildable on python27 too - ---- - genshi/template/directives.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/genshi/template/directives.py b/genshi/template/directives.py -index 6fd0f28..1f70ef6 100644 ---- a/genshi/template/directives.py -+++ b/genshi/template/directives.py -@@ -266,7 +266,7 @@ class DefDirective(Directive): - if isinstance(ast, _ast.Call): - self.name = ast.func.id - for arg in ast.args: -- if isinstance(arg, _ast.Starred): -+ if hasattr(_ast, 'Starred') and isinstance(arg, _ast.Starred): - # Python 3.5+ - self.star_args = arg.value.id - else: --- -2.12.0 - diff --git a/gnu/packages/patches/python-genshi-disable-speedups-on-python-3.3.patch b/gnu/packages/patches/python-genshi-disable-speedups-on-python-3.3.patch deleted file mode 100644 index c25c3bd7a9..0000000000 --- a/gnu/packages/patches/python-genshi-disable-speedups-on-python-3.3.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cef2c8df44166195e1705638f9f17033a4943bb7 Mon Sep 17 00:00:00 2001 -From: Simon Cross -Date: Sun, 16 Feb 2014 18:32:21 +0000 -Subject: [PATCH 02/15] Disable the speedups C extension on CPython >= 3.3 - since Genshi doesn't support the new Unicode C API yet. - ---- - setup.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 123a2cb..a3d748c 100755 ---- a/setup.py -+++ b/setup.py -@@ -65,9 +65,13 @@ available.""") - - - if Feature: -+ # Optional C extension module for speeding up Genshi: -+ # Not activated by default on: -+ # - PyPy (where it harms performance) -+ # - CPython >= 3.3 (the new Unicode C API is not supported yet) - speedups = Feature( - "optional C speed-enhancements", -- standard = not is_pypy, -+ standard = not is_pypy and sys.version_info < (3, 3), - ext_modules = [ - Extension('genshi._speedups', ['genshi/_speedups.c']), - ], --- -2.12.0 - diff --git a/gnu/packages/patches/python-genshi-fix-tests-on-python-3.5.patch b/gnu/packages/patches/python-genshi-fix-tests-on-python-3.5.patch deleted file mode 100644 index 05be080cdf..0000000000 --- a/gnu/packages/patches/python-genshi-fix-tests-on-python-3.5.patch +++ /dev/null @@ -1,112 +0,0 @@ -From ce796ad4bae5c47011876778674ad036357febdf Mon Sep 17 00:00:00 2001 -From: Adriano Peluso -Date: Wed, 5 Apr 2017 15:10:06 +0200 -Subject: [PATCH 1/2] fixing the tests on python35 - ---- - genshi/filters/i18n.py | 6 ++++-- - genshi/template/astutil.py | 14 +++++++++++--- - genshi/template/directives.py | 20 ++++++++++++++------ - genshi/template/eval.py | 5 +++++ - 4 files changed, 34 insertions(+), 11 deletions(-) - -diff --git a/genshi/filters/i18n.py b/genshi/filters/i18n.py -index 526fda4..5387fcf 100644 ---- a/genshi/filters/i18n.py -+++ b/genshi/filters/i18n.py -@@ -1194,8 +1194,10 @@ def extract_from_code(code, gettext_functions): - elif arg: - strings.append(None) - [_add(arg) for arg in node.args] -- _add(node.starargs) -- _add(node.kwargs) -+ if hasattr(node, 'starargs'): -+ _add(node.starargs) -+ if hasattr(node, 'kwargs'): -+ _add(node.kwargs) - if len(strings) == 1: - strings = strings[0] - else: -diff --git a/genshi/template/astutil.py b/genshi/template/astutil.py -index f4e1edd..e561846 100644 ---- a/genshi/template/astutil.py -+++ b/genshi/template/astutil.py -@@ -151,6 +151,10 @@ class ASTCodeGenerator(object): - def visit_arg(self, node): - self._write(node.arg) - -+ def visit_Starred(self, node): -+ self._write('*') -+ self.visit(node.value) -+ - # FunctionDef(identifier name, arguments args, - # stmt* body, expr* decorator_list) - def visit_FunctionDef(self, node): -@@ -664,9 +668,13 @@ class ASTCodeGenerator(object): - if not first: - self._write(', ') - first = False -- # keyword = (identifier arg, expr value) -- self._write(keyword.arg) -- self._write('=') -+ if not keyword.arg: -+ # Python 3.5+ star-star args -+ self._write('**') -+ else: -+ # keyword = (identifier arg, expr value) -+ self._write(keyword.arg) -+ self._write('=') - self.visit(keyword.value) - if getattr(node, 'starargs', None): - if not first: -diff --git a/genshi/template/directives.py b/genshi/template/directives.py -index 7301c2d..6fd0f28 100644 ---- a/genshi/template/directives.py -+++ b/genshi/template/directives.py -@@ -266,13 +266,21 @@ class DefDirective(Directive): - if isinstance(ast, _ast.Call): - self.name = ast.func.id - for arg in ast.args: -- # only names -- self.args.append(arg.id) -+ if isinstance(arg, _ast.Starred): -+ # Python 3.5+ -+ self.star_args = arg.value.id -+ else: -+ # only names -+ self.args.append(arg.id) - for kwd in ast.keywords: -- self.args.append(kwd.arg) -- exp = Expression(kwd.value, template.filepath, -- lineno, lookup=template.lookup) -- self.defaults[kwd.arg] = exp -+ if kwd.arg is None: -+ # Python 3.5+ -+ self.dstar_args = kwd.value.id -+ else: -+ self.args.append(kwd.arg) -+ exp = Expression(kwd.value, template.filepath, -+ lineno, lookup=template.lookup) -+ self.defaults[kwd.arg] = exp - if getattr(ast, 'starargs', None): - self.star_args = ast.starargs.id - if getattr(ast, 'kwargs', None): -diff --git a/genshi/template/eval.py b/genshi/template/eval.py -index d378419..81644a7 100644 ---- a/genshi/template/eval.py -+++ b/genshi/template/eval.py -@@ -600,6 +600,11 @@ class TemplateASTTransformer(ASTTransformer): - finally: - self.locals.pop() - -+ # Only used in Python 3.5+ -+ def visit_Starred(self, node): -+ node.value = self.visit(node.value) -+ return node -+ - def visit_Name(self, node): - # If the name refers to a local inside a lambda, list comprehension, or - # generator expression, leave it alone --- -2.12.0 - diff --git a/gnu/packages/patches/python-genshi-isstring-helper.patch b/gnu/packages/patches/python-genshi-isstring-helper.patch deleted file mode 100644 index 4f6c19bba9..0000000000 --- a/gnu/packages/patches/python-genshi-isstring-helper.patch +++ /dev/null @@ -1,37 +0,0 @@ -From cc5e07284f44cdd9beec178c69070a53f55d1323 Mon Sep 17 00:00:00 2001 -From: Simon Cross -Date: Sun, 16 Feb 2014 18:43:20 +0000 -Subject: [PATCH 03/15] Add isstring helper. - ---- - genshi/compat.py | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/genshi/compat.py b/genshi/compat.py -index 9787325..6574e39 100644 ---- a/genshi/compat.py -+++ b/genshi/compat.py -@@ -35,6 +35,15 @@ else: - 'Python 2 compatibility function. Not usable in Python 3.') - - -+# We need to test if an object is an instance of a string type in places -+ -+if IS_PYTHON2: -+ def isstring(obj): -+ return isinstance(obj, basestring) -+else: -+ def isstring(obj): -+ return isinstance(obj, str) -+ - # We need to differentiate between StringIO and BytesIO in places - - if IS_PYTHON2: -@@ -112,4 +121,3 @@ except NameError: - if not x: - return False - return True -- --- -2.12.0 - diff --git a/gnu/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch b/gnu/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch deleted file mode 100644 index 29951a6149..0000000000 --- a/gnu/packages/patches/python-genshi-stripping-of-unsafe-script-tags.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0769be04c3891ae5c724c6779ba13d1d0f53b4ae Mon Sep 17 00:00:00 2001 -From: Simon Cross -Date: Sun, 16 Feb 2014 18:25:17 +0000 -Subject: [PATCH 01/15] Also allow stripping of unsafe script tags (Python 3.4 - parses the second example as a tag whose name is script&xyz). - ---- - genshi/filters/tests/test_html.py | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/genshi/filters/tests/test_html.py b/genshi/filters/tests/test_html.py -index 0c6cfe1..45ec0da 100644 ---- a/genshi/filters/tests/test_html.py -+++ b/genshi/filters/tests/test_html.py -@@ -368,12 +368,16 @@ def StyleSanitizer(): - - class HTMLSanitizerTestCase(unittest.TestCase): - -- def assert_parse_error_or_equal(self, expected, exploit): -+ def assert_parse_error_or_equal(self, expected, exploit, -+ allow_strip=False): - try: - html = HTML(exploit) - except ParseError: - return -- self.assertEquals(expected, (html | HTMLSanitizer()).render()) -+ sanitized_html = (html | HTMLSanitizer()).render() -+ if not sanitized_html and allow_strip: -+ return -+ self.assertEquals(expected, sanitized_html) - - def test_sanitize_unchanged(self): - html = HTML(u'fo
o') -@@ -416,10 +420,12 @@ class HTMLSanitizerTestCase(unittest.TestCase): - html = HTML(u'') - self.assertEquals('', (html | HTMLSanitizer()).render()) - src = u'alert("foo")' -- self.assert_parse_error_or_equal('<SCR\x00IPT>alert("foo")', src) -+ self.assert_parse_error_or_equal('<SCR\x00IPT>alert("foo")', src, -+ allow_strip=True) - src = u'' - self.assert_parse_error_or_equal('<SCRIPT&XYZ; ' -- 'SRC="http://example.com/">', src) -+ 'SRC="http://example.com/">', src, -+ allow_strip=True) - - def test_sanitize_remove_onclick_attr(self): - html = HTML(u'
') --- -2.12.0 - diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 9008ca5e72..226b9b631b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -45,6 +45,7 @@ (define-module (gnu packages python-web) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system python) #:use-module (guix utils) #:use-module (gnu packages) @@ -2248,29 +2249,16 @@ for Flask programs that are using @code{python-alembic}.") (define-public python-genshi (package (name "python-genshi") - (version "0.7") + (version "0.7.1") (source (origin - (method url-fetch) - (uri (string-append - "https://ftp.edgewall.org/pub/genshi/Genshi-" - version ".tar.gz")) - (patches - (search-patches - ;; The first 4 patches are in the master branch upstream. - ;; See this as a reference https://genshi.edgewall.org/ticket/582 - ;; The last 2 are NOT in any branch. - ;; They were sent as attachments to a ticket opened at - ;; https://genshi.edgewall.org/ticket/602#no1 - "python-genshi-stripping-of-unsafe-script-tags.patch" - "python-genshi-disable-speedups-on-python-3.3.patch" - "python-genshi-isstring-helper.patch" - "python-genshi-add-support-for-python-3.4-AST.patch" - "python-genshi-fix-tests-on-python-3.5.patch" - "python-genshi-buildable-on-python-2.7.patch")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/edgewall/genshi.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0lkkbp6fbwzv0zda5iqc21rr7rdldkwh3hfabfjl9i4bwq14858x")))) + (base32 "01fx8fnpay5w048ppyjivg2dgfpp5rybn07y3pfsgj2knram3nhl")))) (build-system python-build-system) (home-page "https://genshi.edgewall.org/") (synopsis "Toolkit for generation of output for the web") @@ -2279,9 +2267,6 @@ of components for parsing, generating, and processing HTML, XML or other textual content for output generation on the web.") (license license:bsd-3))) -;; The linter here claims that patch file names should start with the package -;; name. But, in this case the patches are inherited from python-genshi with -;; the "python-genshi-" prefix instead of "python2-genshi-". (define-public python2-genshi (package-with-python2 python-genshi)) -- cgit v1.2.3 From 37a2ea118d7027551c5c53a329a231fef0a2bfe7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 16:56:40 +0200 Subject: gnu: fortify-headers: Update to 1.0. * gnu/packages/suckless.scm (fortify-headers): Update to 1.0. --- gnu/packages/suckless.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index dbfaa29127..a5e02ce948 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -561,7 +561,7 @@ environment variable.") (define-public fortify-headers (package (name "fortify-headers") - (version "0.9") + (version "1.0") (source (origin (method url-fetch) @@ -569,15 +569,15 @@ environment variable.") name "-" version ".tar.gz")) (sha256 (base32 - "1z517ajy34l2k5lz2gvhbmia9xjgagffi4s22azqxnlmgb1g2xfg")))) + "0nvplfg4y4a10x2j12qwmxzlk2q4j6287j0v5f9bfsdayb04qvh2")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests + `(#:tests? #f ; no tests #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (home-page "https://git.2f30.org/fortify-headers/") (synopsis "Standalone fortify-source implementation") (description -- cgit v1.2.3 From 98184e566c004871c3c3510d66dc669cd2ea4462 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 16:51:02 +0200 Subject: gnu: gnome-mpv: Update to 0.15. * gnu/packages/video.scm (gnome-mpv): Update to 0.15. --- 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 900575b828..d18726b33b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1203,7 +1203,7 @@ projects while introducing many more.") (define-public gnome-mpv (package (name "gnome-mpv") - (version "0.14") + (version "0.15") (source (origin (method url-fetch) @@ -1212,7 +1212,7 @@ projects while introducing many more.") ".tar.xz")) (sha256 (base32 - "03kjwd5jq0i5ajnvhjwf5019bjjaa16xkdrhdkiz1k58ipjvvj93")))) + "1y47abkidxh1il0bvq8r3dglwn3ggsy41x2n7ic3x23wvvcqmq74")))) (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From d7e9bd15faddb2a7902f8745d927fdd5d73a5296 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 10 Sep 2018 13:22:35 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.155. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.155. --- 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 7d5b3aed86..f510e02ab9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.154" - "08i9fvrmswkydj538wg6c7ggxmhll0ff0bjkw8rnyslqwilfwr1i" + (make-linux-libre "4.4.155" + "1gcnwrgv0xghr550lcl6dmxdl59drzbi02mwp78g8vjql6ihdfys" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 176999f18ed37e8e494fd9fa5ef12e67d6275386 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 10 Sep 2018 13:23:20 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.126. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.126. --- 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 f510e02ab9..1be1b37ec2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.125" - "1saihk61l1kk42jf8yfsfkm77zalq31f0bdlam3c1g7yw702wj9g" + (make-linux-libre "4.9.126" + "0qa9zxa7isn20b9sbjcyrqfynd00phddv3yindp5dmvsng1kwxj8" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From c727ed05ac52e94de800e5d9c8efda16deaf1719 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 10 Sep 2018 13:24:01 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.69. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.69. (%linux-libre-4.14-hash): 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 1be1b37ec2..183bd88fc3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.68") -(define %linux-libre-4.14-hash "05l5y0vbbl60jxdbqglqr9c99a8g8lfsp4mcqfpcx1pkh5br7i3l") +(define %linux-libre-4.14-version "4.14.69") +(define %linux-libre-4.14-hash "08pw5hywlx3rsavj74qa17fm9hmhaw2rb1d3ahaqmd1zzsddb3qf") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From eb07a6f8980eb71ea03bbb5e304db5d30e2c59c3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 10 Sep 2018 13:25:54 -0400 Subject: gnu: linux-libre: Update to 4.18.7. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.7. (%linux-libre-hash): 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 183bd88fc3..d4e9a5de95 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.6") -(define %linux-libre-hash "1l5caid77vbfb54zrfxkk7qj7lrf9ck9kpn96kr45spkwl51wm8m") +(define %linux-libre-version "4.18.7") +(define %linux-libre-hash "1gn3ip2blczfr5hl20x6c93z8v7h528kl423pzkcn22hin6717wd") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 254844f22d81356ee00977e95640245281257661 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 10 Sep 2018 13:53:21 -0400 Subject: gnu: nano: Update to 3.0. * gnu/packages/nano.scm (nano): Update to 3.0. --- gnu/packages/nano.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index a7adfcd5d5..9396588fc8 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -30,7 +30,7 @@ (define-public nano (package (name "nano") - (version "2.9.8") + (version "3.0") (source (origin (method url-fetch) @@ -38,7 +38,7 @@ version ".tar.xz")) (sha256 (base32 - "122lm0z97wk3mgnbn8m4d769d4j9rxyc9z7s89xd4gsdp8qsrpn2")))) + "1868hg9s584fwjrh0fzdrixmxc2qhw520z4q5iv68kjiajivr9g0")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 2424d5e56ced7ba02877fc52fd3b3b470bde15d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 20:11:37 +0200 Subject: gnu: cloc: Update source hash. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The upstream tarball was modified in place. The only changes are: --- /gnu/store/5v39h6zjs33hj5dm2yggz5qk0mva00bs-cloc-1.78.tar.gz +++ /gnu/store/pm5ghks76vv6awv3969yvi7qxqfnfs1l-cloc-1.78.tar.gz ├── filetype from file(1) │ @@ -1 +1 @@ │ -gzip compressed data, last modified: Fri Sep 7 18:22:49 2018, from Unix │ +gzip compressed data, last modified: Sat Sep 8 14:09:43 2018, from Unix │ --- 5v39h6zjs33hj5dm2yggz5qk0mva00bs-cloc-1.78.tar ├── +++ pm5ghks76vv6awv3969yvi7qxqfnfs1l-cloc-1.78.tar │ ├── file list │ │ @@ -1,13 +1,13 @@ │ │ -rwxrwxr-x 0 al (1000) al (1000) 545021 2018-09-07 18:21:22 cloc-1.78/cloc │ │ -rwxrwxr-x 0 al (1000) al (1000) 1818 2018-09-07 18:21:22 cloc-1.78/sqlite_formatter │ │ -drwxrwxr-x 0 al (1000) al (1000) 0 2018-09-07 18:21:22 cloc-1.78/Unix/ │ │ --rwxrwxr-x 0 al (1000) al (1000) 498571 2018-09-07 18:21:22 cloc-1.78/Unix/cloc │ │ +drwxrwxr-x 0 al (1000) al (1000) 0 2018-09-08 14:09:23 cloc-1.78/Unix/ │ │ +-rwxrwxr-x 0 al (1000) al (1000) 498537 2018-09-08 14:09:22 cloc-1.78/Unix/cloc │ │ -rwxrwxr-x 0 al (1000) al (1000) 32382 2018-09-07 18:21:22 cloc-1.78/Unix/t/00_C.t │ │ -rwxrwxr-x 0 al (1000) al (1000) 12614 2018-09-07 18:21:22 cloc-1.78/Unix/t/01_opts.t │ │ -rw-rw-r-- 0 al (1000) al (1000) 862 2018-09-07 18:21:22 cloc-1.78/Unix/README │ ├── cloc-1.78/Unix/cloc │ │ @@ -1,8 +1,7 @@ │ │ -#!/usr/local/perl/5.28.0/bin/perl │ │ #!/usr/bin/env perl * gnu/packages/code.scm (cloc)[source]: Update sha256 hash. --- gnu/packages/code.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index b3fbea0b38..4264e292bd 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -220,7 +220,7 @@ COCOMO model or user-provided parameters.") "/cloc-" version ".tar.gz")) (sha256 (base32 - "176xklr2qsgxh9zdb565gib6pp4gsm585rz5fvyphgjy4i679wkv")))) + "1j9lwy9xf43kpv1csqdxzch6y1hnsv881ddqd357f8v58dhr4s68")))) (build-system gnu-build-system) (inputs `(("coreutils" ,coreutils) -- cgit v1.2.3 From 8fe059bf6cc98347f200eaf55681beb6ff36582b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 01:14:25 +0200 Subject: gnu: python-cryptography: Update to 2.3.1. * gnu/packages/python-crypto.scm (python-cryptography-vectors, python-cryptography): Update to 2.3.1. --- gnu/packages/python-crypto.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index f612b99d01..63dc1a54df 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -361,14 +361,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography-vectors (package (name "python-cryptography-vectors") - (version "2.2.2") + (version "2.3.1") (source (origin (method url-fetch) (uri (pypi-uri "cryptography_vectors" version)) (sha256 (base32 - "122na0c6r24ch2ifyr4ccjyih0inpqy7bc5za77699g3pa22rd98")))) + "0ijdck30p7jv8a0zwv8b7d30ciqrmmps62lm63l4k776vihrnkdz")))) (build-system python-build-system) (home-page "https://github.com/pyca/cryptography") (synopsis "Test vectors for the cryptography package") @@ -383,14 +383,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography (package (name "python-cryptography") - (version "2.2.2") + (version "2.3.1") (source (origin (method url-fetch) (uri (pypi-uri "cryptography" version)) (sha256 (base32 - "0qrgip8vgcpk7v1jwf67mg50np5iprxrv8qrg8p382hkd6zrbhlz")))) + "1mnzf168vlxirq7fw9dm9zbvma7z8phc9cl5bffw5916m0y1244d")))) (build-system python-build-system) (inputs `(("openssl" ,openssl))) -- cgit v1.2.3 From ba0052e8ae3c36bf016f539ced2d889a78ba13e5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 16:15:33 +0200 Subject: gnu: python-tlsh: Update to 3.4.5. * gnu/packages/python.scm (python-tlsh): Update to 3.4.5. --- 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 1d4b069d09..ce5db2f0e2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6555,7 +6555,7 @@ Python Package Index (PyPI).") (define-public python-tlsh (package (name "python-tlsh") - (version "3.4.4") + (version "3.4.5") (home-page "https://github.com/trendmicro/tlsh") (source (origin (method url-fetch) @@ -6563,7 +6563,7 @@ Python Package Index (PyPI).") version ".tar.gz")) (sha256 (base32 - "00bhzjqrlh7v538kbkbn8lgx976j1138al3sdhklaizqjvpwyk4r")) + "1x1vahd4zg5kpyr9h9hs3fvh460p25rjy4cclwdnbbw8x3vc30q3")) (file-name (string-append name "-" version ".tar.gz")))) (build-system cmake-build-system) (arguments -- cgit v1.2.3 From 418ec0adc9ee8096683064f1aa0c486a8788e1ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 16:32:39 +0200 Subject: gnu: python-libarchive-c: Update to 2.8. * gnu/packages/python.scm (python-libarchive-c): Update to 2.8. [arguments]: Replace 'check' phase. [native-inputs]: Add PYTHON-MOCK and PYTHON-PYTEST. --- gnu/packages/python.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ce5db2f0e2..a8378bf360 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6624,13 +6624,13 @@ a hash value.") (define-public python-libarchive-c (package (name "python-libarchive-c") - (version "2.2") + (version "2.8") (source (origin (method url-fetch) (uri (pypi-uri "libarchive-c" version)) (sha256 (base32 - "0z4r7v3dhd6b3120mav05ff08srih176r2rg5k8kn7mjd9pslm2x")))) + "0qg0v1s9c1xdk9philhnv8k6c6nicvnvfwlc0j9srg90jmdlvm06")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -6642,7 +6642,12 @@ a hash value.") (substitute* "libarchive/ffi.py" (("find_library\\('archive'\\)") (string-append "'" libarchive - "/lib/libarchive.so'"))))))))) + "/lib/libarchive.so'")))))) + (replace 'check + (lambda _ (invoke "pytest" "-vv")))))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) (inputs `(("libarchive" ,libarchive))) (home-page "https://github.com/Changaco/python-libarchive-c") -- cgit v1.2.3 From fc449407fea373444fee97c03ce66f96e376acef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 16:38:28 +0200 Subject: gnu: python-debian: Update home page. * gnu/packages/python.scm (python-debian)[home-page]: Set to source repository. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a8378bf360..a70e0a2a40 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6694,6 +6694,7 @@ serve the same purpose: provide Python bindings for libmagic."))) (define-public python-debian (package (name "python-debian") + (home-page "https://salsa.debian.org/python-debian-team/python-debian") (version "0.1.28") (source (origin @@ -6705,7 +6706,6 @@ serve the same purpose: provide Python bindings for libmagic."))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six))) - (home-page "http://packages.debian.org/sid/python-debian") (synopsis "Debian package related modules") (description ;; XXX: Use @enumerate instead of @itemize to work around -- cgit v1.2.3 From c5e4b4cc8f424a453f064b7c8e5d434e72885392 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 9 Sep 2018 11:22:29 +0200 Subject: gnu: Add libabigail. * gnu/packages/elf.scm (libabigail): New public variable. --- gnu/packages/elf.scm | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 82af1f233d..d8d7546e3c 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,8 +29,13 @@ #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:select (gpl3+ lgpl3+ lgpl2.0+)) #:use-module (gnu packages) + #:use-module (gnu packages compression) + #:use-module (gnu packages documentation) #:use-module (gnu packages m4) - #:use-module (gnu packages compression)) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages xml)) (define-public elfutils (package @@ -85,6 +91,70 @@ Executable and Linkable Format (@dfn{ELF}). This includes @command{ld}, ;; Libraries are dual-licensed LGPLv3.0+ | GPLv2, and programs are GPLv3+. (license lgpl3+))) +(define-public libabigail + (package + (name "libabigail") + (home-page "https://sourceware.org/libabigail/") + (version "1.4") + (source (origin + (method url-fetch) + (uri (string-append "https://sourceware.org/pub/" name + "/" name "-" version ".tar.gz")) + (sha256 + (base32 + "17r8i60lxykvdd9pdidmnvkzgf9k8zman0c1czl3zbx0znhlx497")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static" + "--enable-bash-completion" + "--enable-manual") + #:make-flags '("V=1") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "build-aux/ltmain.sh" + ;; Don't add -specs=/usr/lib/rpm/redhat/redhat-hardened-ld + ;; to the GCC command line. + (("compiler_flags=\"-specs=.*") + "compiler_flags=\n")) + #t)) + (add-after 'build 'build-documentation + (lambda _ + (invoke "make" "-C" "doc/manuals" "html-doc" "man" "info"))) + (add-before 'check 'set-test-environment + (lambda _ + (setenv "XDG_CACHE_HOME" "/tmp") + #t)) + (add-after 'install 'install-documentation + (lambda _ + (invoke "make" "-C" "doc/manuals" + "install-man-and-info-doc"))) + (add-after 'install-documentation 'install-bash-completion + (lambda* (#:key outputs #:allow-other-keys) + (for-each (lambda (file) + (install-file + file (string-append (assoc-ref outputs "out") + "/share/bash-completion" + "/completions"))) + (find-files "bash-completion" ".*abi.*")) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("makeinfo" ,texinfo) + ("python-sphinx" ,python-sphinx) + ("python" ,python))) ;for tests + (propagated-inputs + `(("elfutils" ,elfutils) ;libabigail.la says -lelf + ("libxml2" ,libxml2))) ;in Requires.private of libabigail.pc + (synopsis "Analyze application binary interfaces (ABIs)") + (description + "@dfn{ABIGAIL} stands for the Application Binary Interface Generic +Analysis and Instrumentation Library. It is a framework which aims at +helping developers and software distributors to spot ABI-related issues +like interface incompatibility in ELF shared libraries by performing a +static analysis of the ELF binaries at hand.") + (license lgpl3+))) + (define-public libelf (package (name "libelf") -- cgit v1.2.3 From 9fc445b1a563b95347154523bcca489124141daf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 18:52:01 +0200 Subject: gnu: python-pexpect: Update to 4.6.0. * gnu/packages/python.scm (python-pexpect): Update to 4.6.0. --- 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 8165e47349..4da26c5d30 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4340,13 +4340,13 @@ displayed.") (define-public python-pexpect (package (name "python-pexpect") - (version "4.2.1") + (version "4.6.0") (source (origin (method url-fetch) (uri (pypi-uri "pexpect" version)) (sha256 - (base32 "14ls7k99pwvl21zqv65kzrhccv50j89m5ij1hf0slmsvlxjj84rx")))) + (base32 "1fla85g47iaxxpjhp9vkxdnv4pgc7rplfy6ja491smrrk0jqi3ia")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From b8d165b18a310ddc8462cdbde41db273d5d2a27f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 19:02:17 +0200 Subject: gnu: python-traitlets: Update to 4.3.2. * gnu/packages/python.scm (python-traitlets): Update to 4.3.2. [native-inputs]: Remove PYTHON-NOSE and PYTHON-MOCK. Add PYTHON-PYTEST. [arguments]: Adjust check phase accordingly. [properties]: New field. (python2-traitlets)[propagated-inputs]: Add PYTHON2-ENUM34. --- gnu/packages/python.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4da26c5d30..25ce14cca4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4518,25 +4518,25 @@ away.") (define-public python-traitlets (package (name "python-traitlets") - (version "4.2.0") + (version "4.3.2") (source (origin (method url-fetch) (uri (pypi-uri "traitlets" version)) (sha256 (base32 - "1afy08sa5n9gnkvh3da49c16zkyv598vchv0p1hp7zzjy8895hz4")))) + "0dbq7sx26xqz5ixs711k5nc88p8a0nqyz6162pwks5dpcz9d4jww")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (replace 'check (lambda _ (zero? (system* "nosetests"))))))) + (replace 'check (lambda _ (invoke "pytest" "-vv" "traitlets")))))) (propagated-inputs `(("python-ipython-genutils" ,python-ipython-genutils) - ("python-decorator" ,python-decorator))) + ("python-decorator" ,python-decorator))) ;not needed for >4.3.2 (native-inputs - `(("python-mock" ,python-mock) - ("python-nose" ,python-nose))) + `(("python-pytest" ,python-pytest))) + (properties `((python2-variant . ,(delay python2-traitlets)))) (home-page "https://ipython.org") (synopsis "Configuration system for Python applications") (description @@ -4549,7 +4549,12 @@ without using the configuration machinery.") (license license:bsd-3))) (define-public python2-traitlets - (package-with-python2 python-traitlets)) + (let ((traitlets (package-with-python2 (strip-python2-variant python-traitlets)))) + (package + (inherit traitlets) + (propagated-inputs + `(("python2-enum34" ,python2-enum34) + ,@(package-propagated-inputs traitlets)))))) (define-public python-jupyter-core (package -- cgit v1.2.3 From 242f2711bd3b3944eefc4065d685324b22369116 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 10 Sep 2018 19:15:38 +0200 Subject: gnu: python-pyzmq: Update to 17.1.2. * gnu/packages/python.scm (python-pyzmq): Update to 17.1.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 25ce14cca4..f00848a9c0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5466,13 +5466,13 @@ applications.") (define-public python-pyzmq (package (name "python-pyzmq") - (version "15.1.0") + (version "17.1.2") (source (origin (method url-fetch) (uri (pypi-uri "pyzmq" version)) (sha256 - (base32 "13fhwnlvsvxv72kfhqbpn6qi7msh8mc8377mpabv32skk2cjfnxx")))) + (base32 "1pyxxrz60f88ffm0y6vpbx3q8jcr9ybz8fcilihwzwhh36n84ax7")))) (build-system python-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 875d0681768408997cda108457aaf10116da3732 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 10 Sep 2018 15:42:07 -0400 Subject: Adjust all users of (gnu packages ldc) to use (gnu packages dlang). This is a followup to commit 98d6543f86d01486c2f6e808eedd97c601ba3e7a. * gnu/packages/bioinformatics.scm, guix/build-system/dub.scm: Adjust accordingly. --- gnu/packages/bioinformatics.scm | 2 +- guix/build-system/dub.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fc8be4d7db..f6410c3ca4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -76,7 +76,7 @@ #:use-module (gnu packages imagemagick) #:use-module (gnu packages java) #:use-module (gnu packages jemalloc) - #:use-module (gnu packages ldc) + #:use-module (gnu packages dlang) #:use-module (gnu packages linux) #:use-module (gnu packages logging) #:use-module (gnu packages machine-learning) diff --git a/guix/build-system/dub.scm b/guix/build-system/dub.scm index 13c89e8648..5a31a2f51a 100644 --- a/guix/build-system/dub.scm +++ b/guix/build-system/dub.scm @@ -35,13 +35,13 @@ (define (default-ldc) "Return the default ldc package." ;; Lazily resolve the binding to avoid a circular dependency. - (let ((ldc (resolve-interface '(gnu packages ldc)))) + (let ((ldc (resolve-interface '(gnu packages dlang)))) (module-ref ldc 'ldc))) (define (default-dub) "Return the default dub package." ;; Lazily resolve the binding to avoid a circular dependency. - (let ((ldc (resolve-interface '(gnu packages ldc)))) + (let ((ldc (resolve-interface '(gnu packages dlang)))) (module-ref ldc 'dub))) (define (default-pkg-config) -- cgit v1.2.3 From d56eee862bbd8295351aecb049110e6b23a672c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 22:13:07 +0200 Subject: gnu: qtractor: Update to 0.9.2. * gnu/packages/music.scm (qtractor): Update to 0.9.2. [arguments]: Remove obsolete Qt 5.11 workaround. --- gnu/packages/music.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index e39478e794..e563062018 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2198,28 +2198,17 @@ from the command line.") (define-public qtractor (package (name "qtractor") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) (uri (string-append "http://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "07csbqr7q4m1j0pqg89kn7jdw0snd5lwna5rha0986s4plq4z1qb")))) + "1j3rpvdkw9rw48j4zyfn6rprp01csy4rl6zckcjyx0vh7vaycchr")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no "check" target - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-build-with-qt-5.11 - (lambda _ - (substitute* "src/qtractorMeter.h" - (("#include " m) - (string-append "#include \n" m))) - (substitute* "src/qtractorTrackButton.h" - (("#include " m) - (string-append "#include \n" m))) - #t))))) + `(#:tests? #f)) ; no "check" target (inputs `(("qt" ,qtbase) ("qtx11extras" ,qtx11extras) -- cgit v1.2.3 From 7a6eaf5ca9c12c2d844223080694b94953abf982 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 21:47:32 +0200 Subject: gnu: python-parso: Update to 0.3.1. * gnu/packages/python.scm (python-parso): Update to 0.3.1. --- 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 a70e0a2a40..8d36883593 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13519,14 +13519,14 @@ time-based (TOTP) passwords.") (define-public python-parso (package (name "python-parso") - (version "0.2.1") + (version "0.3.1") (source (origin (method url-fetch) (uri (pypi-uri "parso" version)) (sha256 (base32 - "0zvh4rdhv2wkglkgh0h9kn9ndpsw5p639wcwv47jn1kfp504lq7h")))) + "18p89iwcm8mnf380f92g9w0bhx5km8wxp392vvjcq4y1ld1llw1m")))) (native-inputs `(("python-pytest" ,python-pytest))) (build-system python-build-system) -- cgit v1.2.3 From cc12ac58a2cab7937e230db0db95c80919969f11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 21:48:05 +0200 Subject: gnu: python-jedi: Update to 0.12.1. * gnu/packages/python.scm (python-jedi): Update to 0.12.1. [synopsis, description]: Adjust to expanded functionality. --- gnu/packages/python.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8d36883593..d1a912c15b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9639,14 +9639,14 @@ characters, mouse support, and auto suggestions.") (define-public python-jedi (package (name "python-jedi") - (version "0.12.0") + (version "0.12.1") (source (origin (method url-fetch) (uri (pypi-uri "jedi" version)) (sha256 (base32 - "1bcr7csx4xil1iwmk03d79jis0bkmgi9k0kir3xa4rmwqsagcwhr")))) + "1h8ypnjisn57kiv1zqrkj1im6sbfnhxllqaa8znh39qkd47ys2dl")))) (build-system python-build-system) (arguments `(#:phases @@ -9658,11 +9658,14 @@ characters, mouse support, and auto suggestions.") ("python-parso" ,python-parso) ("python-docopt" ,python-docopt))) (home-page "https://github.com/davidhalter/jedi") - (synopsis - "Autocompletion for Python that can be used for text editors") + (synopsis "Autocompletion and static analysis library for Python") (description - "Jedi is an autocompletion tool for Python that can be used for text - editors.") + "Jedi is a static analysis tool for Python that can be used in Integrated +Development Environments (@dfn{IDE}s) and text editors. It understands Python +on a deeper level than many other static analysis frameworks for Python. + +Jedi understands docstrings and you can use Jedi autocompletion in your REPL as +well.") (license license:expat))) (define-public python2-jedi -- cgit v1.2.3 From c0ea7f5ff4e18a2e786529d47137ee6ec776434a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 21:33:17 +0200 Subject: gnu: python-parse: Mark up description. * gnu/packages/python.scm (python-parse)[description]: Use @code{}. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d1a912c15b..223a3c80e8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1583,7 +1583,7 @@ backported for previous versions of Python from 2.4 to 3.3.") (home-page "https://github.com/r1chardj0n3s/parse") (synopsis "Parse strings") (description - "Parse strings using a specification based on the Python format() + "Parse strings using a specification based on the Python @code{format()} syntax.") (license license:x11))) -- cgit v1.2.3 From 86788cb0c9998e887b9e754ee43d36dced8f29db Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 21:30:28 +0200 Subject: gnu: python-parse: Update to 1.8.4. * gnu/packages/python.scm (python-parse): Update to 1.8.4. --- 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 223a3c80e8..3083cde08c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1566,14 +1566,14 @@ backported for previous versions of Python from 2.4 to 3.3.") (define-public python-parse (package (name "python-parse") - (version "1.8.2") + (version "1.8.4") (source (origin (method url-fetch) (uri (pypi-uri "parse" version)) (sha256 (base32 - "1lj9v1q4imszyhvipb6drsm3xdl35nan011mqxxas1yaypixsj40")))) + "0f8997xr8nq2nq35iiviq8ningd1zvy59fg503xfpbi2dwhgdkf3")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 4b41568fa598f101b0a670f5882da88105218270 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 21:00:20 +0200 Subject: gnu: python-binaryornot: Update to 0.4.4. * gnu/packages/python.scm (python-binaryornot): Update to 0.4.4. --- 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 3083cde08c..a3eeb3c883 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9844,13 +9844,13 @@ hardware-accelerated multitouch applications.") (define-public python-binaryornot (package (name "python-binaryornot") - (version "0.4.0") + (version "0.4.4") (source (origin (method url-fetch) (uri (pypi-uri "binaryornot" version)) (sha256 (base32 - "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb")))) + "0qc006986rb6bcbmiymwgcl1mns2jphr1j7sr7nk41nlr7gh359m")))) (build-system python-build-system) (propagated-inputs `(("python-chardet" ,python-chardet) -- cgit v1.2.3 From 695775b138133db3c5a7a07916f45dc783fe9a11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 20:47:21 +0200 Subject: gnu: kakoune: Update to 2018.09.04. * gnu/packages/text-editors.scm (kakoune): Update to 2018.09.04. --- 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 2536754eb7..d344ebdca0 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -102,7 +102,7 @@ based command language.") (define-public kakoune (package (name "kakoune") - (version "2018.04.13") + (version "2018.09.04") (source (origin (method url-fetch) @@ -111,7 +111,7 @@ based command language.") name "-" version ".tar.bz2")) (sha256 (base32 - "1kkzs5nrjxzd1jq7a4k7qfb5kg05871z0r3d9c0yhz9shf6wz36d")))) + "1qbj2hmcfs6pr5lc78z9ni5zxdyp3mr64dvms4l52716ikqcjcbs")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From 4105f13bb5e1ec946bfc9705498ed9aad2228bcf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 22:53:28 +0200 Subject: gnu: tor: Update to 0.3.4.8. * gnu/packages/tor.scm (tor): Update to 0.3.4.8. --- gnu/packages/tor.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index e897dff639..7d46191c12 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -47,21 +47,21 @@ (define-public tor (package (name "tor") - (version "0.3.3.9") + (version "0.3.4.8") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "0vyf5z0dn5jghp2qjp076aq62lsz9g32qv9jiqf08skf096nnd45")))) + "08qhzcmzxp5xr2l5721vagksqnnbrzzzy5hmz5y9r8lrq2r4qsl2")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-gcc-hardening" "--enable-linker-hardening"))) (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python-2))) ; for tests + ("python" ,python-2))) ; for tests (inputs `(("zlib" ,zlib) ("openssl" ,openssl) -- cgit v1.2.3 From b38827096f6c3229ed6bfbfda3eaa28d78f3cbaa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 22:42:48 +0200 Subject: gnu: mcrl2: Use HTTPS home page. * gnu/packages/maths.scm (mcrl2)[home-page]: Use HTTPS. --- 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 01bd03c600..4e1347e8fc 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3975,7 +3975,7 @@ toolset supports analysis and automatic verification, linearisation, simulation, state-space exploration and generation, and tools to optimise and analyse specifications. Also, state spaces can be manipulated, visualised and analysed.") - (home-page "http://mcrl2.org") + (home-page "https://mcrl2.org") (license license:boost1.0))) (define-public r-subplex -- cgit v1.2.3 From 2740549754f9d3d8ed1c3168d43ab820785cc5d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 20:47:05 +0200 Subject: gnu: kakoune: Use HTTPS home page. * gnu/packages/text-editors.scm (kakoune)[home-page]: Use HTTPS. --- gnu/packages/text-editors.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index d344ebdca0..0c60d202a3 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -147,7 +147,7 @@ commands are similar to Vi's ones, and it shares Vi's \"keystrokes as a text editing language\" model. Kakoune has a strong focus on interactivity, most commands provide immediate and incremental results, while still being competitive (as in keystroke count) with Vim.") - (home-page "http://kakoune.org/") + (home-page "https://kakoune.org/") (license license:unlicense))) (define-public joe -- cgit v1.2.3 From 029de52fe9f5f8aa2b2ef462c30118cbb9721f64 Mon Sep 17 00:00:00 2001 From: Thorsten Wilms Date: Mon, 10 Sep 2018 23:56:11 +0200 Subject: gnu: guitarix-lv2: Use correct configure flag. * gnu/packages/audio.scm (guitarix-lv2)[arguments]: Change configure flag. Signed-off-by: Ricardo Wurmus --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 3b898c024a..7e6feec352 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1291,7 +1291,7 @@ auto-wah.") (arguments (substitute-keyword-arguments (package-arguments guitarix) ((#:configure-flags flags) - `(cons "--lv2-only" ,flags)))))) + `(cons "--no-standalone" ,flags)))))) (define-public rakarrack (package -- cgit v1.2.3 From d54145c38a5112cdb7af417600e13319df5d475c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Sep 2018 23:57:41 +0200 Subject: gnu: guitarix: Update to 0.37.3. * gnu/packages/audio.scm (guitarix): Update to 0.37.3. [inputs]: Add curl. --- gnu/packages/audio.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 7e6feec352..8bce6fa2c2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1231,7 +1231,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.") (define-public guitarix (package (name "guitarix") - (version "0.37.1") + (version "0.37.3") (source (origin (method url-fetch) (uri (string-append @@ -1239,7 +1239,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.") version ".tar.xz")) (sha256 (base32 - "064k0jzxqgx9gwf8za6jziansabzrwzjaim3qx1743ify5g3gaai")))) + "1wfm8wrwrnqpb4ihy75n7l9i6vml536jlq9pdx2pblbc4ba3paac")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no "check" target @@ -1252,6 +1252,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.") (inputs `(("libsndfile" ,libsndfile) ("boost" ,boost) + ("curl" ,curl) ("avahi" ,avahi) ("eigen" ,eigen) ("lv2" ,lv2) -- cgit v1.2.3 From 2f195b6f23865417284883bfebc3b697270130f5 Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 10:28:15 +0200 Subject: gnu: Add r-mosaicdata. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-mosaicdata): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8144391729..11822e1aa5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5564,3 +5564,22 @@ gf_density(), and so on, bring the formula interface to ggplot(). This captures and extends the excellent simplicity of the lattice-graphics formula interface, while providing the intuitive capabilities of @code{r-ggplot2}.") (license license:expat))) + +(define-public r-mosaicdata + (package + (name "r-mosaicdata") + (version "0.17.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "mosaicData" version)) + (sha256 + (base32 "04z0mdm52mykqsxsinhmsihn181zf6cw321gayk2rjp7lj7mwdq9")))) + (properties `((upstream-name . "mosaicData"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/mosaicData/") + (synopsis "Data sets for project Mosaic") + (description + "This package provides data sets from project Mosaic @url{http://mosaic-web.org} +used to teach mathematics, statistics, computation and modeling.") + (license license:gpl2+))) -- cgit v1.2.3 From 6c6ce2d08832ea4b854fe689ec1b3e4ac3ae60bc Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 10:32:59 +0200 Subject: gnu: Add r-mosaic. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-mosaic): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 11822e1aa5..62d1d32669 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5583,3 +5583,43 @@ while providing the intuitive capabilities of @code{r-ggplot2}.") "This package provides data sets from project Mosaic @url{http://mosaic-web.org} used to teach mathematics, statistics, computation and modeling.") (license license:gpl2+))) + +(define-public r-mosaic + (package + (name "r-mosaic") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "mosaic" version)) + (sha256 + (base32 "10jbrg8kli00kfgbh2f67bymm5cnlancc9dplb1j7fl552yjddn2")))) + (build-system r-build-system) + (propagated-inputs + `(("r-broom" ,r-broom) + ("r-dplyr" ,r-dplyr) + ("r-ggdendro" ,r-ggdendro) + ("r-ggformula" ,r-ggformula) + ("r-ggplot2" ,r-ggplot2) + ("r-ggrepel" ,r-ggrepel) + ("r-glue" ,r-glue) + ("r-gridextra" ,r-gridextra) + ("r-lattice" ,r-lattice) + ("r-latticeextra" ,r-latticeextra) + ("r-lazyeval" ,r-lazyeval) + ("r-mass" ,r-mass) + ("r-matrix" ,r-matrix) + ("r-mosaiccore" ,r-mosaiccore) + ("r-mosaicdata" ,r-mosaicdata) + ("r-readr" ,r-readr) + ("r-tidyr" ,r-tidyr))) + (home-page "https://github.com/ProjectMOSAIC/mosaic/") + (synopsis "Mathematics, statistics, and computation teaching utilities") + (description + "This package contain data sets and utilities from +@url{http://mosaic-web.org, Project MOSAIC} used to teach mathematics, +statistics, computation and modeling. Project MOSAIC is a community of +educators working to tie together aspects of quantitative work that students +in science, technology, engineering and mathematics will need in their +professional lives, but which are usually taught in isolation, if at all.") + (license license:gpl2+))) -- cgit v1.2.3 From cbb0edd1be1f653d253258dfa90c8b45f288fb1b Mon Sep 17 00:00:00 2001 From: pimi Date: Wed, 29 Aug 2018 10:36:56 +0200 Subject: gnu: Add r-abd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-abd): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 62d1d32669..5cd456914b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5623,3 +5623,25 @@ educators working to tie together aspects of quantitative work that students in science, technology, engineering and mathematics will need in their professional lives, but which are usually taught in isolation, if at all.") (license license:gpl2+))) + +(define-public r-abd + (package + (name "r-abd") + (version "0.2-8") + (source + (origin + (method url-fetch) + (uri (cran-uri "abd" version)) + (sha256 + (base32 "191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7")))) + (build-system r-build-system) + (propagated-inputs + `(("r-lattice" ,r-lattice) + ("r-mosaic" ,r-mosaic) + ("r-nlme" ,r-nlme))) + (home-page "https://cran.r-project.org/web/packages/abd/") + (synopsis "Analysis of biological data") + (description + "The @code{r-abd} package contains data sets and sample code for the Analysis of +biological data by Michael Whitlock and Dolph Schluter.") + (license license:gpl2))) -- cgit v1.2.3 From 2225d56a14a2d8d29374a14eefe90b3cffa79804 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 10 Sep 2018 23:37:48 +0200 Subject: profiles: Correctly deal with etc/ being a relative symlink. Fixes . Reported by Oleg Pykhalov . * guix/build/profiles.scm (ensure-writable-directory): Add #:symlink. [absolute?]: New procedure. [unsymlink]: Use it to determine how to resolve readlink's result. (build-profile): Pass SYMLINK to 'ensure-writable-directory'. * tests/profiles.scm ("profile-derivation when etc/ is a relative symlink"): New test. --- guix/build/profiles.scm | 15 ++++++++++++--- tests/profiles.scm | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/guix/build/profiles.scm b/guix/build/profiles.scm index df785c85a7..0c23cd300e 100644 --- a/guix/build/profiles.scm +++ b/guix/build/profiles.scm @@ -94,12 +94,20 @@ definitions for all the SEARCH-PATHS." (for-each (write-environment-variable-definition port) (map (abstract-profile output) variables)))))) -(define (ensure-writable-directory directory) +(define* (ensure-writable-directory directory + #:key (symlink symlink)) "Ensure DIRECTORY exists and is writable. If DIRECTORY is currently a symlink (to a read-only directory in the store), then delete the symlink and instead make DIRECTORY a \"real\" directory containing symlinks." + (define (absolute? file) + (string-prefix? "/" file)) + (define (unsymlink link) - (let* ((target (readlink link)) + (let* ((target (match (readlink link) + ((? absolute? target) + target) + ((? string? relative) + (string-append (dirname link) "/" relative)))) ;; TARGET might itself be a symlink, so append "/" to make sure ;; 'scandir' enters it. (files (scandir (string-append target "/") @@ -149,7 +157,8 @@ SEARCH-PATHS." ;; Make sure we can write to 'OUTPUT/etc'. 'union-build' above could have ;; made 'etc' a symlink to a read-only sub-directory in the store so we need ;; to work around that. - (ensure-writable-directory (string-append output "/etc")) + (ensure-writable-directory (string-append output "/etc") + #:symlink symlink) ;; Write 'OUTPUT/etc/profile'. (build-etc/profile output search-paths)) diff --git a/tests/profiles.scm b/tests/profiles.scm index 3a59a0cc4f..9f366a04ef 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -20,6 +20,7 @@ (define-module (test-profiles) #:use-module (guix tests) #:use-module (guix profiles) + #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix monads) #:use-module (guix grafts) @@ -543,6 +544,41 @@ get-string-all) "foo!")))))) +(test-assertm "profile-derivation when etc/ is a relative symlink" + ;; See . + (mlet* %store-monad + ((etc (gexp->derivation + "etc" + #~(begin + (mkdir #$output) + (call-with-output-file (string-append #$output "/foo") + (lambda (port) + (display "Heya!" port)))))) + (thing -> (dummy-package "dummy" + (build-system trivial-build-system) + (inputs + `(("etc" ,etc))) + (arguments + `(#:guile ,%bootstrap-guile + #:builder + (let ((out (assoc-ref %outputs "out")) + (etc (assoc-ref %build-inputs "etc"))) + (mkdir out) + (symlink etc (string-append out "/etc")) + #t))))) + (entry -> (package->manifest-entry thing)) + (drv (profile-derivation (manifest (list entry)) + #:relative-symlinks? #t + #:hooks '() + #:locales? #f)) + (profile -> (derivation->output-path drv))) + (mbegin %store-monad + (built-derivations (list drv)) + (return (string=? (call-with-input-file + (string-append profile "/etc/foo") + get-string-all) + "Heya!"))))) + (test-equalm "union vs. dangling symlink" ; "does-not-exist" (mlet* %store-monad -- cgit v1.2.3 From 5d9c28f117fa6fa9d0b4439ac02e74a4656d25af Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 10 Sep 2018 18:39:28 -0400 Subject: gnu: git: Update to 2.19.0. * gnu/packages/version-control.scm (git): Update to 2.19.0. (cgit)[inputs]: Use the source of Git 2.18.0. --- gnu/packages/version-control.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5e0b497ace..3774961786 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -146,14 +146,14 @@ as well as the classic centralized workflow.") (name "git") ;; XXX When updating Git, check if the special 'git-source' input to cgit ;; needs to be updated as well. - (version "2.18.0") + (version "2.19.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b")))) + "1x1y5z3awabmfg7hk6zb331jxngad4nal4507v96bnf0izsyy3qq")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -166,7 +166,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "15k04s9pcc5wkmlfa8x99nbgczjbx0c91767ciqmjy9kwsavxqws")))))) + "1jvxiqvp9q4is3np063ny7rnmk5hm36d34bhi3cgv89njqdh8laf")))))) (inputs `(("curl" ,curl) ("expat" ,expat) @@ -642,7 +642,14 @@ collaboration using typical untrusted file hosts or services.") ("xz" ,xz))) (inputs `(;; Building cgit requires a Git source tree. - ("git-source" ,(package-source git)) + ("git-source" + ,(origin + (method url-fetch) + ;; XXX CGit is currently incompatible with Git > 2.18. + (uri "mirror://kernel.org/software/scm/git/git-2.18.0.tar.xz") + (sha256 + (base32 + "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b")))) ("openssl" ,openssl) ("groff" ,groff) ("python" ,python) -- cgit v1.2.3 From 091ef8c97e714c136850e1751972e23fd420765c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 10 Sep 2018 19:24:31 -0400 Subject: gnu: VLC: Update to 3.0.4. * gnu/packages/video.scm (vlc): Update to 3.0.4. --- 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 d18726b33b..aa2b4467fc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -864,7 +864,7 @@ videoformats depend on the configuration flags of ffmpeg.") (define-public vlc (package (name "vlc") - (version "3.0.3-1") + (version "3.0.4") (source (origin (method url-fetch) (uri (string-append @@ -874,7 +874,7 @@ videoformats depend on the configuration flags of ffmpeg.") (patches (list %vlc-libx264-compat.patch)) (sha256 (base32 - "1p7qvdvg9w4lz8vckzhn6bswfkq3qw7fqkgvwjcskdgc266xx7dw")))) + "17jsq0zqpqyxw4ckvjba0hf6zk8ywc4wf8sy3z03hh3ij0vxpwq1")))) (build-system gnu-build-system) (native-inputs `(("flex" ,flex) -- cgit v1.2.3 From e76709f71fa4c6ccf1c428a024c25c25a29854e6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 1 Sep 2018 21:10:36 -0400 Subject: gnu: go-github-com-syncthing-notify: Update to 0.0.0-2.b76b458. * gnu/packages/syncthing.scm (go-github-com-syncthing-notify): Update to 0.0.0-2.b76b458. --- gnu/packages/syncthing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 6577955496..0a5136cad4 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1063,8 +1063,8 @@ using sh's word-splitting rules.") (license expat)))) (define-public go-github-com-syncthing-notify - (let ((commit "cdf89c4039d13726e227d0a472053ea19de021b4") - (revision "1")) + (let ((commit "b76b45868a77e7800dd06cce61101af9c4274bcc") + (revision "2")) (package (name "go-github-com-syncthing-notify") (version (git-version "0.0.0" revision commit)) @@ -1076,7 +1076,7 @@ using sh's word-splitting rules.") (file-name (git-file-name name version)) (sha256 (base32 - "1ra1id9r06i4q8vhrrv1zpybhjxs3361rg35758dxglkyk4pzk6j")))) + "1xxkzaxygxxr51i2kdxsdaqb5i95hqpkw4kcr75wmsp914slw2q9")))) (build-system go-build-system) (arguments '(#:import-path "github.com/syncthing/notify")) -- cgit v1.2.3 From b4ff75b5072613beaa66b72d1da4a30679ac7600 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 7 Aug 2018 13:34:20 -0400 Subject: gnu: syncthing: Update to 0.14.50. * gnu/packages/syncthing.scm (syncthing): Update to 0.14.50. --- gnu/packages/syncthing.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 0a5136cad4..29caaaf02e 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -30,7 +30,7 @@ (define-public syncthing (package (name "syncthing") - (version "0.14.49") + (version "0.14.50") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,7 +38,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "06mzzj5iwgqw3yva7azrsqs9zpl84srbamza4gm03grp7v9gf3sj")) + "0yjj6zzivzw289bhwqjb4xcv8p39n5mcwwr5w6xf5ykzljc5pk55")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet '(begin -- cgit v1.2.3 From f659e5e379dc3ec43be27a8e3169fe2ed197bb93 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Sep 2018 13:19:47 +0200 Subject: gnu: python-waf: Update to 2.0.11. * gnu/packages/python.scm (python-waf): Update to 2.0.11. --- 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 f00848a9c0..5a1f3ed229 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5431,14 +5431,14 @@ so it might be a tiny bit slower.") (define-public python-waf (package (name "python-waf") - (version "2.0.10") + (version "2.0.11") (source (origin (method url-fetch) (uri (string-append "https://waf.io/" "waf-" version ".tar.bz2")) (sha256 (base32 - "1v832jljl5wwqyimz40zgksf5ws1w3d2niz3qxamyp5dnyvzjl35")))) + "13zrniwkmfqgsgzi9v5m1367fppp9yzrz6z2ny6hy8dmpb8mj4z4")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 36e8185667c41740786d9b2eb3672a0f8b902ed8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Sep 2018 14:00:20 +0200 Subject: gnu: lv2: Use Python 2 for building. * gnu/packages/audio.scm (lv2)[arguments]: Set #:python. --- gnu/packages/audio.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 3b898c024a..8ce9af6af1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1777,6 +1777,8 @@ significantly faster and have minimal dependencies.") (build-system waf-build-system) (arguments `(#:tests? #f ; no check target + ;; XXX: The bundled waf does not work with Python 3.7. + #:python ,python-2 #:configure-flags '("--no-plugins"))) (inputs ;; Leaving off cairo and gtk+-2.0 which are needed for example plugins -- cgit v1.2.3 From 41a659d2ecb95c80cbf29f5b0c5d78381550fbca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Sep 2018 01:50:40 +0200 Subject: gnu: usbredir: Update to 0.8.0. * gnu/packages/spice.scm (usbredir): Update to 0.8.0. [source]: Use URL-FETCH. [native-inputs]: Remove AUTOCONF, AUTOMAKE and LIBTOOL. [arguments]: Remove. --- gnu/packages/spice.scm | 76 +++++++++++++++----------------------------------- 1 file changed, 22 insertions(+), 54 deletions(-) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 69bc2b82cb..fc08a1dfdf 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -19,7 +19,6 @@ (define-module (gnu packages spice) #:use-module (gnu packages) - #:use-module (gnu packages autotools) ; remove after updating usbredir to 0.7.1+ #:use-module (gnu packages compression) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages gl) @@ -40,64 +39,33 @@ #:use-module (gnu packages xml) #:use-module (guix build-system gnu) #:use-module (guix download) - #:use-module (guix git-download) ; remove after updating usbredir to 0.7.1+ #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils)) (define-public usbredir - (let ((commit "ac80a5971c6318d73d5fba4b5f13d3a9389558c9") - (revision "1")) ;Guix package revision - (package - (name "usbredir") - (version (string-append "0.7.1-" revision "." - (string-take commit 7))) - ;(version "0.7.1") - ;(source (origin - ; (method url-fetch) - ; (uri (string-append - ; "http://spice-space.org/download/usbredir/" - ; "usbredir-" version ".tar.bz2")) - ; (sha256 - ; (base32 - ; "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0")))) - ; FIXME: usbredir 0.7.1 release doesn't build on 32 bit systems. - ; issue is fixed in HEAD - ; remove 'autogen phase and autoconf, automake, libtool inputs - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://anongit.freedesktop.org/git/spice/usbredir.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "052fywgi72j68dr5ybldncg4vk8iqfrh58la7iazyxxpph9aag1g")))) - (build-system gnu-build-system) - (propagated-inputs - `(("libusb" ,libusb))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - ;; Build without '-Werror', in particular to avoid errors due - ;; to the use of the deprecated 'libusb_set_debug' function. - (substitute* "configure.ac" - (("-Werror") "")) - (zero? (system* "autoreconf" "-vfi"))))))) - (synopsis "Tools for sending USB device traffic over a network") - (description "Usbredir is a network protocol for sending USB device traffic - over a network connection. It can be used to redirect traffic from a USB device - to a different (virtual) machine than the one to which the USB device is - attached.") - (home-page "https://www.spice-space.org") - (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+))))) + (package + (name "usbredir") + (home-page "https://spice-space.org") + (version "0.8.0") + (source (origin + (method url-fetch) + (uri (string-append home-page "/download/" name "/" name "-" + version ".tar.bz2")) + (sha256 + (base32 + "002yik1x7kn0427xahvnhjby2np14a6xqw7c3dx530n9h5d9rg47")))) + (build-system gnu-build-system) + (propagated-inputs + `(("libusb" ,libusb))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (synopsis "Tools for sending USB device traffic over a network") + (description + "Usbredir is a network protocol for sending USB device traffic over a +network connection. It can be used to redirect traffic from a USB device to a +different (virtual) machine than the one to which the USB device is attached.") + (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+)))) (define-public virglrenderer (package -- cgit v1.2.3 From f6b7ccc9f9e72c6492c7be37ff7da769081dc2cc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 11 Sep 2018 01:58:06 +0200 Subject: gnu: spice: Update to 0.14.1 [fixes CVE-2018-10873]. * gnu/packages/spice.scm (spice): Update to 0.14.1. [source](uri): Update to new "spice-server" subdirectory. [native-inputs]: Add GLIB-NETWORKING and GSETTINGS-DESKTOP-SCHEMAS. [arguments]: Remove configure-flag which is now off even when celt is available. Add phase to set $SSL_CERT_FILE. --- gnu/packages/spice.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index fc08a1dfdf..e708d726bb 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -177,15 +177,15 @@ which allows users to view a desktop computing environment.") (define-public spice (package (name "spice") - (version "0.14.0") + (version "0.14.1") (source (origin (method url-fetch) (uri (string-append "https://www.spice-space.org/download/releases/" - "spice-" version ".tar.bz2")) + "spice-server/spice-" version ".tar.bz2")) (sha256 (base32 - "0j5q7cp5p95jk8fp48gz76rz96lifimdsx1wnpmfal0nnnar9nrs")))) + "068mb9l7wzk4k4c65bzvpw5fyyzh81rb6z81skgdxvh67pk5vb8y")))) (build-system gnu-build-system) (propagated-inputs `(("openssl" ,openssl) @@ -202,12 +202,18 @@ which allows users to view a desktop computing environment.") (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python) - ("spice-gtk" ,spice-gtk))) + ("spice-gtk" ,spice-gtk) + + ;; These are needed for the server listen tests. + ("glib-networking" ,glib-networking) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) (arguments `(#:configure-flags - '("--disable-celt051" ; Disable support for unpackaged audio codec - "--enable-lz4" - "--enable-automated-tests"))) + '("--enable-lz4" + "--enable-automated-tests") + #:phases (modify-phases %standard-phases + (add-before 'check 'use-empty-ssl-cert-file + (lambda _ (setenv "SSL_CERT_FILE" "/dev/null") #t))))) (synopsis "Server implementation of the SPICE protocol") (description "SPICE is a remote display system built for virtual environments which allows you to view a computing 'desktop' environment -- cgit v1.2.3 From 01af264dcbfb66aa3bc23f56335c6d64163cca8c Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Sat, 8 Sep 2018 22:54:58 +0200 Subject: gnu: Add r-svgui. * gnu/packages/cran.scm (r-svgui): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5cd456914b..ab989abfff 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -33,6 +33,8 @@ #:use-module (guix build-system r) #:use-module (gnu packages compression) #:use-module (gnu packages gcc) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) #:use-module (gnu packages machine-learning) #:use-module (gnu packages maths) #:use-module (gnu packages mpi) @@ -5645,3 +5647,24 @@ professional lives, but which are usually taught in isolation, if at all.") "The @code{r-abd} package contains data sets and sample code for the Analysis of biological data by Michael Whitlock and Dolph Schluter.") (license license:gpl2))) + +(define-public r-svgui + (package + (name "r-svgui") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "svGUI" version)) + (sha256 + (base32 "1r7ab0p4yr8q03gj02hmj7k1ghksgkg4nx750c0ajfs2q9y1dxfc")))) + (properties `((upstream-name . "svGUI"))) + (build-system r-build-system) + (home-page "https://github.com/SciViews/svGUI/") + (synopsis "Functions for managing GUI clients in R") + (description + "The SciViews @code{svGUI} package eases the management of Graphical User +Interfaces (GUI) in R. It is independent from any particular GUI widgets. It +centralizes info about GUI elements currently used, and it dispatches GUI +calls to the particular toolkits in use in function of the context.") + (license license:gpl2))) -- cgit v1.2.3 From 828fa94d7a234383fa479f769f220a7ec501bbdb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 11 Sep 2018 12:00:26 +0200 Subject: gnu: guile-simple-zmq, jupyter-guile-kernel: Update to 5bb66a0 and a7db924. * gnu/packages/guile.scm (guile-simple-zmq): Update to 5bb66a0. (jupyter-guile-kernel): Update to a7db924. --- gnu/packages/guile.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 05d9315214..16db4ea5e4 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -2056,8 +2056,8 @@ convenient nested tree operations.") (license license:gpl3+))) (define-public guile-simple-zmq - (let ((commit "1f3b7c0b9b249c6fde8e8a632b252d8a1b794424") - (revision "1")) + (let ((commit "5bb66a0499f94006cfd18b58e80ad6623f911c31") + (revision "2")) (package (name "guile-simple-zmq") (version (git-version "0.0.0" revision commit)) @@ -2069,7 +2069,7 @@ convenient nested tree operations.") (commit commit))) (sha256 (base32 - "0nj2pd5bsmmgd3c54wh4sixfhmsv1arsq7yam2d7487h3n9q57r7")) + "0dj1brjqa7m4k71sf94aq26ca0la3nr894kfmjnqkpawqfp4dyaz")) (file-name (git-file-name name version)))) (build-system guile-build-system) (arguments @@ -2094,8 +2094,8 @@ messaging library.") (license license:gpl3+)))) (define-public jupyter-guile-kernel - (let ((commit "a5c5f3ea3215b65e770bcb62f71117b0ec4575ed") - (revision "0")) + (let ((commit "a7db9245a886e104138474df46c3e88b95cff629") + (revision "1")) (package (name "jupyter-guile-kernel") (version (git-version "0.0.0" revision commit)) @@ -2107,7 +2107,7 @@ messaging library.") (commit commit))) (sha256 (base32 - "0y5jr0f0dyskvsawqbf6n0bpg8jirw4mhqbarf2a6p9lxhqha9s9")))) + "0aj04853bqm47ivfcmrgpb7w3wkis847kc7qrwsa5zcn9h38qh2f")))) (build-system guile-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 8539eb5c464015cf3b4417d859b275f105991d77 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 11 Sep 2018 15:10:46 +0200 Subject: gnu: jupyter-guile-kernel: Add dependencies to the search path. This allows: guix environment --ad-hoc jupyter jupyter-guile-kernel \ -- jupyter notebook to work out-of-the-box. * gnu/packages/guile.scm (jupyter-guile-kernel)[arguments]: In 'install-kernel' phase, add '-L' and '-C' flags to 'kernel.json'. [propagated-inputs]: Remove. [inputs]: Add GUILE-JSON and GUILE-SIMPLE-ZMQ. --- gnu/packages/guile.scm | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 16db4ea5e4..4ee887b749 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -2130,9 +2130,13 @@ messaging library.") (add-after 'install 'install-kernel (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dir (string-append - out "/share/jupyter/kernels/guile"))) + (let* ((out (assoc-ref outputs "out")) + (json (assoc-ref inputs "guile-json")) + (zmq (assoc-ref inputs "guile-simple-zmq")) + (deps (list json zmq)) + (dir (string-append + out "/share/jupyter/kernels/guile")) + (effective (target-guile-effective-version))) ;; Install kernel. (install-file "src/kernel.json" dir) @@ -2146,13 +2150,30 @@ messaging library.") (string-append "\"" (assoc-ref inputs "guile") "/bin/guile\"")) (("-s") - (string-append "--no-auto-compile\", \"-s"))) + ;; Add '-L' and '-C' flags so that the kernel + ;; finds its dependencies. + (let ((-L (map (lambda (item) + (string-append "\"" item + "/share/guile/site/" + effective "\"")) + deps)) + (-C (map (lambda (item) + (string-append "\"" item + "/lib/guile/" + effective + "/site-ccache\"")) + deps))) + (string-append "--no-auto-compile\"" + (string-join -L ", \"-L\", " + 'prefix) + (string-join -C ", \"-C\", " + 'prefix) + ", \"-s")))) #t)))))) (inputs `(("openssl" ,openssl) - ("guile" ,guile-2.2))) - (propagated-inputs - `(("guile-json" ,guile-json) + ("guile" ,guile-2.2) + ("guile-json" ,guile-json) ("guile-simple-zmq" ,guile-simple-zmq))) (synopsis "Guile kernel for the Jupyter Notebook") (description -- cgit v1.2.3 From d2fe71b04d21d9f0374aa371e3229230e96dd97b Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Thu, 30 Aug 2018 17:39:57 +0200 Subject: gnu: Add emacs-irony-mode. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs.scm (emacs-irony-mode): New variable. (emacs-irony-mode-server): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/emacs.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index bf163d8109..47c7685e9a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -64,6 +64,7 @@ #:use-module (guix monads) #:use-module (guix store) #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) #:use-module (guix build-system emacs) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system trivial) @@ -85,6 +86,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages xorg) #:use-module (gnu packages lesstif) + #:use-module (gnu packages llvm) #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages version-control) @@ -2730,6 +2732,49 @@ front-ends. Company comes with many back-ends, e.g. @code{company-elisp}. These are distributed in separate files and can be used individually.") (license license:gpl3+))) +(define-public emacs-irony-mode + (package + (name "emacs-irony-mode") + (version "1.2.0") + (home-page "https://github.com/Sarcasm/irony-mode") + (source (origin + (method url-fetch) + (uri (string-append home-page "/archive/v" version ".tar.gz")) + (sha256 + (base32 + "1f68zi0glkg2aly66s07rx3w0b0hdi1znxan02h6dbabaadylk99")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system emacs-build-system) + (arguments '()) + (propagated-inputs + `(("emacs-irony-mode-server" ,emacs-irony-mode-server))) + (synopsis "C/C++/ObjC Code completion and syntax checks for Emacs") + (description "Irony-mode provides Clang-assisted syntax checking and +completion for C, C++, and ObjC in GNU Emacs. Using @code{libclang} it can +provide syntax checking and autocompletion on compiler level which is very +resistent against false positives. It also integrates well with other +packages like @code{eldoc-mode} and especially @code{company-mode} as +described on the homepage.") + (license license:gpl3+))) + +(define-public emacs-irony-mode-server + (package (inherit emacs-irony-mode) + (name "emacs-irony-mode-server") + (inputs + `(("clang" ,clang))) + (propagated-inputs '()) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "cmake" + "server" + (string-append "-DCMAKE_INSTALL_PREFIX=" out)) #t)))))) + (build-system cmake-build-system) + (synopsis "Server for the Emacs @dfn{irony mode}"))) + (define-public emacs-company-quickhelp (package (name "emacs-company-quickhelp") -- cgit v1.2.3 From aa82260bc098c3a2142230c6b787c39c00843ce1 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 11 Sep 2018 09:38:39 +0100 Subject: gnu: arpack-ng-openmpi: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (arpack-ng-openmpi)[arguments]: Add 'set-test-environment phase. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4e1347e8fc..d1db75e658 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -508,7 +508,17 @@ large scale eigenvalue problems.") (arguments (substitute-keyword-arguments (package-arguments arpack-ng) ((#:configure-flags _ '()) - ''("--enable-mpi")))) + ''("--enable-mpi")) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'set-test-environment + (lambda _ + ;; By default, running the test suite would fail because 'ssh' + ;; could not be found in $PATH. Define this variable to + ;; placate Open MPI without adding a dependency on OpenSSH (the + ;; agent isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) + #t)))))) (synopsis "Fortran subroutines for solving eigenvalue problems with MPI"))) (define-public lapack -- cgit v1.2.3 From aeba7d4650f6d725f4751aa142cd1aae5ee3be97 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 11 Sep 2018 07:58:36 +0200 Subject: gnu: Add libnumbertext. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libreoffice.scm (libnumbertext): New public variable. Signed-off-by: Ludovic Courtès --- gnu/packages/libreoffice.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 3dc7a4bbf2..d81f8aa793 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2018 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +33,7 @@ #:use-module (guix download) #:use-module ((guix licenses) #:select (gpl2+ lgpl2.1+ lgpl3+ mpl1.1 mpl2.0 - non-copyleft x11-style)) + non-copyleft x11-style bsd-3)) #:use-module (guix packages) #:use-module (guix utils) #:use-module (ice-9 match) @@ -524,6 +525,35 @@ Aldus/Macromedia/Adobe FreeHand documents.") Microsoft Publisher documents of all versions.") (license mpl2.0))) +(define-public libnumbertext + (package + (name "libnumbertext") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/numbertext/" name + "/archive/" version ".tar.gz")) + (sha256 + (base32 + "0wnsn4911fdd2na8jxkcvmk04a6xw6qlviic9w4qwg9fcym6866v")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static"))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/Numbertext/libnumbertext") + (synopsis "Language-neutral @code{NUMBERTEXT} and @code{MONEYTEXT} functions") + (description + "The libnumbertext library provides language-neutral @code{NUMBERTEXT} +and @code{MONEYTEXT} functions for LibreOffice Calc, available for C++ and +Java.") + (license (list lgpl3+ bsd-3)))) + (define-public libpagemaker (package (name "libpagemaker") -- cgit v1.2.3 From 52b0a352c376eaed4ae7cf109f66538d6ac0a859 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 11 Sep 2018 07:59:11 +0200 Subject: gnu: libreoffice: Update to 6.1.0.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libreoffice.scm (libreoffice): Update to 6.1.0.3. [source]: Correct indenting. [inputs]: Add libnumbertext and python-lxml. Signed-off-by: Ludovic Courtès --- gnu/packages/libreoffice.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index d81f8aa793..cf8082bcaa 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -926,19 +926,19 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (define-public libreoffice (package (name "libreoffice") - (version "6.0.6.2") + (version "6.1.0.3") (source (origin - (method url-fetch) - (uri + (method url-fetch) + (uri (string-append - "https://download.documentfoundation.org/libreoffice/src/" - (version-prefix version 3) "/libreoffice-" version ".tar.xz")) - (sha256 - (base32 - "13kaikaz65xw9a3hxbh245cnydjpy58np22c7s0s65pnmcq68rpi")) - (patches (search-patches "libreoffice-icu.patch" - "libreoffice-glm.patch")))) + "https://download.documentfoundation.org/libreoffice/src/" + (version-prefix version 3) "/libreoffice-" version ".tar.xz")) + (sha256 + (base32 + "1n7b6abc0bp9x8lddx60w5br444wf62mdlkqmfk2zmkmiwkcvv2l")) + (patches (search-patches "libreoffice-icu.patch" + "libreoffice-glm.patch")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) @@ -979,6 +979,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") ("libltdl" ,libltdl) ("libmspub" ,libmspub) ("libmwaw" ,libmwaw) + ("libnumbertext" ,libnumbertext) ("libodfgen" ,libodfgen) ("libpagemaker" ,libpagemaker) ("libqxp" ,libqxp) @@ -1005,6 +1006,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") ("poppler" ,poppler) ("postgresql" ,postgresql) ("python" ,python) + ("python-lxml" ,python-lxml) ("redland" ,redland) ("sane-backends" ,sane-backends) ("unixodbc" ,unixodbc) -- cgit v1.2.3 From 702a87f2d14809ef241cd2dbb947c70ec59b9f08 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 18:31:55 +0200 Subject: gnu: perl-dbd-mysql: Update to 4.047. * gnu/packages/databases.scm (perl-dbd-mysql): Update to 4.047. [arguments]: Add 'skip-library-detection' phase. --- gnu/packages/databases.scm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index ecc14c259a..9db892a0b7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1458,7 +1458,7 @@ columns, primary keys, unique constraints and relationships.") (define-public perl-dbd-mysql (package (name "perl-dbd-mysql") - (version "4.046") + (version "4.047") (source (origin (method url-fetch) @@ -1466,10 +1466,24 @@ columns, primary keys, unique constraints and relationships.") "DBD-mysql-" version ".tar.gz")) (sha256 (base32 - "1xziv9w87cl3fbl1mqkdrx28mdqly3gs6gs1ynbmpl2rr4p6arb1")))) + "0idizgr0hr7sj92fbdlb3gv6cva15jkpaq28wrdw4j4p7awx2mls")))) (build-system perl-build-system) - ;; Tests require running MySQL server - (arguments `(#:tests? #f)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'skip-library-detection + ;; Avoid depencies on perl-devel-checklib, openssl, and zlib. They + ;; are really only needed for the test suite; their absence does not + ;; affect the build or the end result. + (lambda _ + (substitute* "Makefile.PL" + (("use Devel::CheckLib;" match) + (string-append "# " match)) + (("assert_lib") + "print")) + #t))) + ;; Tests require running MySQL server. + #:tests? #f)) (propagated-inputs `(("perl-dbi" ,perl-dbi) ("mysql" ,mysql))) -- cgit v1.2.3 From cd1e138cc645bb7cd4e3613e7479e8f047bbf3c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 15:53:11 +0200 Subject: gnu: unbound: Update to 1.8.0. * gnu/packages/dns.scm (unbound): Update to 1.8.0. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 29c3d9b923..00135294be 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -292,7 +292,7 @@ asynchronous fashion.") (define-public unbound (package (name "unbound") - (version "1.7.3") + (version "1.8.0") (source (origin (method url-fetch) @@ -300,7 +300,7 @@ asynchronous fashion.") version ".tar.gz")) (sha256 (base32 - "0bb0p8nbda77ghx20yfl7hqxm9x709223q35465v99i8v4ay27f1")))) + "0gxqc4ynd2g1a5dwaazqh9n8injh49a7dz0l9bbxqgv47dnrvxvq")))) (build-system gnu-build-system) (outputs '("out" "python")) (native-inputs -- cgit v1.2.3 From a93de1ae9efbed3270967eda59b1dd1078c0213b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 20 Aug 2018 17:09:10 +0200 Subject: gnu: obnam: Add deprecation warning. * gnu/packages/backup.scm (obnam)[synopsis, description]: Note its retirement. --- gnu/packages/backup.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index bd4a177ecd..ea5bc8e398 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -740,12 +740,15 @@ NTFS volumes using @code{ntfs-3g}, preserving NTFS-specific attributes.") ("python2-pep8" ,python2-pep8) ("python2-pylint" ,python2-pylint))) (home-page "https://obnam.org/") - (synopsis "Easy and secure backup program") - (description "Obnam is an easy, secure backup program. Features -include snapshot backups, data de-duplication and encrypted backups -using GnuPG. Backups can be stored on local hard disks, or online via -the SSH SFTP protocol. The backup server, if used, does not require -any special software, on top of SSH.") + (synopsis "Retired backup program") + (description + "Warning: @uref{https://blog.liw.fi/posts/2017/08/13/retiring_obnam/, +the Obnam project is retired}. You should use another backup solution instead. + +Obnam was an easy, secure backup program. Features included snapshot backups, +data de-duplication and encrypted backups using GnuPG. Backups can be stored on +local hard disks, or online via the SSH SFTP protocol. The backup server, if +used, does not require any special software, on top of SSH.") (license license:gpl3+))) (define-public dirvish -- cgit v1.2.3 From 9b83c15afe65f9d5f6af4f2e2daad3fdf04c4f39 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 10 Sep 2018 20:57:30 +0200 Subject: gnu: snakemake: Update to 5.2.2. * gnu/packages/python.scm (snakemake): Update to 5.2.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 a3eeb3c883..4efb23b51b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5160,13 +5160,13 @@ Python.") (define-public snakemake (package (name "snakemake") - (version "5.2.0") + (version "5.2.2") (source (origin (method url-fetch) (uri (pypi-uri "snakemake" version)) (sha256 - (base32 "0a1i5v5qxbmmpznp7my9nva8y7pxp8pjrwk2gxgisdskg35sq8s1")))) + (base32 "18x36n78ph5v1fxk54gvdbc3d8nfncha78phifg3lqaa9gifgzxd")))) (build-system python-build-system) (arguments ;; TODO: Package missing test dependencies. -- cgit v1.2.3 From a855117c592376df4d0b44d4c17304bbca5ef828 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 21:11:36 +0200 Subject: gnu: snakemake: Update home page. * gnu/packages/python.scm (snakemake)[home-page]: Update. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4efb23b51b..6367def203 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5195,7 +5195,7 @@ Python.") ("python-networkx" ,python-networkx) ("python-pyyaml" ,python-pyyaml) ("python-ratelimiter" ,python-ratelimiter))) - (home-page "https://bitbucket.org/snakemake/snakemake/wiki/Home") + (home-page "https://snakemake.readthedocs.io") (synopsis "Python-based execution environment for make-like workflows") (description "Snakemake aims to reduce the complexity of creating workflows by -- cgit v1.2.3 From 4a67079f71c264950aa7c43c5fdaa7611298a3c4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 11 Sep 2018 22:29:39 +0200 Subject: gnu: mes: Oops, use mirror://gnu download url. * gnu/packages/mes.scm (mes): Oops, use mirror://gnu download url. --- gnu/packages/mes.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 63a8db449a..880e140b80 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -66,7 +66,7 @@ extensive examples, including parsers for the Javascript and C99 languages.") (version "0.17.1") (source (origin (method url-fetch) - (uri (string-append "http://alpha.gnu.org/gnu/mes/" + (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) (patches (search-patches "mes-nyacc-0.86.0.patch")) (sha256 -- cgit v1.2.3 From f72e5f93b7ba874ecc66ba419f71f384d1b7903d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 11 Sep 2018 22:16:24 +0200 Subject: ui: Do not filter hash mismatch lines. Reported by Pjotr Prins . * guix/ui.scm (build-output-port): Add pattern for hash mismatch error; be more careful with error messages in verbose mode. --- guix/ui.scm | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index 1bbd37c255..c55ae7e2f8 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1708,12 +1708,26 @@ phase announcements and replaces any other output with a spinner." (string-append (proc "Building " 'BLUE 'BOLD) (match:substring m 2) "\n"))) - ("^(@ build-failed) (.*) (.*)" - #:transform - ,(lambda (m) - (string-append - (proc "Build failed: " 'RED 'BOLD) - (match:substring m 2) "\n"))) + ,(if verbose? + ;; Err on the side of caution: show everything, even + ;; if it might be redundant. + `("^(@ build-failed)(.+)" + #:transform + ,(lambda (m) + (string-append + (proc "Build failed: " 'RED 'BOLD) + (match:substring m 2)))) + ;; Show only that the build failed. + `("^(@ build-failed)(.+) -.*" + #:transform + ,(lambda (m) + (string-append + (proc "Build failed: " 'RED 'BOLD) + (match:substring m 2) + "\n")))) + ;; NOTE: this line contains "\n" characters. + ("^(sha256 hash mismatch for output path)(.*)" + RED BLACK) ("^(@ build-succeeded) (.*) (.*)" #:transform ,(lambda (m) -- cgit v1.2.3 From 1afd1fbf3cf1d1283a009d5cbb8ad698bff4dd48 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 11 Sep 2018 23:17:54 +0200 Subject: guix: Do not close current-error-port. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported-by: Ludovic Courtès . * guix/scripts/build.scm (guix-build), guix/scripts/package.scm (guix-package): Duplicate port before handing it to build-output-port. --- guix/scripts/build.scm | 8 +++++--- guix/scripts/package.scm | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 3fa3c2c20f..9d38610633 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -733,9 +733,11 @@ needed." ;; Set the build options before we do anything else. (set-build-options-from-command-line store opts) - (parameterize ((current-build-output-port (if quiet? - (%make-void-port "w") - (build-output-port #:verbose? #t)))) + (parameterize ((current-build-output-port + (if quiet? + (%make-void-port "w") + (build-output-port #:verbose? #t + #:port (duplicate-port (current-error-port) "w"))))) (let* ((mode (assoc-ref opts 'build-mode)) (drv (options->derivations store opts)) (urls (map (cut string-append <> "/log") diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 73cbccba3b..c3ed2ac935 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -950,5 +950,6 @@ processed, #f otherwise." %bootstrap-guile (canonical-package guile-2.2)))) (current-build-output-port - (build-output-port #:verbose? verbose?))) + (build-output-port #:verbose? verbose? + #:port (duplicate-port (current-error-port) "w")))) (process-actions (%store) opts)))))) -- cgit v1.2.3 From 475e16578f415485e018d0e77ed548cd29fb61d5 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 11 Sep 2018 23:34:12 +0200 Subject: gnu: emacs-helm-system-packages: Update to 1.10.1. * gnu/packages/emacs.scm (emacs-helm-system-packages): Update to 1.10.1. --- 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 47c7685e9a..540915510f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5673,7 +5673,7 @@ Yasnippet.") (define-public emacs-helm-system-packages (package (name "emacs-helm-system-packages") - (version "1.10.0") + (version "1.10.1") (source (origin (method git-fetch) (uri (git-reference @@ -5682,7 +5682,7 @@ Yasnippet.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0y5wzvfycb1bvgdk782xyl744fih43vz14wmq6gcqjarw6xfniz5")))) + "01by0c4lqi2cw8xmbxkjw7m9x78zssm31sx4hdpw5j35s2951j0f")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm))) -- cgit v1.2.3 From ac9e3077402dd1ff57ca2796e6313a6c26f9a769 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 11 Sep 2018 23:34:31 +0200 Subject: gnu: emacs-magit-todos: Update to 1.1. * gnu/packages/emacs.scm (emacs-magit-todos): Update to 1.1. --- gnu/packages/emacs.scm | 54 ++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 540915510f..9fab856035 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11741,37 +11741,35 @@ buffers – other modes on the TODO list). (license license:gpl3)))) (define-public emacs-magit-todos - ;; TODO: <1.1 is broken with Guix. Switch to 1.1 when out. - (let ((commit "966642762788d335dc2d3667d230a36ede65972e")) - (package - (name "emacs-magit-todos") - (version (git-version "1.0.4" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alphapapa/magit-todos") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0nxarip8sf0446xfgrcfsjm4vbsg50klxjbr4i6h09a3lri03gyp")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-async" ,emacs-async) - ("emacs-dash" ,emacs-dash) - ("emacs-f" ,emacs-f) - ("emacs-hl-todo" ,emacs-hl-todo) - ("magit" ,magit) - ("emacs-pcre2el" ,emacs-pcre2el) - ("emacs-s" ,emacs-s))) - (home-page "https://github.com/alphapapa/magit-todos") - (synopsis "Show source files' TODOs (and FIXMEs, etc) in Magit status buffer") - (description "This package displays keyword entries from source code + (package + (name "emacs-magit-todos") + (version "1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/magit-todos") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mvzbxshr6zjdim3jd368ar1hy5l7n22i03cpvzdmrw83kkwdyhd")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-async" ,emacs-async) + ("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-hl-todo" ,emacs-hl-todo) + ("magit" ,magit) + ("emacs-pcre2el" ,emacs-pcre2el) + ("emacs-s" ,emacs-s))) + (home-page "https://github.com/alphapapa/magit-todos") + (synopsis "Show source files' TODOs (and FIXMEs, etc) in Magit status buffer") + (description "This package displays keyword entries from source code comments and Org files in the Magit status buffer. Activating an item jumps to it in its file. By default, it uses keywords from @code{hl-todo}, minus a few (like NOTE).") - (license license:gpl3)))) + (license license:gpl3))) (define-public emacs-git-annex ;; Unreleased version has a fontification fix. -- cgit v1.2.3 From bd8f74dfbe51308fbd9a61281d9a63ef09d5ab4f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 11 Sep 2018 23:44:40 +0200 Subject: gnu: emacs-evil-collection: Update to 20180911. * gnu/packages/emacs.scm (emacs-evil-collection): Update to 20180911. --- gnu/packages/emacs.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9fab856035..a84ef81859 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4957,11 +4957,11 @@ extensions.") (license license:gpl3+)))) (define-public emacs-evil-collection - (let ((commit "5d739f58118a5a316c4fe25adb4e13ccea3fdc10") - (revision "2")) + (let ((commit "b55ae90f367e103e6568ae00779a8a51c68a0104") + (revision "3")) (package (name "emacs-evil-collection") - (version (git-version "20180721" revision commit)) + (version (git-version "20180911" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -4970,7 +4970,7 @@ extensions.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "05p612qncd0cp5q61hq2ag1k558vhb10049xrc88n9l6qwz9bpk3")))) + "0n7bzi5s7rqi78l1424sxvsk2g46z7ksq02xx5jrmqymnij90jml")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil))) -- cgit v1.2.3 From ee0d184502cf893058ff250e9df159f6405d30ce Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 11 Sep 2018 23:45:06 +0200 Subject: gnu: Add emacs-hackernews. * gnu/packages/emacs.scm (emacs-hackernews): New variable. --- gnu/packages/emacs.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a84ef81859..7b2929cadc 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11797,3 +11797,27 @@ hiding the symbolic links and fontified based on whether content is present. Commands for performing some common operations (e.g., unlocking and adding files) are provided.") (license license:gpl2+)))) + +(define-public emacs-hackernews + (let ((commit "d8c450bbc76d6bb65ec5cdb6c3b888a23f3769e9")) + (package + (name "emacs-hackernews") + (version (git-version "0.4.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clarete/hackernews.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06mp4n6c300jv5lhwf50ircfjckzr2p1zd38s4mqnxxjlf1maim7")))) + (build-system emacs-build-system) + (home-page "https://github.com/clarete/hackernews.el") + (synopsis "Hacker News client for Emacs") + (description "The @command{hackernews} package is able to fetch stories +from six different Hacker News feeds, namely top, new, best, ask, show and job +stories. The default feed is top stories, which corresponds to the Hacker +News homepage.") + (license license:gpl3)))) -- cgit v1.2.3 From 2b0820bf0d27bf68479f76a45ad463018345fcd1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 11 Sep 2018 23:47:57 +0200 Subject: gnu: emacs-helm: Update to 3.0. * gnu/packages/emacs.scm (emacs-helm): Update to 3.0. --- 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 7b2929cadc..a67acc7033 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4698,7 +4698,7 @@ ack, ag, helm and pt.") (define-public emacs-helm (package (name "emacs-helm") - (version "2.9.6") + (version "3.0") (source (origin (method url-fetch) (uri (string-append @@ -4707,7 +4707,7 @@ ack, ag, helm and pt.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1f7m09i8gr0gk5nw5dn7rpdz20dg3hl4p77dpygkhl82yhk9q2ql")))) + "0k2r0ccppaqfjvyszaxa16vf7g2qzj1clhfr6v646ncsy17laciw")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) -- cgit v1.2.3 From 5882078e8c999c7de16e38bc7f7a293ff2ec01a8 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 7 Sep 2018 22:09:32 -0500 Subject: font-fantasque-sans: Upgrade to 1.7.2. * gnu/packages/fonts.scm (font-fantasque-sans): Upgrade to 1.7.2. [native-inputs]: Add zip. [arguments]: Add 'xrange->range phase for python3 compatibility. Adjust install phase to work with newly generated font variants. --- gnu/packages/fonts.scm | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index ce07d3ad4c..218b04baa1 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -753,41 +753,51 @@ It contains the following fonts and styles: (define-public font-fantasque-sans (package (name "font-fantasque-sans") - (version "1.7.1") + (version "1.7.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/belluzj/fantasque-sans/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/belluzj/fantasque-sans.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "07fpy53k2x2nz5q61swkab6cfk9gw2kc4x4brsj6zjgbm16fap85")))) + "1gjranq7qf20rfxnpxsckv1hl35nzsal0rjs475nhfbpqy5wmly6")))) (build-system gnu-build-system) (native-inputs `(("ttfautohint" ,ttfautohint) ("woff-tools" ,woff-tools) ("fontforge" ,fontforge) ("woff2" ,woff2) - ("ttf2eot" ,ttf2eot))) + ("ttf2eot" ,ttf2eot) + ("zip" ,zip))) (arguments `(#:tests? #f ;test target intended for visual inspection #:phases (modify-phases %standard-phases (delete 'configure) ;no configuration + (add-before 'build 'xrange->range + ;; Rather than use a python2 fontforge, just replace the + ;; offending function. + (lambda _ + (substitute* "Scripts/fontbuilder.py" + (("xrange") "range")) + #t)) (replace 'install ;; 'make install' wants to install to ~/.fonts, install to - ;; output instead. + ;; output instead. Install only the "Normal" variant. (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (font-dir (string-append out "/share/fonts")) (truetype-dir (string-append font-dir "/truetype")) (opentype-dir (string-append font-dir "/opentype")) (webfonts-dir (string-append font-dir "/webfonts"))) - (copy-recursively "OTF" opentype-dir) - (for-each (lambda (f) (install-file f truetype-dir)) - (find-files "." "\\.ttf$")) - (copy-recursively "Webfonts" webfonts-dir) - #t)))))) + (with-directory-excursion "Variants/Normal" + (copy-recursively "OTF" opentype-dir) + (for-each (lambda (f) (install-file f truetype-dir)) + (find-files "." "\\.ttf$")) + (copy-recursively "Webfonts" webfonts-dir) + #t))))))) (synopsis "Font family with a monospaced variant for programmers") (description "Fantasque Sans Mono is a programming font designed with functionality in -- cgit v1.2.3 From bbe46a4af5972b3b5b434fe5d99ec9a0078b0ab8 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Thu, 16 Aug 2018 15:47:41 -0500 Subject: mpi: Factorize openmpi setup build phase. * gnu/packages/mpi.scm (%openmpi-setup): New variable. * gnu/packages/maths.scm (scalapack, slepc-openmpi, mumps-openmpi) (superlu-dist, p4est, petsc-openmpi, hypre-openmpi, elemental) (sundials-openmpi, arpack-ng-openmpi)[arguments]: Use it in #:phases. --- gnu/packages/maths.scm | 102 ++++++++++--------------------------------------- gnu/packages/mpi.scm | 14 ++++++- 2 files changed, 34 insertions(+), 82 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d1db75e658..af41093fbb 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -511,14 +511,8 @@ large scale eigenvalue problems.") ''("--enable-mpi")) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to - ;; placate Open MPI without adding a dependency on OpenSSH (the - ;; agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - #t)))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup))))) (synopsis "Fortran subroutines for solving eigenvalue problems with MPI"))) (define-public lapack @@ -579,14 +573,8 @@ problems in numerical linear algebra.") (arguments `(#:configure-flags `("-DBUILD_SHARED_LIBS:BOOL=YES") #:phases (modify-phases %standard-phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because - ;; 'ssh' could not be found in $PATH. Define this - ;; variable to placate Open MPI without adding a - ;; dependency on OpenSSH (the agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - #t))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (home-page "http://www.netlib.org/scalapack/") (synopsis "Library for scalable numerical linear algebra") (description @@ -1717,14 +1705,8 @@ scientific applications modeled by partial differential equations.") ,@(delete "--with-mpi=0" ,cf))) ((#:phases phases) `(modify-phases ,phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to - ;; placate Open MPI without adding a dependency on OpenSSH (the - ;; agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - #t)))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup))))) (synopsis "Library to solve PDEs (with MPI support)"))) (define-public petsc-complex-openmpi @@ -1855,14 +1837,8 @@ arising after the discretization of partial differential equations.") (substitute-keyword-arguments (package-arguments slepc) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to - ;; placate Open MPI without adding a dependency on OpenSSH (the - ;; agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - #t)))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup))))) (inputs `(("mpi" ,openmpi) ("arpack" ,arpack-ng-openmpi) @@ -2032,14 +2008,8 @@ sparse system of linear equations A x = b using Guassian elimination.") (substitute-keyword-arguments (package-arguments mumps) ((#:phases phases) `(modify-phases ,phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to - ;; placate Open MPI without adding a dependency on OpenSSH (the - ;; agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - #t)) + (add-before 'check 'mpi-setup + ,%openmpi-setup) (replace 'check (lambda _ ((assoc-ref ,phases 'check) @@ -2285,13 +2255,10 @@ CDEFS = -DAdd_" "/" dir))) '("lib" "include")) #t)) + (add-before 'check 'mpi-setup + ,%openmpi-setup) (replace 'check (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to placate - ;; Open MPI without adding a dependency on OpenSSH (the agent - ;; isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) (with-directory-excursion "EXAMPLE" (invoke "mpirun" "-n" "2" "./pddrive" "-r" "1" "-c" "2" "g20.rua") @@ -2384,15 +2351,8 @@ YACC = bison -pscotchyy -y -b y ;; "SCOTCH_PTHREAD_NUMBER=2" "restrict=__restrict")))) #t)) - (add-after - 'build 'build-esmumps + (add-after 'build 'build-esmumps (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to placate - ;; Open MPI without adding a dependency on OpenSSH (the agent - ;; isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - (invoke "make" (format #f "-j~a" (parallel-job-count)) "esmumps"))) @@ -2575,14 +2535,8 @@ schemes.") (assoc-ref %build-inputs "lapack") " -llapack")) #:phases (modify-phases %standard-phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because - ;; 'ssh' could not be found in $PATH. Define this - ;; variable to placate Open MPI without adding a - ;; dependency on OpenSSH (the agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - #t))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup)))) (home-page "http://www.p4est.org") (synopsis "Adaptive mesh refinement on forests of octrees") (description @@ -3649,14 +3603,8 @@ problems.") ,@(delete "--without-MPI" ,flags))) ((#:phases phases) `(modify-phases ,phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to - ;; placate Open MPI without adding a dependency on OpenSSH (the - ;; agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - #t)))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup))))) (synopsis "Parallel solvers and preconditioners for linear equations") (description "HYPRE is a software library of high performance preconditioners and @@ -3939,6 +3887,8 @@ exclusion algorithms are typical examples of such systems.") "-DCMAKE_INSTALL_LIBDIR=lib" "-DGFORTRAN_LIB=gfortran") #:phases (modify-phases %standard-phases + (add-before 'check 'mpi-setup + ,%openmpi-setup) (add-before 'check 'setup-tests (lambda _ ;; Parallelism is done at the MPI layer. @@ -4123,16 +4073,6 @@ easily be incorporated into existing simulation codes.") ,flags)) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (add-before 'check 'set-test-environment - (lambda _ - ;; By default, running the test suite would fail because 'ssh' - ;; could not be found in $PATH. Define this variable to - ;; placate Open MPI without adding a dependency on OpenSSH (the - ;; agent isn't used anyway.) - (setenv "OMPI_MCA_plm_rsh_agent" (which "cat")) - ;; Allow oversubscription in case there are less - ;; physical cores available in the build environment - ;; than SUNDIALS wants while testing. - (setenv "OMPI_MCA_rmaps_base_oversubscribe" "yes") - #t)))))) + (add-before 'check 'mpi-setup + ,%openmpi-setup))))) (synopsis "SUNDIALS with OpenMPI support"))) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index f34b08e4ca..7dfec16fc7 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015 Eric Bavier +;;; Copyright © 2014, 2015, 2018 Eric Bavier ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2016 Andreas Enge @@ -250,3 +250,15 @@ software vendors, application developers and computer science researchers.") work correctly with all transports (such as @code{openib}), and the performance is generally worse than the vanilla @code{openmpi} package, which only provides @code{MPI_THREAD_FUNNELED}."))) + +;;; Build phase to be used for packages that execute MPI code. +(define-public %openmpi-setup + '(lambda _ + ;; By default, running the test suite would fail because 'ssh' could not + ;; be found in $PATH. Define this variable to placate Open MPI without + ;; adding a dependency on OpenSSH (the agent isn't used anyway.) + (setenv "OMPI_MCA_plm_rsh_agent" (which "false")) + ;; Allow oversubscription in case there are less physical cores available + ;; in the build environment than the package wants while testing. + (setenv "OMPI_MCA_rmaps_base_oversubscribe" "yes") + #t)) -- cgit v1.2.3 From 50b3b831430902224864dbd350179a564561f526 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 11 Sep 2018 15:56:57 -0500 Subject: netsurf: Register patch. Follow-up to f9e140a243b6d6b5d28bd0813b69604562a39653. * gnu/local.mk (dist_patch_DATA): Add netsurf-message-timestamp.patch. --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/local.mk b/gnu/local.mk index 9b417bff6d..f15fb3339a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -980,6 +980,7 @@ dist_patch_DATA = \ %D%/packages/patches/net-tools-bitrot.patch \ %D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netcdf-tst_h_par.patch \ + %D%/packages/patches/netsurf-message-timestamp.patch \ %D%/packages/patches/netsurf-system-utf8proc.patch \ %D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ -- cgit v1.2.3 From b2c8d31ff673ca1714be16968c9ead9a99ae2b7b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 12 Sep 2018 09:53:55 +0300 Subject: gnu: perl-moosex-getopt: Update to 0.73. * gnu/packages/perl.scm (perl-moosex-getopt): Update to 0.73. [native-inputs]: Add perl-module-build-tiny, perl-path-tiny, perl-test-needs. --- gnu/packages/perl.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index c4c3b665db..85604008e2 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016, 2018 Mark H Weaver ;;; Copyright © 2016 Jochem Raat -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2016 Nils Gillmann ;;; Copyright © 2016 Alex Sassmannshausen ;;; Copyright © 2016, 2018 Roel Janssen @@ -5521,7 +5521,7 @@ private methods are not.") (define-public perl-moosex-getopt (package (name "perl-moosex-getopt") - (version "0.71") + (version "0.73") (source (origin (method url-fetch) @@ -5529,12 +5529,15 @@ private methods are not.") "MooseX-Getopt-" version ".tar.gz")) (sha256 (base32 - "0nf2094qgir0irxjycwqavy53ygm530g9f7cxfywnl2n1bmgh66y")))) + "19zm8brf930p0ymqn3w1y0ix29kb74m8nvhrhjvrg8cgz6vc5fyz")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) + ("perl-module-build-tiny" ,perl-module-build-tiny) + ("perl-path-tiny" ,perl-path-tiny) ("perl-test-deep" ,perl-test-deep) ("perl-test-fatal" ,perl-test-fatal) + ("perl-test-needs" ,perl-test-needs) ("perl-test-requires" ,perl-test-requires) ("perl-test-trap" ,perl-test-trap) ("perl-test-warnings" ,perl-test-warnings))) -- cgit v1.2.3 From c8749b02500ecf90119e47b4af1bf6bb0c870ec1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 20:23:29 +0200 Subject: gnu: Add perl-mock-config. * gnu/packages/perl-check.scm (perl-mock-config): New public variable. --- gnu/packages/perl-check.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 16010b441f..98b4e392c7 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -44,6 +44,27 @@ ;;; +(define-public perl-mock-config + (package + (name "perl-mock-config") + (version "0.03") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/Mock-Config-" + version ".tar.gz")) + (sha256 + (base32 "06q0xkg5cwdwafzmb9rkaa305ddv7vli9gpm6n9jnkyaaxbk9f55")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/Mock-Config") + (synopsis "Temporarily set Config or XSConfig values") + (description + "The @code{Mock::Config} Perl module allows temporarily setting and +overriding @code{Config} values, even for the readonly @code{XSConfig} +implementation as used in cperl. It does not store the mocked overrides +lexically, just dynamically.") + (license artistic2.0))) + (define-public perl-test2-bundle-extended (package (name "perl-test2-bundle-extended") -- cgit v1.2.3 From 4dbef671029f6553b7c24bd3f7a831725c976b85 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 21:59:38 +0200 Subject: gnu: zsh: Use HTTPS. * gnu/packages/shells.scm (zsh)[source, home-page]: Use HTTPS. --- gnu/packages/shells.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 900c8ec686..684d723959 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -296,10 +296,10 @@ history mechanism, job control and a C-like syntax.") (source (origin (method url-fetch) (uri (list (string-append - "http://www.zsh.org/pub/zsh-" version + "https://www.zsh.org/pub/zsh-" version ".tar.xz") (string-append - "http://www.zsh.org/pub/old/zsh-" version + "https://www.zsh.org/pub/old/zsh-" version ".tar.xz"))) (sha256 (base32 @@ -360,7 +360,7 @@ as an interactive login shell and as a powerful command interpreter for shell scripting. Zsh can be thought of as an extended Bourne shell with a large number of improvements, including some features of bash, ksh, and tcsh.") - (home-page "http://www.zsh.org/") + (home-page "https://www.zsh.org/") ;; The whole thing is under an MIT/X11-style license, but there's one ;; command, 'Completion/Unix/Command/_darcs', which is under GPLv2+. -- cgit v1.2.3 From 5a5d3e356311620df253d7c213c1bda79cd20128 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 21:58:34 +0200 Subject: gnu: zsh: Update to 5.6.1. * gnu/packages/shells.scm (zsh): Update to 5.6.1. --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 684d723959..73e51da1cd 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -292,7 +292,7 @@ history mechanism, job control and a C-like syntax.") (define-public zsh (package (name "zsh") - (version "5.6") + (version "5.6.1") (source (origin (method url-fetch) (uri (list (string-append @@ -303,7 +303,7 @@ history mechanism, job control and a C-like syntax.") ".tar.xz"))) (sha256 (base32 - "1mp6h2452z2029n12mxipjv4b0cc8i8sb72g8p8jklg8275iysvl")))) + "1s5kzfbfvixibb1sbzmmlrrx898zqwi5cfmnnq4bhcbx64zparlm")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") #:phases -- cgit v1.2.3 From 60d8db74c66a31af3da180d45ebb045622c469c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 22:06:42 +0200 Subject: gnu: syslinux: Use INVOKE. * gnu/packages/bootloaders.scm (syslinux)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/bootloaders.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e9abf399ab..74e6890951 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -304,14 +304,14 @@ menu to select one of the installed operating systems.") (delete 'configure) (add-before 'build 'set-permissions (lambda _ - (zero? (system* "chmod" "a+w" "utils/isohybrid.in")))) + (invoke "chmod" "a+w" "utils/isohybrid.in"))) (replace 'check (lambda _ (setenv "CC" "gcc") (substitute* "tests/unittest/include/unittest/unittest.h" ;; Don't look up headers under /usr. (("/usr/include/") "")) - (zero? (system* "make" "unittest"))))))) + (invoke "make" "unittest")))))) (home-page "http://www.syslinux.org") (synopsis "Lightweight Linux bootloader") (description "Syslinux is a lightweight Linux bootloader.") -- cgit v1.2.3 From 0f304ba73e3a36af4d05be332fdc8dba3a3739b6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 22:08:16 +0200 Subject: gnu: syslinux: Use HTTPS home page. * gnu/packages/bootloaders.scm (syslinux)[home-page]: Use HTTPS. --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 74e6890951..eee66b2c5f 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -312,7 +312,7 @@ menu to select one of the installed operating systems.") ;; Don't look up headers under /usr. (("/usr/include/") "")) (invoke "make" "unittest")))))) - (home-page "http://www.syslinux.org") + (home-page "https://www.syslinux.org") (synopsis "Lightweight Linux bootloader") (description "Syslinux is a lightweight Linux bootloader.") (license (list license:gpl2+ -- cgit v1.2.3 From bec13d872de23a0c33b2624d430d928a43c35e11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Sep 2018 16:08:34 +0200 Subject: gnu: sg3-utils: Update to 1.43. * gnu/packages/scsi.scm (sg3-utils): Update to 1.43. [license]: Add bsd-2. --- gnu/packages/scsi.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index 92e2d7af4c..2bb863cad9 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Chris Marusich +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,7 +19,7 @@ (define-module (gnu packages scsi) #:use-module ((guix licenses) - #:select (gpl2+ bsd-3)) + #:select (gpl2+ bsd-2 bsd-3)) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) @@ -26,14 +27,14 @@ (define-public sg3-utils (package (name "sg3-utils") - (version "1.42") + (version "1.43") (source (origin (method url-fetch) (uri (string-append "http://sg.danny.cz/sg/p/sg3_utils-" version ".tar.xz")) (sha256 (base32 - "1fg71rj0f1gdjmkj0z8wlv46cf9lryjdyjkbi7fjmssgi5jyvblp")))) + "04l58wvncqk6lfh4lashsl3ccsa1114hkd6vwi1h1cbmq2fw9c8v")))) (build-system gnu-build-system) (home-page "http://sg.danny.cz/sg/sg3_utils.html") (synopsis "SCSI device utilities") @@ -49,6 +50,9 @@ up and down disks (@code{sg_start}), do self tests (@code{sg_senddiag}), parse sense data (@code{sg_decode_sense}), and perform various other functions. In addition, this package includes a library, called libsgutils, which can be used in C and C++ programs to interact with SCSI devices.") - ;; The libsgutils library itself is licensed under bsd-3. Some tools are - ;; licensed under bsd-3, also. Some tools are licensed under gpl2+. - (license (list gpl2+ bsd-3)))) + ;; See README: "All utilities and libraries have either a "2 clause" BSD + ;; license or are "GPL-2ed". [...] That BSD license was updated from the + ;; "3 clause" to the newer "2 clause" version on 20180119. To save space + ;; various source code files refer to a file called "BSD_LICENSE" [...]." + ;; Some files (like sg_compare_and_write.c) retain their 3-clause headers! + (license (list gpl2+ bsd-2 bsd-3)))) -- cgit v1.2.3 From acd4da3f2983f839e65220700450a15fc5f3af20 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Sep 2018 15:26:21 +0200 Subject: gnu: libfilezilla: Update to 0.13.1. * gnu/packages/ftp.scm (libfilezilla): Update to 0.13.1. --- gnu/packages/ftp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index f687b9814d..d3f3ef711c 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -170,7 +170,7 @@ as required.") (define-public libfilezilla (package (name "libfilezilla") - (version "0.12.3") + (version "0.13.1") (source (origin (method url-fetch) @@ -178,7 +178,7 @@ as required.") name "/" name "-" version ".tar.bz2")) (sha256 (base32 - "1v606kcz2rdmmlwxrv3xvwh7ia1nh6jfc9bhjw2r4ai3rm16gch5")))) + "0347zkapp0wrhfm1yzw7wa1v3lww65ch176scifxn8f9068f1ixb")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) -- cgit v1.2.3 From 9c208f38f22cfc710bb7a56b97ee1b2c388df7b9 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 12 Sep 2018 15:44:07 +0200 Subject: gnu: Add emacs-youtube-dl. * gnu/packages/emacs.scm (emacs-youtube-dl): New variable. --- gnu/packages/emacs.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a67acc7033..f6da0e3830 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -116,6 +116,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages shells) #:use-module (gnu packages gnupg) + #:use-module (gnu packages video) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -11821,3 +11822,43 @@ from six different Hacker News feeds, namely top, new, best, ask, show and job stories. The default feed is top stories, which corresponds to the Hacker News homepage.") (license license:gpl3)))) + +(define-public emacs-youtube-dl + (let ((commit "7c9d7a7d05b72a7d1b1257a36c5e2b2567b185dd")) + (package + (name "emacs-youtube-dl") + (version (git-version "1.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/skeeto/youtube-dl-emacs/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mh4s089a4x8s380agzb2306kdp1hl204px1n5rrrrdcls7imnh6")))) + (build-system emacs-build-system) + (inputs + `(("youtube-dl" ,youtube-dl))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((youtube-dl (assoc-ref inputs "youtube-dl"))) + ;; .el is read-only in git. + (chmod "youtube-dl.el" #o644) + ;; Specify the absolute file names of the various + ;; programs so that everything works out-of-the-box. + (emacs-substitute-variables + "youtube-dl.el" + ("youtube-dl-program" + (string-append youtube-dl "/bin/youtube-dl"))))))))) + (home-page "https://github.com/skeeto/youtube-dl-emacs/") + (synopsis "Emacs youtube-dl download manager") + (description "This package manages a video download queue for +@command{youtube-dl}, which serves as the back end. It manages a single +@command{youtube-dl} subprocess, downloading one video at a time. New videos +can be queued at any time.") + (license license:unlicense)))) -- cgit v1.2.3 From 320105eadb7d9b26d818edfea5f17e53a19286a1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 12 Sep 2018 15:44:33 +0200 Subject: gnu: Add emacs-org-web-tools. * gnu/packages/emacs.scm (emacs-org-web-tools): New variable. --- gnu/packages/emacs.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index f6da0e3830..10d0e63c84 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -117,6 +117,7 @@ #:use-module (gnu packages shells) #:use-module (gnu packages gnupg) #:use-module (gnu packages video) + #:use-module (gnu packages haskell) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -11862,3 +11863,45 @@ News homepage.") @command{youtube-dl} subprocess, downloading one video at a time. New videos can be queued at any time.") (license license:unlicense)))) + +(define-public emacs-org-web-tools + (package + (name "emacs-org-web-tools") + (version "1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/org-web-tools") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0kak9h5ny00d39gnwspv53nadnag01brw2fq9zk5wpfc91h9bjng")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-esxml" ,emacs-esxml) + ("emacs-s" ,emacs-s))) + (inputs + `(("pandoc" ,ghc-pandoc))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-exec-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((pandoc (assoc-ref inputs "pandoc"))) + (substitute* "org-web-tools.el" + (("\"pandoc\"") (string-append "\"" pandoc "/bin/pandoc\""))) + #t)))))) + (home-page "https://github.com/alphapapa/org-web-tools") + (synopsis "Display/Process web page as Org-mode content") + (description "This package contains library functions and commands useful +for retrieving web page content and processing it into Org-mode content. + +For example, you can copy a URL to the clipboard or kill-ring, then run a +command that downloads the page, isolates the “readable” content with +@command{eww-readable}, converts it to Org-mode content with Pandoc, and +displays it in an Org-mode buffer. Another command does all of that but +inserts it as an Org entry instead of displaying it in a new buffer.") + (license license:gpl3+))) -- cgit v1.2.3 From b002809f848d81dfc4640635d98d8bac3af62cee Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 12 Sep 2018 15:45:38 +0200 Subject: gnu: Add emacs-blimp. * gnu/packages/emacs.scm (emacs-blimp): New variable. --- gnu/packages/emacs.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 10d0e63c84..12e5823a9e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11905,3 +11905,29 @@ command that downloads the page, isolates the “readable” content with displays it in an Org-mode buffer. Another command does all of that but inserts it as an Org entry instead of displaying it in a new buffer.") (license license:gpl3+))) + +(define-public emacs-blimp + (let ((commit "e420763d6d18b5d1be552cdbc47f91418343db03")) + (package + (name "emacs-blimp") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/walseb/blimp") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09wmhpym516b81dfq8smdmysh1fn610dzlyvyl2rkx8600f0fizd")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-eimp" ,emacs-eimp))) + (home-page "https://github.com/walseb/blimp") + (synopsis "Emacs wrapper around all Imagemagick commands") + (description "Blimp (Bustling Image Manipulation Package) is a complete +wrapper around all Imagemagick commands with descriptions, autocompletion (for +some commands) and hints displayed in prompt using @command{eimp.el} to +execute its commands and resize images.") + (license license:gpl3+)))) -- cgit v1.2.3 From 4a89bdd1965f9bf4a06590bb7fde806be3e784a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 12 Sep 2018 19:04:02 +0200 Subject: gnu: python-scikit-learn: Update to 0.19.2. * gnu/packages/machine-learning.scm (python-scikit-learn): Update to 0.19.2. [source]: Fetch from git. [arguments]: Run tests before installation; replace "check" phase, add "build-ext" phase; delete "reset-gzip-timestamps" phase. [native-inputs]: Add python-pytest and python-pandas; remove python-nose. --- gnu/packages/machine-learning.scm | 49 ++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 7790e78779..9aa61bd8f8 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -703,40 +703,41 @@ computing environments.") (define-public python-scikit-learn (package (name "python-scikit-learn") - (version "0.19.1") + (version "0.19.2") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/scikit-learn/scikit-learn/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/scikit-learn/scikit-learn.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "18n8775kyfwbvcjjjzda9c5sqy4737c0hrmj6qj1ps2jmlqzair9")) + "1dk9hdj01c0bny4ps78b7869fjw9gr6qklxf6wyql8h6nh4k19xm")) (patches (search-patches - "python-scikit-learn-fix-test-non-determinism.patch")))) + "python-scikit-learn-fix-test-non-determinism.patch")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (delete 'check) - (add-after 'install 'check - ;; Running tests from the source directory requires - ;; an "inplace" build with paths relative to CWD. - ;; http://scikit-learn.org/stable/developers/advanced_installation.html#testing - ;; Use the installed version instead. - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - ;; some tests require access to "$HOME" - (setenv "HOME" "/tmp") - ;; Step out of the source directory just to be sure. - (chdir "..") - (invoke "nosetests" "-v" "sklearn")))))) + (add-after 'build 'build-ext + (lambda _ (invoke "python" "setup.py" "build_ext" "--inplace") #t)) + (replace 'check + (lambda _ + ;; Restrict OpenBLAS threads to prevent segfaults while testing! + (setenv "OPENBLAS_NUM_THREADS" "1") + ;; Disable tests that require network access + (delete-file "sklearn/datasets/tests/test_mldata.py") + (delete-file "sklearn/datasets/tests/test_rcv1.py") + (invoke "pytest" "sklearn") + #t)) + ;; FIXME: This fails with permission denied + (delete 'reset-gzip-timestamps)))) (inputs `(("openblas" ,openblas))) (native-inputs - `(("python-nose" ,python-nose) + `(("python-pytest" ,python-pytest) + ("python-pandas" ,python-pandas) ;for tests ("python-cython" ,python-cython))) (propagated-inputs `(("python-numpy" ,python-numpy) @@ -744,8 +745,8 @@ computing environments.") (home-page "http://scikit-learn.org/") (synopsis "Machine Learning in Python") (description - "Scikit-learn provides simple and efficient tools for data -mining and data analysis.") + "Scikit-learn provides simple and efficient tools for data mining and +data analysis.") (license license:bsd-3))) (define-public python2-scikit-learn -- cgit v1.2.3 From 4fa7f29f2ad7867f348e39e465c29f466203126c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 12 Sep 2018 19:50:41 +0200 Subject: gnu: emacs-hl-todo: Update to 1.9.0. * gnu/packages/emacs.scm (emacs-hl-todo): Update to 1.9.0. --- 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 12e5823a9e..9898767085 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -3488,7 +3488,7 @@ regardless of @code{highlight-symbol-idle-delay}. (define-public emacs-hl-todo (package (name "emacs-hl-todo") - (version "1.8.0") + (version "1.9.0") (source (origin (method url-fetch) (uri (string-append @@ -3497,7 +3497,7 @@ regardless of @code{highlight-symbol-idle-delay}. (file-name (string-append "hl-todo-" version ".el")) (sha256 (base32 - "0g0h9v4572p7mcird8wsj1c41haf60krslm6mlpi4mdbh248kv6z")))) + "0728givzh7xv5i88ac9if8byj1p8bilrj1fnizca10s0rv100hdr")))) (build-system emacs-build-system) (home-page "https://github.com/tarsius/hl-todo") (synopsis "Emacs mode to highlight TODO and similar keywords") -- cgit v1.2.3 From ff9008d8debae7b32a8d27da7ab2fef7c9322196 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Sep 2018 15:17:45 -0400 Subject: gnu: Zsh: Remove workaround required for Zsh 5.6. This is a followup to commit 5a5d3e356311620df253d7c213c1bda79cd20128. * gnu/packages/shells.scm (zsh)[arguments]: Remove substitutions in 'patch-test' phase. --- gnu/packages/shells.scm | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 73e51da1cd..c0f1c479ef 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -336,19 +336,6 @@ history mechanism, job control and a C-like syntax.") (("command -pv") "command -v") (("command -p") "command ") (("'command' -p") "'command' ")) - ;; This file is ISO-8859-1 encoded. - (with-fluids ((%default-port-encoding #f)) - (substitute* "Test/A05execution.ztst" - ;; Help it find `sh` - (("PATH=/bin:\\$\\{ZTST_testdir\\}/command.tmp/ tstcmd-slashless") - (string-append "PATH=/bin:" - (assoc-ref %build-inputs "bash") "/bin:" - "${ZTST_testdir}/command.tmp/ tstcmd-slashless")) - ;; Help it find `echo` - (("PATH=/bin:\\$\\{ZTST_testdir\\}/command.tmp tstcmd-arg") - (string-append "PATH=/bin:" - (assoc-ref %build-inputs "coreutils") "/bin:" - "PATH=/bin:${ZTST_testdir}/command.tmp tstcmd-arg")))) #t))))) (native-inputs `(("autoconf" ,autoconf))) (inputs `(("ncurses" ,ncurses) -- cgit v1.2.3 From f006237c545babed5151c943fe163ce9852bc9c2 Mon Sep 17 00:00:00 2001 From: Nils Gillmann Date: Wed, 12 Sep 2018 13:56:08 +0000 Subject: gnu: gnurl: Update to 7.61.1. * gnu/packages/gnunet.scm (gnurl): Update to 7.61.1. Signed-off-by: Leo Famulari --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index eb17b96492..b4c9c463f7 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -186,13 +186,13 @@ authentication and support for SSL3 and TLS.") (define-public gnurl (package (name "gnurl") - (version "7.61.0") + (version "7.61.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gnunet/" name "-" version ".tar.Z")) (sha256 (base32 - "1h03zkd9mp4xb5icirl3bfd64r5x8j9ka1hw9qd0n1ql1w0ilz23")))) + "0amnhhmlxaliz2rzp3zf1x6ixjqvgmiq7in0q14gd21rjlk9kvir")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 1.5 MiB of man3 pages -- cgit v1.2.3 From 0bcd1bc7780ad11c398def0717a24214e16bdc6a Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 12 Sep 2018 17:41:31 +0200 Subject: gnu: rust@1.19.0: Use match-lambda directly. Follow-up to 3159ef7c99c646b78b04cedb1bd3525c301ef978. * gnu/packages/rust.scm (rust-1.19)[arguments]<#:phases>[build]: Use match-lambda directly. --- gnu/packages/rust.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 631dcfd67c..e51d90328a 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -408,7 +408,7 @@ test = { path = \"../libtest\" } ;; but right now, Cargo has problems with libstd's circular ;; dependencies. (mkdir-p "output/target-libs") - (for-each ((@ (ice-9 match) match-lambda) + (for-each (match-lambda ((name . flags) (write name) (newline) -- cgit v1.2.3 From 5a3fcf5b4468524b07a81a9c6814239fd588c8c9 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 12 Sep 2018 22:52:08 +0200 Subject: gnu: rust@1.19.0: Install rustdoc. * gnu/packages/rust.scm (rust-1.19)[arguments]<#:phases>[install]: Install rustdoc. --- gnu/packages/rust.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e51d90328a..3b3df91c92 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -454,6 +454,8 @@ test = { path = \"../libtest\" } (copy-recursively "output/target-libs" out-libs) (install-file "output/rustc-build/rustc" (string-append out "/bin")) + (install-file "output/rustc-build/rustdoc" + (string-append out "/bin")) (install-file "output/cargo-build/cargo" (string-append (assoc-ref outputs "cargo") "/bin"))) -- cgit v1.2.3 From 3763e7716cc319dadb3adfbcbbc668aea96fec09 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 12 Sep 2018 22:53:06 +0200 Subject: gnu: rust@1.19.0: Remove superfluous install-file call. * gnu/packages/rust.scm (rust-1.19)[arguments]<#:phases>[build]: Remove superfluous install-file call. --- gnu/packages/rust.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 3b3df91c92..d7565c0a15 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -387,7 +387,6 @@ test = { path = \"../libtest\" } "--output-dir" "output/rustc-build" "-L" (string-append rustc-bootstrap "/lib/mrust") "-j" "1") - (install-file "output/rustc-build/rustc" "output") ; FIXME: Remove? (setenv "CFG_COMPILER_HOST_TRIPLE" #f) (setenv "CFG_RELEASE" #f) (setenv "CFG_RELEASE_CHANNEL" #f) -- cgit v1.2.3 From aed0a594058a59bc3bb1d2686391dc0e8a181b1f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 12 Sep 2018 23:56:34 +0200 Subject: git-download: Rewrite 'git-predicate' using Guile-Git. Fixes . * guix/git-download.scm (files->directory-tree) (directory-in-tree?): Remove. (git-file-list): New procedures. (git-predicate): Use it instead of opening a pipe to 'git'. Remove directory tree hack and rely exclusively on inode/device numbers. --- guix/git-download.scm | 119 ++++++++++++++++++-------------------------------- 1 file changed, 42 insertions(+), 77 deletions(-) diff --git a/guix/git-download.scm b/guix/git-download.scm index 33f102bc6c..e6e0ec2ac5 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2017 Mathieu Lirzin ;;; Copyright © 2017 Christopher Baines ;;; @@ -19,7 +19,6 @@ ;;; along with GNU Guix. If not, see . (define-module (guix git-download) - #:use-module (guix build utils) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix monads) @@ -27,9 +26,8 @@ #:use-module (guix packages) #:use-module (guix modules) #:autoload (guix build-system gnu) (standard-packages) + #:use-module (git) #:use-module (ice-9 match) - #:use-module (ice-9 popen) - #:use-module (ice-9 rdelim) #:use-module (ice-9 vlist) #:use-module (srfi srfi-1) #:export (git-reference @@ -153,41 +151,31 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." ;;; 'git-predicate'. ;;; -(define (files->directory-tree files) - "Return a tree of vhashes representing the directory listed in FILES, a list -like '(\"a/b\" \"b/c/d\")." - (fold (lambda (file result) - (let loop ((file (string-split file #\/)) - (result result)) - (match file - ((_) - result) - ((directory children ...) - (match (vhash-assoc directory result) - (#f - (vhash-cons directory (loop children vlist-null) - result)) - ((_ . previous) - ;; XXX: 'vhash-delete' is O(n). - (vhash-cons directory (loop children previous) - (vhash-delete directory result))))) - (() - result)))) - vlist-null - files)) - -(define (directory-in-tree? tree directory) - "Return true if DIRECTORY, a string like \"a/b\", denotes a directory listed -in TREE." - (let loop ((directory (string-split directory #\/)) - (tree tree)) - (match directory - (() - #t) - ((head . tail) - (match (vhash-assoc head tree) - ((_ . sub-tree) (loop tail sub-tree)) - (#f #f)))))) +(define (git-file-list directory) + "Return the list of files checked in in the Git repository at DIRECTORY. +The result is similar to that of the 'git ls-files' command, except that it +also includes directories, not just regular files. The returned file names +are relative to DIRECTORY, which is not necessarily the root of the checkout." + (let* ((directory (canonicalize-path directory)) + (dot-git (repository-discover directory)) + (top (dirname dot-git)) + (repository (repository-open dot-git)) + (head (repository-head repository)) + (oid (reference-target head)) + (commit (commit-lookup repository oid)) + (tree (commit-tree commit)) + (files (tree-list tree))) + (repository-close! repository) + (if (string=? top directory) + files + (let ((relative (string-append + (string-drop directory + (+ 1 (string-length top))) + "/"))) + (filter-map (lambda (file) + (and (string-prefix? relative file) + (string-drop file (string-length relative)))) + files))))) (define (git-predicate directory) "Return a predicate that returns true if a file is part of the Git checkout @@ -195,43 +183,20 @@ living at DIRECTORY. Upon Git failure, return #f instead of a predicate. The returned predicate takes two arguments FILE and STAT where FILE is an absolute file name and STAT is the result of 'lstat'." - (let* ((pipe (with-directory-excursion directory - (open-pipe* OPEN_READ "git" "ls-files"))) - (files (let loop ((lines '())) - (match (read-line pipe) - ((? eof-object?) - (reverse lines)) - (line - (loop (cons line lines)))))) - (directory-tree (files->directory-tree files)) - (inodes (fold (lambda (file result) - (let ((stat - (lstat (string-append directory "/" - file)))) - (vhash-consv (stat:ino stat) (stat:dev stat) - result))) - vlist-null - files)) - - ;; Note: For this to work we must *not* call 'canonicalize-path' on - ;; DIRECTORY or we would get discrepancies of the returned lambda is - ;; called with a non-canonical file name. - (prefix-length (+ 1 (string-length directory))) - - (status (close-pipe pipe))) - (and (zero? status) - (lambda (file stat) - (match (stat:type stat) - ('directory - (directory-in-tree? directory-tree - (string-drop file prefix-length))) - ((or 'regular 'symlink) - ;; Comparing file names is always tricky business so we rely on - ;; inode numbers instead - (match (vhash-assv (stat:ino stat) inodes) - ((_ . dev) (= dev (stat:dev stat))) - (#f #f))) - (_ - #f)))))) + (let* ((files (git-file-list directory)) + (inodes (fold (lambda (file result) + (let ((stat + (lstat (string-append directory "/" + file)))) + (vhash-consv (stat:ino stat) (stat:dev stat) + result))) + vlist-null + files))) + (lambda (file stat) + ;; Comparing file names is always tricky business so we rely on inode + ;; numbers instead. + (match (vhash-assv (stat:ino stat) inodes) + ((_ . dev) (= dev (stat:dev stat))) + (#f #f))))) ;;; git-download.scm ends here -- cgit v1.2.3 From 614cfd5c540c59cc45a0fbaaf08538b5646bfb2b Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 12 Sep 2018 23:15:27 +0200 Subject: gnu: Add rust@1.20.0. * gnu/packages/rust.scm (rust-1.20): New variable. --- gnu/packages/rust.scm | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index d7565c0a15..ba061885b7 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -499,6 +499,120 @@ safety and thread safety guarantees.") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) +(define-public rust-1.20 + (let ((base-rust + (rust-bootstrapped-package rust-1.19 "1.20.0" + "0542y4rnzlsrricai130mqyxl8r6rd991frb4qsnwb27yigqg91a"))) + (package + (inherit base-rust) + (outputs '("out" "doc" "cargo")) + (arguments + (substitute-keyword-arguments (package-arguments rust-1.19) + ((#:phases phases) + `(modify-phases ,phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (gcc (assoc-ref inputs "gcc")) + (gdb (assoc-ref inputs "gdb")) + (binutils (assoc-ref inputs "binutils")) + (python (assoc-ref inputs "python-2")) + (rustc (assoc-ref inputs "rustc-bootstrap")) + (cargo (assoc-ref inputs "cargo-bootstrap")) + (llvm (assoc-ref inputs "llvm")) + (jemalloc (assoc-ref inputs "jemalloc"))) + (call-with-output-file "config.toml" + (lambda (port) + (display (string-append " +[llvm] +[build] +cargo = \"" cargo "/bin/cargo" "\" +rustc = \"" rustc "/bin/rustc" "\" +docs = true +python = \"" python "/bin/python2" "\" +gdb = \"" gdb "/bin/gdb" "\" +vendor = true +submodules = false +[install] +prefix = \"" out "\" +docdir = \"" doc "/share/doc/rust" "\" +sysconfdir = \"etc\" +localstatedir = \"var/lib\" +[rust] +default-linker = \"" gcc "/bin/gcc" "\" + +# The archiver that the finished compiler uses +default-ar = \"" binutils "/bin/ar" "\" +channel = \"stable\" +rpath = true +" ;; There are 2 failed codegen tests: +;; codegen/mainsubprogram.rs and codegen/mainsubprogramstart.rs +;; These tests require a patched LLVM +"codegen-tests = false +[target." ,(nix-system->gnu-triplet-for-rust) "] +llvm-config = \"" llvm "/bin/llvm-config" "\" +cc = \"" gcc "/bin/gcc" "\" +cxx = \"" gcc "/bin/g++" "\" +jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" +[dist] +") port))) + #t))) + (add-after 'configure 'provide-cc + (lambda* (#:key inputs #:allow-other-keys) + (symlink (string-append (assoc-ref inputs "gcc") "/bin/gcc") + "/tmp/cc") + (setenv "PATH" (string-append "/tmp:" (getenv "PATH"))) + #t)) + (add-after 'provide-cc 'configure-archiver + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/build_helper/lib.rs" + ;; Make sure "ar" is always used as the archiver. + (("\"musl\"") "\"\"") + ;; Then substitute "ar" by our name. + (("\"ar\"") (string-append "\"" + (assoc-ref inputs "binutils") + "/bin/ar\""))) + #t)) + (delete 'patch-cargo-tomls) + (add-before 'build 'reset-timestamps-after-changes + (lambda* _ + (define ref (stat "README.md")) + (for-each + (lambda (filename) + (set-file-time filename ref)) + (find-files "." #:directories? #t)) + #t)) + (replace 'build + (lambda* _ + (invoke "./x.py" "build") + (invoke "./x.py" "build" "src/tools/cargo"))) + (replace 'check + (lambda* _ + ;; Disable parallel execution to prevent EAGAIN errors when + ;; running tests. + (invoke "./x.py" "-j1" "test" "-vv") + (invoke "./x.py" "-j1" "test" "src/tools/cargo") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "./x.py" "install") + (substitute* "config.toml" + ;; replace prefix to specific output + (("prefix = \"[^\"]*\"") + (string-append "prefix = \"" (assoc-ref outputs "cargo") "\""))) + (invoke "./x.py" "install" "cargo"))) + (add-after 'install 'wrap-rustc + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (libc (assoc-ref inputs "libc")) + (ld-wrapper (assoc-ref inputs "ld-wrapper"))) + ;; Let gcc find ld and libc startup files. + (wrap-program (string-append out "/bin/rustc") + `("PATH" ":" prefix (,(string-append ld-wrapper "/bin"))) + `("LIBRARY_PATH" ":" suffix (,(string-append libc "/lib")))) + #t)))))))))) + (define-public rust-1.23 (package (inherit rust-1.19) -- cgit v1.2.3 From 4bd8f4f3028fcabf90c5c262ac237c037e668939 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 26 Aug 2018 17:35:46 -0400 Subject: gnu: python-jedi: Update to 0.12.1. * gnu/packages/python.scm (python-jedi): Update to 0.12.1. [propagated-inputs]: Move python-parso here, as it is required at run time. --- gnu/packages/python.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6367def203..88c971b328 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9655,8 +9655,9 @@ characters, mouse support, and auto suggestions.") (invoke "py.test" "-vv")))))) (native-inputs `(("python-pytest" ,python-pytest) - ("python-parso" ,python-parso) ("python-docopt" ,python-docopt))) + (propagated-inputs + `(("python-parso" ,python-parso))) (home-page "https://github.com/davidhalter/jedi") (synopsis "Autocompletion and static analysis library for Python") (description -- cgit v1.2.3 From 7e846d07e83e5d63eee42c9361a2d1a933f79883 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 26 Aug 2018 23:56:15 -0400 Subject: gnu: Add python-toml. * gnu/packages/python.scm (python-toml): New variables. --- gnu/packages/python.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 88c971b328..793961d944 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -54,6 +54,7 @@ ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2018 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -2721,6 +2722,27 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") (define-public python2-feedgenerator (package-with-python2 python-feedgenerator)) +(define-public python-toml + (package + (name "python-toml") + (version "0.9.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "toml" version)) + (sha256 + (base32 + "0bdbpbip67wdm6c7xwc6mmbmskyradj4cdxn1iibj4fcx1nbv1lf")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;no tests suite in release + (home-page "https://github.com/uiri/toml") + (synopsis "Library for TOML") + (description + "@code{toml} is a library for parsing and creating Tom's Obvious, Minimal +Language (TOML) configuration files.") + (license license:expat))) + (define-public python-blinker (package (name "python-blinker") -- cgit v1.2.3 From 8795ce86731157577278d1510a79dec64e36d3ca Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 26 Aug 2018 23:58:26 -0400 Subject: gnu: Add python-black. * gnu/packages/python.scm (python-black): New variable. --- gnu/packages/python.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 793961d944..525ff3f027 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2743,6 +2743,41 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") Language (TOML) configuration files.") (license license:expat))) +(define-public python-black + (package + (name "python-black") + (version "18.6b4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "black" version)) + (sha256 + (base32 + "0i4sfqgz6w15vd50kbhi7g7rifgqlf8yfr8y78rypd56q64qn592")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'patch-extra-shebangs + (lambda _ + (let ((python3 (which "python3"))) + (substitute* '("tests/data/fmtonoff.py" + "tests/data/string_prefixes.py" + "tests/data/function.py") + (("#!/usr/bin/env python3(\\.[0-9]+)?" _ minor-version) + (string-append "#!" python3 (if (string? minor-version) + minor-version + "")))))))))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-attrs" ,python-attrs) + ("python-appdirs" ,python-appdirs) + ("python-toml" ,python-toml))) + (home-page "https://github.com/ambv/black") + (synopsis "The uncompromising code formatter") + (description "Black is the uncompromising Python code formatter.") + (license license:expat))) + (define-public python-blinker (package (name "python-blinker") -- cgit v1.2.3 From aaf10fa7d8e74a81a891fcc02f1719ab4968c9a3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 22:08:03 -0500 Subject: gnu: Add emacs-el-x. * gnu/packages/emacs.scm (emacs-el-x): New variable. --- gnu/packages/emacs.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 9898767085..65056d3445 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4467,6 +4467,39 @@ If you want to mark a folder manually as a project just create an empty and RSS, with a user interface inspired by notmuch.") (license license:gpl3+))) +(define-public emacs-el-x + (package + (name "emacs-el-x") + (version "0.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sigma/el-x.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Move the source files to the top level, which is included in + ;; the EMACSLOADPATH. + (add-after 'unpack 'move-source-files + (lambda _ + (let ((el-files (find-files "./lisp" ".*\\.el$"))) + (for-each (lambda (f) + (rename-file f (basename f))) + el-files)) + #t))))) + (home-page "https://github.com/sigma/el-x") + (synopsis "Emacs Lisp extensions") + (description "command@{emacs-el-x} defines the @code{dflet} macro to +provide the historic behavior of @code{flet}, as well as +@code{declare-function} stub for older Emacs.") + (license license:gpl2+))) + (define-public emacs-rainbow-delimiters (package (name "emacs-rainbow-delimiters") -- cgit v1.2.3 From 563f151bd42c51b56794bee307148beef7fada26 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 22:08:37 -0500 Subject: gnu: Add emacs-mocker. * gnu/packages/emacs.scm (emacs-mocker): New variable. --- gnu/packages/emacs.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 65056d3445..741351f7f6 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4500,6 +4500,34 @@ provide the historic behavior of @code{flet}, as well as @code{declare-function} stub for older Emacs.") (license license:gpl2+))) +(define-public emacs-mocker + (package + (name "emacs-mocker") + (version "0.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sigma/mocker.el.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("ert-runner"))) + (native-inputs + `(("ert-runner" ,ert-runner))) + (propagated-inputs + `(("emacs-el-x" ,emacs-el-x))) + (home-page "https://github.com/sigma/mocker.el") + (synopsis "Mocking framework for Emacs Lisp") + (description "Mocker.el is a framework for writing tests in Emacs Lisp. +It uses regular Lisp rather than a domain specific language (DSL), which +maximizes flexibility (at the expense of conciseness).") + (license license:gpl2+))) + (define-public emacs-rainbow-delimiters (package (name "emacs-rainbow-delimiters") -- cgit v1.2.3 From 2c6ff3a2bc9846e6233013049bde28fafca3ee2b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 22:09:12 -0500 Subject: gnu: Add emacs-find-file-in-project. * gnu/packages/emacs.scm (emacs-find-file-in-project): New variable. --- gnu/packages/emacs.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 741351f7f6..d8e83136d5 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4528,6 +4528,39 @@ It uses regular Lisp rather than a domain specific language (DSL), which maximizes flexibility (at the expense of conciseness).") (license license:gpl2+))) +(define-public emacs-find-file-in-project + (package + (name "emacs-find-file-in-project") + (version "5.4.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/technomancy/find-file-in-project.git") + (commit version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1sdnyqv69mipbgs9yax88m9b6crsa59rjhwrih197pifl4089awr")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-shell + ;; Otherwise Emacs shell-file-name is set to "/bin/sh", which doesn't + ;; work. + (lambda _ + (setenv "SHELL" (which "sh")) + #t))) + #:tests? #t + #:test-command '("./tests/test.sh"))) + (home-page "https://github.com/technomancy/find-file-in-project") + (synopsis "File/directory finder for Emacs") + (description "@code{find-file-in-project} allows to find files or +directories quickly in the current project. The project root is detected +automatically when Git, Subversion or Mercurial are used. It also provides +functions to assist in reviewing changes on files.") + (license license:gpl3+))) + (define-public emacs-rainbow-delimiters (package (name "emacs-rainbow-delimiters") -- cgit v1.2.3 From 87e9fb5753c1d77b9630982e7bae9b54f23caecb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 22:09:43 -0500 Subject: gnu: Add emacs-pyvenv. * gnu/packages/emacs.scm (emacs-pyvenv): New variable. --- gnu/packages/emacs.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index d8e83136d5..c6fcbde1ab 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4561,6 +4561,37 @@ automatically when Git, Subversion or Mercurial are used. It also provides functions to assist in reviewing changes on files.") (license license:gpl3+))) +(define-public emacs-pyvenv + (package + (name "emacs-pyvenv") + (version "1.11") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jorgenschaefer/pyvenv.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1a346qdimr1dvj53q033aqnahwd2dhyn9jadrs019nm0bzgw7g63")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; This phase incorrectly attempts to substitute "activate" and fails + ;; doing so. + (delete 'patch-el-files)) + #:tests? #t + #:test-command '("ert-runner"))) + (native-inputs + `(("ert-runner" ,ert-runner) + ("emacs-mocker" ,emacs-mocker))) + (home-page "https://github.com/jorgenschaefer/pyvenv") + (synopsis "Virtualenv minor mode for Emacs") + (description "pyvenv.el is a minor mode to support using Python virtual +environments (virtualenv) inside Emacs.") + (license license:gpl3+))) + (define-public emacs-rainbow-delimiters (package (name "emacs-rainbow-delimiters") -- cgit v1.2.3 From dcc31d7f41f5368a94a8478f634f1c7bda1c9b41 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 22:10:03 -0500 Subject: gnu: Add emacs-highlight-indentation. * gnu/packages/emacs.scm (emacs-highlight-indentation): New variable. --- gnu/packages/emacs.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c6fcbde1ab..6df3aba4eb 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4592,6 +4592,30 @@ functions to assist in reviewing changes on files.") environments (virtualenv) inside Emacs.") (license license:gpl3+))) +(define-public emacs-highlight-indentation + (package + (name "emacs-highlight-indentation") + (version "0.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/antonj/Highlight-Indentation-for-Emacs.git") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k")))) + (build-system emacs-build-system) + (home-page "https://github.com/antonj/Highlight-Indentation-for-Emacs/") + (synopsis "Highlighting indentation for Emacs") + (description "Provides two minor modes to highlight indentation guides in Emacs: +@enumerate +@item @code{highlight-indentation-mode}, which displays guidelines +indentation (space indentation only). +@item @code{highlight-indentation-current-column-mode}, which displays guidelines for the current-point indentation (space indentation only). +@end enumerate") + (license license:gpl2+))) + (define-public emacs-rainbow-delimiters (package (name "emacs-rainbow-delimiters") -- cgit v1.2.3 From 82baeea2979b98a642dcfe63a87d08355a101f4c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 12 Feb 2018 22:10:31 -0500 Subject: gnu: Add emacs-elpy. * gnu/packages/emacs.scm (emacs-elpy): New variable. --- gnu/packages/emacs.scm | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6df3aba4eb..1541626d76 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -4616,6 +4616,78 @@ indentation (space indentation only). @end enumerate") (license license:gpl2+))) +(define-public emacs-elpy + (package + (name "emacs-elpy") + (version "1.24.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jorgenschaefer/elpy.git") + (commit version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0rsg8a9nwqfkv0xcs11jzfp10ij7jm0v2ikx19zv2v7awqy0q5wf")))) + (build-system emacs-build-system) + (arguments + `(#:include (cons* "^elpy/[^/]+\\.py$" "^snippets\\/" %default-include) + #:phases + ;; TODO: Make `elpy-config' display Guix commands :) + (modify-phases %standard-phases + ;; One elpy test depends on being run inside a Python virtual + ;; environment to pass. We have nothing to gain from doing so here, + ;; so we just trick Elpy into thinking we are (see: + ;; https://github.com/jorgenschaefer/elpy/pull/1293). + (add-before 'check 'fake-virtualenv + (lambda _ + (setenv "VIRTUAL_ENV" "/tmp") + #t)) + (add-before 'check 'build-doc + (lambda _ + (with-directory-excursion "docs" + (invoke "make" "info" "man")) + ;; Move .info file at the root so that it can installed by the + ;; 'move-doc phase. + (rename-file "docs/_build/texinfo/Elpy.info" "Elpy.info") + #t)) + (add-after 'build-doc 'install-manpage + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man1 (string-append out "/share/man/man1"))) + (mkdir-p man1) + (copy-file "docs/_build/man/elpy.1" + (string-append man1 "/elpy.1"))) + #t))) + #:tests? #t + #:test-command '("ert-runner"))) + (propagated-inputs + `(("emacs-company" ,emacs-company) + ("emacs-find-file-in-project" ,emacs-find-file-in-project) + ("emacs-highlight-indentation" ,emacs-highlight-indentation) + ("emacs-yasnippet" ,emacs-yasnippet) + ("pyvenv" ,emacs-pyvenv) + ("s" ,emacs-s))) + (native-inputs + `(("ert-runner" ,ert-runner) + ("emacs-f" ,emacs-f) + ("python" ,python-wrapper) + ("python-autopep8" ,python-autopep8) + ("python-black" ,python-black) + ("python-flake8" ,python-flake8) + ("python-jedi" ,python-jedi) + ("python-yapf" ,python-yapf) + ;; For documentation. + ("python-sphinx" ,python-sphinx) + ("texinfo" ,texinfo))) + (home-page "https://github.com/jorgenschaefer/elpy") + (synopsis "Python development environment for Emacs") + (description "Elpy brings powerful Python editing to Emacs. It combines +and configures a number of other packages written in Emacs Lisp as well as +Python, together offering features such as navigation, documentation, +completion, interactive development and more.") + (license license:gpl3+))) + (define-public emacs-rainbow-delimiters (package (name "emacs-rainbow-delimiters") -- cgit v1.2.3 From f309671c289373893096de367c779f3175f297da Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 6 Sep 2018 11:21:51 -0400 Subject: gnu: Add emacs-org-reveal. * gnu/packages/emacs.scm (emacs-org-reveal): New variable. --- gnu/packages/emacs.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1541626d76..770ca3c496 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -9812,6 +9812,29 @@ The default setup uses helm-bibtex. You should really read org-ref.org in this package for details.") (license license:gpl3+)))) +(define-public emacs-org-reveal + (package + (name "emacs-org-reveal") + ;; There are no proper tag, so we use the latest commit of the stable + ;; branch, as does MELPA. + (version "20161027.926") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yjwen/org-reveal.git") + (commit "001567cc12d50ba07612edd1718b86a12e8c2547"))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "18rma8smjrskbjyna076zhvx79zs5r5vinb537h8mw13pfxd6cm8")))) + (build-system emacs-build-system) + (home-page "https://github.com/yjwen/org-reveal") + (synopsis "Org and Reveal.js powered HTML presentation tool") + (description "Org-Reveal is a command@{org-mode} extension that allows to +create beautiful presentations (slides) with 3D effects from simple but +powerful Org contents.") + (license license:gpl3+))) + (define-public emacs-add-hooks (package (name "emacs-add-hooks") -- cgit v1.2.3 From 333c0ca9661b8285ac49eed881e75c523317d5df Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 00:25:39 +0200 Subject: gnu: rust@1.23.0: Use rust@1.20.0 as template. * gnu/packages/rust.scm (rust-1.23)[inherit]: Use rust-1.20. [arguments]<#:phases>: Delete "patch-cargo-tomls" phase deletion. Add "provide-cc" phase deletion. Add "configure-archiver" phase deletion. [configure]: Inherit phase. [reset-timestamps-after-changes]: Inherit phase. [build]: Inherit phase. [check]: Inherit phase. [install]: Inherit phase. [wrap-rustc]: Inherit phase. --- gnu/packages/rust.scm | 93 +++------------------------------------------------ 1 file changed, 5 insertions(+), 88 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index ba061885b7..e84e58a30f 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -615,7 +615,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (define-public rust-1.23 (package - (inherit rust-1.19) + (inherit rust-1.20) (name "rust") (version "1.23.0") (source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")) @@ -633,17 +633,17 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ("pkg-config" ,pkg-config) ; For "cargo" ("which" ,which))) (arguments - (substitute-keyword-arguments (package-arguments rust-1.19) + (substitute-keyword-arguments (package-arguments rust-1.20) ((#:phases phases) `(modify-phases ,phases + (delete 'provide-cc) + (delete 'configure-archiver) (add-after 'unpack 'dont-build-native (lambda _ ;; XXX: Revisit this when we use gcc 6. (substitute* "src/binaryen/CMakeLists.txt" (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") "")) #t)) - ;; TODO: Revisit this and find out whether that's needed after all. - (delete 'patch-cargo-tomls) (add-after 'patch-tests 'patch-cargo-tests (lambda _ (substitute* "src/tools/cargo/tests/build.rs" @@ -671,90 +671,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ;; is 0, but in same time "src" have 0 mtime in guix build! (("let threshold = mtime\\(dst\\);") "if !dst.exists() {\nreturn false\n}\n let threshold = mtime(dst);")) - #t)) - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (gcc (assoc-ref inputs "gcc")) - (gdb (assoc-ref inputs "gdb")) - (binutils (assoc-ref inputs "binutils")) - (python (assoc-ref inputs "python-2")) - (rustc (assoc-ref inputs "rustc-bootstrap")) - (cargo (assoc-ref inputs "cargo-bootstrap")) - (llvm (assoc-ref inputs "llvm")) - (jemalloc (assoc-ref inputs "jemalloc"))) - (call-with-output-file "config.toml" - (lambda (port) - (display (string-append " -[llvm] -[build] -cargo = \"" cargo "/bin/cargo" "\" -rustc = \"" rustc "/bin/rustc" "\" -docs = true -python = \"" python "/bin/python2" "\" -gdb = \"" gdb "/bin/gdb" "\" -vendor = true -submodules = false -[install] -prefix = \"" out "\" -docdir = \"" doc "/share/doc/rust" "\" -sysconfdir = \"etc\" -localstatedir = \"var/lib\" -[rust] -default-linker = \"" gcc "/bin/gcc" "\" -channel = \"stable\" -rpath = true -" ;; There are 2 failed codegen tests: - ;; codegen/mainsubprogram.rs and codegen/mainsubprogramstart.rs - ;; These tests require a patched LLVM -"codegen-tests = false -[target." ,(nix-system->gnu-triplet-for-rust) "] -llvm-config = \"" llvm "/bin/llvm-config" "\" -cc = \"" gcc "/bin/gcc" "\" -cxx = \"" gcc "/bin/g++" "\" -ar = \"" binutils "/bin/ar" "\" -jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" -[dist] -") port))) - #t))) - (add-before 'build 'reset-timestamps-after-changes - (lambda* _ - (define ref (stat "README.md")) - (for-each - (lambda (filename) - (set-file-time filename ref)) - (find-files "." #:directories? #t)) - #t)) - (replace 'build - (lambda* _ - (invoke "./x.py" "build") - (invoke "./x.py" "build" "src/tools/cargo"))) - (replace 'check - (lambda* _ - ;; Disable parallel execution to prevent EAGAIN errors when - ;; running tests. - (invoke "./x.py" "-j1" "test") - (invoke "./x.py" "-j1" "test" "src/tools/cargo"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "./x.py" "install") - (substitute* "config.toml" - ;; replace prefix to specific output - (("prefix = \"[^\"]*\"") - (string-append "prefix = \"" (assoc-ref outputs "cargo") "\""))) - (invoke "./x.py" "install" "cargo") - #t)) - (add-after 'install 'wrap-rustc - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (libc (assoc-ref inputs "libc")) - (ld-wrapper (assoc-ref inputs "ld-wrapper"))) - ;; Let gcc find ld and libc startup files. - (wrap-program (string-append out "/bin/rustc") - `("PATH" ":" prefix (,(string-append ld-wrapper "/bin"))) - `("LIBRARY_PATH" ":" suffix (,(string-append libc "/lib")))) - #t))))))))) + #t)))))))) (define-public rust-1.24 (let ((base-rust -- cgit v1.2.3 From bfdc0e4d456c51c812ac06a8008de5cc90073654 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 00:37:15 +0200 Subject: gnu: rust: Move "cc" from rust-bootstrap to rust proper. * gnu/packages/rust.scm (rust-bootstrap)[arguments]<#:phases>[install]: Delete "cc". (rust-1.23)[arguments]<#:phases>: Delete "provide-cc" deletion. --- gnu/packages/rust.scm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e84e58a30f..634dbf8bde 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -143,11 +143,6 @@ (for-each (lambda (file) (invoke "patchelf" "--set-interpreter" ld-so file)) (list rustc rustdoc cargo)) - ;; Rust requires a C toolchain for linking. The prebuilt - ;; binaries expect a compiler called cc. Thus symlink gcc - ;; to cc. - (symlink (string-append gcc "/bin/gcc") - (string-append out "/bin/cc")) #t)))))) (home-page "https://www.rust-lang.org") (synopsis "Prebuilt rust compiler and cargo package manager") @@ -636,7 +631,6 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (substitute-keyword-arguments (package-arguments rust-1.20) ((#:phases phases) `(modify-phases ,phases - (delete 'provide-cc) (delete 'configure-archiver) (add-after 'unpack 'dont-build-native (lambda _ -- cgit v1.2.3 From e69b1a7c6ed0db26b195aa18e66b32bb8b384527 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 00:39:39 +0200 Subject: gnu: rust-bootstrap: Clean up comments. * gnu/packages/rust.scm (rust-bootstrap): Clean up comments. --- gnu/packages/rust.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 634dbf8bde..fd0f365284 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -126,13 +126,13 @@ (rustdoc (string-append out "/bin/rustdoc")) (cargo (string-append cargo-out "/bin/cargo")) (gcc (assoc-ref inputs "gcc"))) - ;; Install rustc/rustdoc + ;; Install rustc/rustdoc. (invoke "bash" "install.sh" (string-append "--prefix=" out) (string-append "--components=rustc," "rust-std-" ,(nix-system->gnu-triplet-for-rust))) - ;; Instal cargo + ;; Install cargo. (invoke "bash" "install.sh" (string-append "--prefix=" cargo-out) (string-append "--components=cargo")) -- cgit v1.2.3 From 05ebff92bd84751953ce0f95a44cab134aae1346 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 00:53:22 +0200 Subject: gnu: Add rust@1.21.0. * gnu/packages/rust.scm (rust-1.21): New variable. --- gnu/packages/rust.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index fd0f365284..2a84da0063 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -608,6 +608,10 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" `("LIBRARY_PATH" ":" suffix (,(string-append libc "/lib")))) #t)))))))))) +(define-public rust-1.21 + (rust-bootstrapped-package rust-1.20 "1.21.0" + "1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp")) + (define-public rust-1.23 (package (inherit rust-1.20) -- cgit v1.2.3 From 1ab3e1dd981aeb6b9fb3c19a564a27ab7db6461d Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 00:55:33 +0200 Subject: gnu: Add rust@1.22.1. * gnu/packages/rust.scm (rust-1.22): New variable. --- gnu/packages/rust.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 2a84da0063..89630aa8a0 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -612,6 +612,10 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (rust-bootstrapped-package rust-1.20 "1.21.0" "1yj8lnxybjrybp00fqhxw8fpr641dh8wcn9mk44xjnsb4i1c21qp")) +(define-public rust-1.22 + (rust-bootstrapped-package rust-1.21 "1.22.1" + "1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb")) + (define-public rust-1.23 (package (inherit rust-1.20) -- cgit v1.2.3 From 73dc7834de77699dfba904445692362c435293b4 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 01:05:55 +0200 Subject: gnu: rust@1.20.0: Replace "default-ar" by "ar". * gnu/packages/rust.scm (rust-1.20)[arguments]<#:phases>[configure]: Replace "default-ar" by "ar". --- gnu/packages/rust.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 89630aa8a0..f62c48499d 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -536,9 +536,6 @@ sysconfdir = \"etc\" localstatedir = \"var/lib\" [rust] default-linker = \"" gcc "/bin/gcc" "\" - -# The archiver that the finished compiler uses -default-ar = \"" binutils "/bin/ar" "\" channel = \"stable\" rpath = true " ;; There are 2 failed codegen tests: @@ -549,6 +546,7 @@ rpath = true llvm-config = \"" llvm "/bin/llvm-config" "\" cc = \"" gcc "/bin/gcc" "\" cxx = \"" gcc "/bin/g++" "\" +ar = \"" binutils "/bin/ar" "\" jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" [dist] ") port))) -- cgit v1.2.3 From 88bfabf111dfc794dc8c8f6d44d253842b39b55e Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 27 Aug 2018 22:47:14 +0200 Subject: hydra: Add support for manifests. * build-aux/hydra/gnu-system.scm (arguments->manifests, manifests->packages): New procedures. (hydra-jobs): Add a "manifests" subset. * doc/guix.texi (Continuous Integration): Update accordingly. --- build-aux/hydra/gnu-system.scm | 35 ++++++++++++++++++++++++++ doc/guix.texi | 56 ++++++++++++++++++++++++++++-------------- 2 files changed, 73 insertions(+), 18 deletions(-) diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index b1554ced4c..7234e2d0e8 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2017 Jan Nieuwenhuizen +;;; Copyright © 2018 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,6 +57,7 @@ (guix packages) (guix derivations) (guix monads) + (guix ui) ((guix licenses) #:select (gpl3+)) ((guix utils) #:select (%current-system)) ((guix scripts system) #:select (read-operating-system)) @@ -311,6 +313,30 @@ valid." packages))) #:select? (const #t))) ;include hidden packages +(define (arguments->manifests arguments) + "Return the list of manifests extracted from ARGUMENTS." + (map (match-lambda + ((input-name . relative-path) + (let* ((checkout (assq-ref arguments (string->symbol input-name))) + (base (assq-ref checkout 'file-name))) + (in-vicinity base relative-path)))) + (assq-ref arguments 'manifests))) + +(define (manifests->packages store manifests) + "Return the list of packages found in MANIFESTS." + (define (load-manifest manifest) + (save-module-excursion + (lambda () + (set-current-module (make-user-module '((guix profiles) (gnu)))) + (primitive-load manifest)))) + + (parameterize ((%graft? #f)) + (delete-duplicates! + (map manifest-entry-item + (append-map (compose manifest-entries + load-manifest) + manifests))))) + ;;; ;;; Hydra entry point. @@ -323,6 +349,7 @@ valid." ("core" 'core) ; only build core packages ("hello" 'hello) ; only build hello (((? string?) (? string?) ...) 'list) ; only build selected list of packages + ("manifests" 'manifests) ; only build packages in the list of manifests (_ 'all))) ; build everything (define systems @@ -419,6 +446,14 @@ valid." package system)) packages)) '())) + ((manifests) + ;; Build packages in the list of manifests. + (let* ((manifests (arguments->manifests arguments)) + (packages (manifests->packages store manifests))) + (map (lambda (package) + (package-job store (job-name package) + package system)) + packages))) (else (error "unknown subset" subset)))) systems))) diff --git a/doc/guix.texi b/doc/guix.texi index 19a497c746..cccf166d03 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -18165,23 +18165,43 @@ The type of the Cuirass service. Its value must be a @code{cuirass-configuration} object, as described below. @end defvr -To add build jobs, you have to set the @code{specifications} field of -the configuration. Here is an example of a service defining a build job -based on a specification that can be found in Cuirass source tree. This -service polls the Guix repository and builds a subset of the Guix -packages, as prescribed in the @file{gnu-system.scm} example spec: - -@example -(let ((spec #~((#:name . "guix") - (#:url . "git://git.savannah.gnu.org/guix.git") - (#:load-path . ".") - (#:file . "build-aux/cuirass/gnu-system.scm") - (#:proc . cuirass-jobs) - (#:arguments (subset . "hello")) - (#:branch . "master")))) - (service cuirass-service-type - (cuirass-configuration - (specifications #~(list '#$spec))))) +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}. + +@example +(define %cuirass-specs + #~(list + '((#:name . "my-manifest") + (#:load-path-inputs . ("guix")) + (#:package-path-inputs . ("custom-packages")) + (#:proc-input . "guix") + (#:proc-file . "build-aux/cuirass/gnu-system.scm") + (#:proc . cuirass-jobs) + (#:proc-args . ((subset . "manifests") + (systems . ("x86_64-linux")) + (manifests . (("config" . "guix/manifest.scm"))))) + (#:inputs . (((#:name . "guix") + (#:url . "git://git.savannah.gnu.org/guix.git") + (#:load-path . ".") + (#:branch . "master") + (#:no-compile? . #t)) + ((#:name . "config") + (#:url . "git://git.example.org/config.git") + (#:load-path . ".") + (#:branch . "master") + (#:no-compile? . #t)) + ((#:name . "custom-packages") + (#:url . "git://git.example.org/custom-packages.git") + (#:load-path . ".") + (#:branch . "master") + (#:no-compile? . #t))))))) + +(service cuirass-service-type + (cuirass-configuration + (specifications %cuirass-specs))) @end example While information related to build jobs is located directly in the @@ -18208,7 +18228,7 @@ Owner's group of the @code{cuirass} process. Number of seconds between the poll of the repositories followed by the Cuirass jobs. -@item @code{database} (default: @code{"/var/run/cuirass/cuirass.db"}) +@item @code{database} (default: @code{"/var/lib/cuirass/cuirass.db"}) Location of sqlite database which contains the build results and previously added specifications. -- cgit v1.2.3 From 78c9058dde237d6913a30a40c1f5ca19395f86c3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 13 Sep 2018 10:10:49 +0200 Subject: build-self: Add a dummy (git) module to 'compute-guix-derivation'. Fixes a regression introduced in aed0a594058a59bc3bb1d2686391dc0e8a181b1f. * build-aux/build-self.scm (build-program)[fake-git]: New variable. Use it as an imported module. --- build-aux/build-self.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index f91b43987a..09979dc410 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -263,6 +263,9 @@ interface (FFI) of Guile.") #~(define-module (gcrypt hash) #:export (sha1 sha256)))) + (define fake-git + (scheme-file "git.scm" #~(define-module (git)))) + (with-imported-modules `(((guix config) => ,(make-config.scm)) @@ -272,6 +275,11 @@ interface (FFI) of Guile.") ;; adjust %LOAD-PATH later on. ((gcrypt hash) => ,fake-gcrypt-hash) + ;; (guix git-download) depends on (git) but only + ;; for peripheral functionality. Provide a dummy + ;; (git) to placate it. + ((git) => ,fake-git) + ,@(source-module-closure `((guix store) (guix self) (guix derivations) -- cgit v1.2.3 From ac4d2ec81a9f7c439b21b4c4ae4a2e949c78ab2e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 13 Sep 2018 10:23:39 +0200 Subject: build-self: Emit a useful message upon error. * build-aux/build-self.scm (build): Raise a '&message' condition instead of calling 'error'. --- build-aux/build-self.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 09979dc410..306b2c6b63 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -25,6 +25,8 @@ #:use-module (guix build-system gnu) #:use-module (srfi srfi-1) #:use-module (srfi srfi-19) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35) #:use-module (rnrs io ports) #:use-module (ice-9 match) #:use-module (ice-9 popen) @@ -420,7 +422,15 @@ files." ;; Unsupported PULL-VERSION. (return #f)) ((? string? str) - (error "invalid build result" (list build str)))))))) + (raise (condition + (&message + (message (format #f "You found a bug: the program '~a' +failed to compute the derivation for Guix (version: ~s; system: ~s; +host version: ~s; pull-version: ~s). +Please report it by email to <~a>.~%" + (derivation->output-path build) + version system %guix-version pull-version + %guix-bug-report-address))))))))))) ;; This file is loaded by 'guix pull'; return it the build procedure. build -- cgit v1.2.3 From 26700caed91b967bf365e29eb576cc23b84a502f Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Thu, 13 Sep 2018 19:28:36 +0800 Subject: gnu: racket: Fix incompatibility with libedit. The former patching made racket detecting libedit as the old 2.11 version, which leads to failure: . * gnu/packages/scheme.scm (racket)[arguments]: Patch the 'ffi-lib' call of libedit using 'PLT_READLINE_LIB'. --- gnu/packages/scheme.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 926169ce18..2e46a8453f 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -460,6 +460,9 @@ implementation techniques and as an expository tool.") (substitute* "share/pkgs/math-lib/math/private/bigfloat/mpfr.rkt" (("ffi-lib libmpfr-so") (format #f "ffi-lib \"~a\"" (find-so "libmpfr")))) + (substitute* "share/pkgs/readline-lib/readline/rktrl.rkt" + (("\\(getenv \"PLT_READLINE_LIB\"\\)") + (format #f "\"~a\"" (find-so "libedit")))) (for-each (lambda (x) (apply patch-ffi-libs x)) '(("share/pkgs/draw-lib/racket/draw/unsafe/cairo-lib.rkt" @@ -487,9 +490,7 @@ implementation techniques and as an expository tool.") ("share/pkgs/gui-lib/mred/private/wx/gtk/gl-context.rkt" ("libGL")) ("share/pkgs/sgl/gl.rkt" - ("libGL" "libGLU")) - ("share/pkgs/readline-lib/readline/rktrl.rkt" - ("libedit"))))) + ("libGL" "libGLU"))))) (chdir "src") #t)) (add-after 'unpack 'patch-/bin/sh -- cgit v1.2.3 From d1ca3d7297f5d94dad6d9e2200d3d63738e45a2f Mon Sep 17 00:00:00 2001 From: pimi Date: Thu, 6 Sep 2018 17:14:50 +0200 Subject: gnu: Add r-svdialogs. gnu/packages/cran.scm (r-svdialogs): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ab989abfff..721f43503a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5668,3 +5668,30 @@ Interfaces (GUI) in R. It is independent from any particular GUI widgets. It centralizes info about GUI elements currently used, and it dispatches GUI calls to the particular toolkits in use in function of the context.") (license license:gpl2))) + +(define-public r-svdialogs + (package + (name "r-svdialogs") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "svDialogs" version)) + (sha256 + (base32 "0xqppydfawnwk84kb5qiybwbcmv38vn4imgz01mz2pnq4xb80p97")))) + (properties `((upstream-name . "svDialogs"))) + (build-system r-build-system) + (inputs + `(("yad" ,yad) + ("zenity" ,zenity))) + (propagated-inputs + `(("r-rstudioapi" ,r-rstudioapi) + ("r-svgui" ,r-svgui))) + (home-page "https://github.com/SciViews/svDialogs/") + (synopsis "Portable dialog boxes") + (description + "This package helps to construct standard dialog boxes for your GUI, including +message boxes, input boxes, list, file or directory selection, and others. In +case R cannot display GUI dialog boxes, a simpler command line version of these +interactive elements is also provided as a fallback solution.") + (license license:gpl2))) -- cgit v1.2.3 From 3cadd3ce93472987fec0bfb4fde9f6937775c7d8 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 3 Sep 2018 14:27:58 +0200 Subject: gnu: Add r-abe. gnu/packages/cran.scm (r-abe): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 721f43503a..fd08f5f549 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5695,3 +5695,25 @@ message boxes, input boxes, list, file or directory selection, and others. In case R cannot display GUI dialog boxes, a simpler command line version of these interactive elements is also provided as a fallback solution.") (license license:gpl2))) + +(define-public r-abe + (package + (name "r-abe") + (version "3.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "abe" version)) + (sha256 + (base32 + "1f19h3xzzmjhvwc1rrb8z0rai3ip03y4gdi2gg9bfr5sg2nfklk6")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/abe/") + (synopsis "Augmented backward elimination") + (description + "This package performs augmented backward elimination and checks the +stability of the obtained model. Augmented backward elimination combines +significance or information based criteria with the change in estimate to +either select the optimal model for prediction purposes or to serve as a tool +to obtain a practically sound, highly interpretable model.") + (license license:gpl2+))) -- cgit v1.2.3 From 6fe73b487b46fa8c60e8aee7e2d2a642e5024077 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 10:35:11 +0200 Subject: gnu: rust: Accept more detailed gdb responses. * gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/rust.scm (rust-1.25): Use it. (rust-1.26): Use it. (rust): Use it. --- gnu/local.mk | 1 + .../rust-1.25-accept-more-detailed-gdb-lines.patch | 94 ++++++++++++++++++++++ gnu/packages/rust.scm | 11 ++- 3 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch diff --git a/gnu/local.mk b/gnu/local.mk index f15fb3339a..7b230cb6f5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1124,6 +1124,7 @@ dist_patch_DATA = \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ %D%/packages/patches/rust-1.19-mrustc.patch \ + %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/rxvt-unicode-escape-sequences.patch \ diff --git a/gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch b/gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch new file mode 100644 index 0000000000..6ffc897297 --- /dev/null +++ b/gnu/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch @@ -0,0 +1,94 @@ +GDB responds with some overly detailed lines - which makes the tests fail. +Patch rust to accept those instead. +diff -ur orig/rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs +--- orig/rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs 2018-09-13 10:24:33.775565159 +0200 ++++ rustc-1.25.0-src/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs 2018-09-13 10:25:56.322513658 +0200 +@@ -19,36 +19,36 @@ + + // gdb-command:print eight_bytes1 + // gdbg-check:$1 = {{RUST$ENUM$DISR = Variant1, __0 = 100}, {RUST$ENUM$DISR = Variant1, __0 = 100}} +-// gdbr-check:$1 = generic_enum_with_different_disr_sizes::Enum::Variant1(100) ++// gdbr-check:$1 = generic_enum_with_different_disr_sizes::Enum::Variant1(100) + + // gdb-command:print four_bytes1 + // gdbg-check:$2 = {{RUST$ENUM$DISR = Variant1, __0 = 101}, {RUST$ENUM$DISR = Variant1, __0 = 101}} +-// gdbr-check:$2 = generic_enum_with_different_disr_sizes::Enum::Variant1(101) ++// gdbr-check:$2 = generic_enum_with_different_disr_sizes::Enum::Variant1(101) + + // gdb-command:print two_bytes1 + // gdbg-check:$3 = {{RUST$ENUM$DISR = Variant1, __0 = 102}, {RUST$ENUM$DISR = Variant1, __0 = 102}} +-// gdbr-check:$3 = generic_enum_with_different_disr_sizes::Enum::Variant1(102) ++// gdbr-check:$3 = generic_enum_with_different_disr_sizes::Enum::Variant1(102) + + // gdb-command:print one_byte1 + // gdbg-check:$4 = {{RUST$ENUM$DISR = Variant1, __0 = 65 'A'}, {RUST$ENUM$DISR = Variant1, __0 = 65 'A'}} +-// gdbr-check:$4 = generic_enum_with_different_disr_sizes::Enum::Variant1(65) ++// gdbr-check:$4 = generic_enum_with_different_disr_sizes::Enum::Variant1(65) + + + // gdb-command:print eight_bytes2 + // gdbg-check:$5 = {{RUST$ENUM$DISR = Variant2, __0 = 100}, {RUST$ENUM$DISR = Variant2, __0 = 100}} +-// gdbr-check:$5 = generic_enum_with_different_disr_sizes::Enum::Variant2(100) ++// gdbr-check:$5 = generic_enum_with_different_disr_sizes::Enum::Variant2(100) + + // gdb-command:print four_bytes2 + // gdbg-check:$6 = {{RUST$ENUM$DISR = Variant2, __0 = 101}, {RUST$ENUM$DISR = Variant2, __0 = 101}} +-// gdbr-check:$6 = generic_enum_with_different_disr_sizes::Enum::Variant2(101) ++// gdbr-check:$6 = generic_enum_with_different_disr_sizes::Enum::Variant2(101) + + // gdb-command:print two_bytes2 + // gdbg-check:$7 = {{RUST$ENUM$DISR = Variant2, __0 = 102}, {RUST$ENUM$DISR = Variant2, __0 = 102}} +-// gdbr-check:$7 = generic_enum_with_different_disr_sizes::Enum::Variant2(102) ++// gdbr-check:$7 = generic_enum_with_different_disr_sizes::Enum::Variant2(102) + + // gdb-command:print one_byte2 + // gdbg-check:$8 = {{RUST$ENUM$DISR = Variant2, __0 = 65 'A'}, {RUST$ENUM$DISR = Variant2, __0 = 65 'A'}} +-// gdbr-check:$8 = generic_enum_with_different_disr_sizes::Enum::Variant2(65) ++// gdbr-check:$8 = generic_enum_with_different_disr_sizes::Enum::Variant2(65) + + // gdb-command:continue + +diff -ur orig/rustc-1.25.0-src/src/test/debuginfo/generic-struct-style-enum.rs rustc-1.25.0-src/src/test/debuginfo/generic-struct-style-enum.rs +--- orig/rustc-1.25.0-src/src/test/debuginfo/generic-struct-style-enum.rs 2018-09-13 10:24:33.775565159 +0200 ++++ rustc-1.25.0-src/src/test/debuginfo/generic-struct-style-enum.rs 2018-09-13 10:27:43.353108111 +0200 +@@ -19,15 +19,15 @@ + + // gdb-command:print case1 + // gdbg-check:$1 = {{RUST$ENUM$DISR = Case1, a = 0, b = 31868, c = 31868, d = 31868, e = 31868}, {RUST$ENUM$DISR = Case1, [...]}, {RUST$ENUM$DISR = Case1, [...]}} +-// gdbr-check:$1 = generic_struct_style_enum::Regular::Case1{a: 0, b: 31868, c: 31868, d: 31868, e: 31868} ++// gdbr-check:$1 = generic_struct_style_enum::Regular::Case1{a: 0, b: 31868, c: 31868, d: 31868, e: 31868} + + // gdb-command:print case2 + // gdbg-check:$2 = {{RUST$ENUM$DISR = Case2, [...]}, {RUST$ENUM$DISR = Case2, a = 0, b = 286331153, c = 286331153}, {RUST$ENUM$DISR = Case2, [...]}} +-// gdbr-check:$2 = generic_struct_style_enum::Regular::Case2{a: 0, b: 286331153, c: 286331153} ++// gdbr-check:$2 = generic_struct_style_enum::Regular::Case2{a: 0, b: 286331153, c: 286331153} + + // gdb-command:print case3 + // gdbg-check:$3 = {{RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, a = 0, b = 6438275382588823897}} +-// gdbr-check:$3 = generic_struct_style_enum::Regular::Case3{a: 0, b: 6438275382588823897} ++// gdbr-check:$3 = generic_struct_style_enum::Regular::Case3{a: 0, b: 6438275382588823897} + + // gdb-command:print univariant + // gdbg-check:$4 = {{a = -1}} +diff -ur orig/rustc-1.25.0-src/src/test/debuginfo/generic-tuple-style-enum.rs rustc-1.25.0-src/src/test/debuginfo/generic-tuple-style-enum.rs +--- orig/rustc-1.25.0-src/src/test/debuginfo/generic-tuple-style-enum.rs 2018-09-13 10:24:33.775565159 +0200 ++++ rustc-1.25.0-src/src/test/debuginfo/generic-tuple-style-enum.rs 2018-09-13 10:28:26.328546298 +0200 +@@ -21,15 +21,15 @@ + + // gdb-command:print case1 + // gdbg-check:$1 = {{RUST$ENUM$DISR = Case1, __0 = 0, __1 = 31868, __2 = 31868, __3 = 31868, __4 = 31868}, {RUST$ENUM$DISR = Case1, [...]}, {RUST$ENUM$DISR = Case1, [...]}} +-// gdbr-check:$1 = generic_tuple_style_enum::Regular::Case1(0, 31868, 31868, 31868, 31868) ++// gdbr-check:$1 = generic_tuple_style_enum::Regular::Case1(0, 31868, 31868, 31868, 31868) + + // gdb-command:print case2 + // gdbg-check:$2 = {{RUST$ENUM$DISR = Case2, [...]}, {RUST$ENUM$DISR = Case2, __0 = 0, __1 = 286331153, __2 = 286331153}, {RUST$ENUM$DISR = Case2, [...]}} +-// gdbr-check:$2 = generic_tuple_style_enum::Regular::Case2(0, 286331153, 286331153) ++// gdbr-check:$2 = generic_tuple_style_enum::Regular::Case2(0, 286331153, 286331153) + + // gdb-command:print case3 + // gdbg-check:$3 = {{RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, [...]}, {RUST$ENUM$DISR = Case3, __0 = 0, __1 = 6438275382588823897}} +-// gdbr-check:$3 = generic_tuple_style_enum::Regular::Case3(0, 6438275382588823897) ++// gdbr-check:$3 = generic_tuple_style_enum::Regular::Case3(0, 6438275382588823897) + + // gdb-command:print univariant + // gdbg-check:$4 = {{__0 = -1}} diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index f62c48499d..448ce893d4 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -696,7 +696,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (define-public rust-1.25 (let ((base-rust (rust-bootstrapped-package rust-1.24 "1.25.0" - "0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf"))) + "0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf" + #:patches '("rust-1.25-accept-more-detailed-gdb-lines.patch")))) (package (inherit base-rust) (inputs @@ -735,8 +736,9 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (define-public rust-1.26 (let ((base-rust (rust-bootstrapped-package rust-1.25 "1.26.2" - "0047ais0fvmqvngqkdsxgrzhb0kljg8wy85b01kbbjc88hqcz7pv" - #:patches '("rust-coresimd-doctest.patch")))) + "0047ais0fvmqvngqkdsxgrzhb0kljg8wy85b01kbbjc88hqcz7pv" + #:patches '("rust-coresimd-doctest.patch" + "rust-1.25-accept-more-detailed-gdb-lines.patch")))) (package (inherit base-rust) (arguments @@ -786,7 +788,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" "089d7rhw55zpvnw71dj8vil6qrylvl4xjr4m8bywjj83d4zq1f9c" #:patches '("rust-coresimd-doctest.patch" - "rust-bootstrap-stage0-test.patch")))) + "rust-bootstrap-stage0-test.patch" + "rust-1.25-accept-more-detailed-gdb-lines.patch")))) (package (inherit base-rust) (arguments -- cgit v1.2.3 From b78fe27b317c34411ea3770fd7dbd61fc5af3411 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 17:14:40 +0200 Subject: gnu: rust@1.25.0: Disable pedantic test. * gnu/packages/rust.scm (rust-1.25)[arguments]<#:phases> [disable-nil-enum-test]: New phase. --- gnu/packages/rust.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 448ce893d4..780c2830c6 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -719,6 +719,13 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (substitute* "config.toml" (("codegen-tests = false") "")) #t)) + ;; FIXME: Re-enable this test if it's indeed supposed to work. + ;; See . + (add-after 'enable-codegen-tests 'disable-nil-enum-test + (lambda _ + (substitute* "src/test/debuginfo/nil-enum.rs" + (("ignore-lldb") "ignore-gdb")) + #t)) (replace 'patch-aarch64-test (lambda _ (substitute* "src/librustc_metadata/dynamic_lib.rs" -- cgit v1.2.3 From 060366f6b311ee3e1a57290bb6a7785417e019b7 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 11:52:10 +0200 Subject: gnu: rust@1.23.0: Inherit outputs. * gnu/packages/rust.scm (rust-1.23)[outputs]: Inherit. --- gnu/packages/rust.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 780c2830c6..b053bdce62 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -620,7 +620,6 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (name "rust") (version "1.23.0") (source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")) - (outputs '("out" "doc" "cargo")) (native-inputs `(("bison" ,bison) ; For the tests ("cmake" ,cmake) -- cgit v1.2.3 From fade67ab756602bdeba508fbffa0e35234b58b9c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 13 Sep 2018 18:39:22 +0300 Subject: gnu: retroarch: Use shared zlib. * gnu/packages/emulators.scm (retroarch)[arguments]: In custom 'configure phase, use our zlib instead of vendor's zlib. --- gnu/packages/emulators.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index e02339af62..f21c322814 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1079,6 +1079,11 @@ emulation community. It provides highly accurate emulation.") (("libvulkan.so") (string-append vulkan "/lib/libvulkan.so"))) (substitute* "qb/qb.libs.sh" (("/bin/true") (which "true"))) + ;; Use shared zlib. + (substitute* '("libretro-common/file/archive_file_zlib.c" + "libretro-common/streams/trans_stream_zlib.c" + "network/httpserver/httpserver.c") + (("") "")) ;; The configure script does not yet accept the extra arguments ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. (zero? (system* -- cgit v1.2.3 From f21967a44bbd948846bdd1bbc370d3d0e3b52185 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 13 Sep 2018 18:40:02 +0300 Subject: gnu: retroarch: Fix building on armhf-linux. * gnu/packages/emulators.scm (retroarch)[arguments]: Add custom flags when building for armhf-linux. --- gnu/packages/emulators.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index f21c322814..782bff5b18 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1066,7 +1066,7 @@ emulation community. It provides highly accurate emulation.") (base32 "0h6y2hpjg4b470jvn9ghwp0k3a527sbb6xhia17frlm9w9v5028w")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases (replace 'configure @@ -1086,10 +1086,14 @@ emulation community. It provides highly accurate emulation.") (("") "")) ;; The configure script does not yet accept the extra arguments ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. - (zero? (system* - "./configure" - (string-append "--prefix=" out) - (string-append "--global-config-dir=" etc))))))))) + (invoke + "./configure" + ,@(if (string-prefix? "armhf" (or (%current-target-system) + (%current-system))) + '("--enable-neon" "--enable-floathard") + '()) + (string-append "--prefix=" out) + (string-append "--global-config-dir=" etc)))))))) (inputs `(("alsa-lib" ,alsa-lib) ("ffmpeg" ,ffmpeg) -- cgit v1.2.3 From ef26400b66354942ce784fd3a8ab8eb6c19dc4b7 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 3 Sep 2018 15:28:14 +0200 Subject: gnu: Add r-abf2. gnu/packages/cran.scm (r-abf2): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fd08f5f549..7d65dfbdc1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5717,3 +5717,22 @@ significance or information based criteria with the change in estimate to either select the optimal model for prediction purposes or to serve as a tool to obtain a practically sound, highly interpretable model.") (license license:gpl2+))) + +(define-public r-abf2 + (package + (name "r-abf2") + (version "0.7-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "abf2" version)) + (sha256 + (base32 "0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/abf2/") + (synopsis "Load gap-free axon @code{r-abf2} files") + (description + "This package loads electrophysiology data from ABF2 files, as created by +Axon Instruments/Molecular Devices software. Only files recorded in gap-free +mode are currently supported.") + (license license:artistic2.0))) -- cgit v1.2.3 From 38dc3d6f17bcf54ee3ff1614a392534d3a9e1ecc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 11 Sep 2018 18:23:29 -0400 Subject: gnu: libinput: Update to 1.12.0. * gnu/packages/freedesktop.scm (libinput): Update to 1.12.0. --- 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 626d883648..8811f9d9de 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -148,14 +148,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.11.3") + (version "1.12.0") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" name "-" version ".tar.xz")) (sha256 (base32 - "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk")))) + "1901wxh9k8kz3krfmvacf8xa8r4idfyisw8d80a2ql0bxiw2pb0m")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) -- cgit v1.2.3 From ae72b8f55bba87eb87285eee9bdeaa95f213efd2 Mon Sep 17 00:00:00 2001 From: Manuel Graf Date: Fri, 31 Aug 2018 16:55:57 +0200 Subject: gnu: Add ClusterShell. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (clustershell): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/ssh.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 03c4e3cc0b..362d427a2e 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2018 Manuel Graf ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,12 +50,14 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:autoload (gnu packages protobuf) (protobuf) + #:use-module (gnu packages python) #:use-module (gnu packages readline) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -695,3 +698,41 @@ which executes commands on multiple remote hosts in parallel. Pdsh implements dynamically loadable modules for extended functionality such as new remote shell services and remote host selection.") (license license:gpl2+))) + +(define-public clustershell + (package + (name "clustershell") + (version "1.8") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/cea-hpc/clustershell/archive/v" + version + ".tar.gz")) + (sha256 + (base32 "1qyf6zp5ikk8rk7zvx5ssbgr9si2bqv3a3415590kd07s7i16nmd")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system python-build-system) + (inputs `(("openssh" ,openssh))) + (propagated-inputs `(("python-pyyaml" ,python-pyyaml))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'build 'record-openssh-file-name + (lambda* (#:key inputs #:allow-other-keys) + (let ((ssh (assoc-ref inputs "openssh"))) + (substitute* "lib/ClusterShell/Worker/Ssh.py" + (("info\\(\"ssh_path\"\\) or \"ssh\"") + (string-append "info(\"ssh_path\") or \"" + ssh "/bin/ssh\""))) + #t)))))) + (home-page "https://cea-hpc.github.io/clustershell/") + (synopsis "Scalable event-driven Python framework for cluster administration") + (description + "ClusterShell is an event-driven Python framework, designed to run local +or distant commands in parallel on server farms or on large GNU/Linux +clusters. It will take care of common issues encountered on HPC clusters, +such as operating on groups of nodes, running distributed commands using +optimized execution algorithms, as well as gathering results and merging +identical outputs, or retrieving return codes. ClusterShell takes advantage +of existing remote shell facilities such as SSH.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 1efcd0f1ea980472659805d91a2bb486b4136f81 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 3 Sep 2018 15:45:20 +0200 Subject: gnu: Add r-abhgenotyper. * gnu/packages/cran.scm (r-abhgenotyper): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7d65dfbdc1..a05834d7ea 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5736,3 +5736,29 @@ to obtain a practically sound, highly interpretable model.") Axon Instruments/Molecular Devices software. Only files recorded in gap-free mode are currently supported.") (license license:artistic2.0))) + +(define-public r-abhgenotyper + (package + (name "r-abhgenotyper") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "ABHgenotypeR" version)) + (sha256 + (base32 "08cpmnaaxsm5c5bjifnfxdlvg5inrf13biqpcl2yq5zpqjmiki0l")))) + (properties `((upstream-name . "ABHgenotypeR"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-reshape2" ,r-reshape2))) + (home-page "https://github.com/StefanReuscher/ABHgenotypeR/") + (synopsis "Visualize and manipulate ABH genotypes") + (description + "The @code{r-abhgenotyper} package provides simple imputation, +error-correction and plotting capacities for genotype data. The package is +supposed to serve as an intermediate but independent analysis tool between the +TASSEL GBS pipeline and the @code{r-qtl} package. It provides functionalities +not found in either TASSEL or @code{r-qtl} in addition to visualization of +genotypes as \"graphical genotypes\".") + (license license:gpl3))) -- cgit v1.2.3 From ebb3cdb1ea6540a5c2b81e43c63d095f426d524a Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 3 Sep 2018 16:16:38 +0200 Subject: gnu: Add r-abjutils. * gnu/packages/cran.scm (r-abjutils): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a05834d7ea..f8177da013 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5762,3 +5762,38 @@ TASSEL GBS pipeline and the @code{r-qtl} package. It provides functionalities not found in either TASSEL or @code{r-qtl} in addition to visualization of genotypes as \"graphical genotypes\".") (license license:gpl3))) + +(define-public r-abjutils + (package + (name "r-abjutils") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "abjutils" version)) + (sha256 + (base32 "0qrsc4if7aif73qp95lw6b5986c2r0jn7m39123zij8k15vc935b")))) + (build-system r-build-system) + (propagated-inputs + `(("r-devtools" ,r-devtools) + ("r-dplyr" ,r-dplyr) + ("r-glue" ,r-glue) + ("r-httr" ,r-httr) + ("r-magrittr" ,r-magrittr) + ("r-plyr" ,r-plyr) + ("r-progress" ,r-progress) + ("r-purrr" ,r-purrr) + ("r-rstudioapi" ,r-rstudioapi) + ("r-scales" ,r-scales) + ("r-stringi" ,r-stringi) + ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr))) + (home-page "https://github.com/abjur/abjutils/") + (synopsis "Collection of tools for jurimetrical analysis") + (description + "This package implements general purpose tools, such as functions for +sampling and basic manipulation of Brazilian lawsuits identification number. +It also implements functions for text cleaning, such as accentuation +removal.") + (license license:expat))) -- cgit v1.2.3 From 7d1cc612938565d935c53bd7a429f41d1f048dae Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 13 Sep 2018 13:26:31 -0400 Subject: Revert "gnu: libinput: Update to 1.12.0." Libinput-minimal has a lot of dependent packages, and this isn't reported by `guix refresh --list-dependent`. We'll save this commit for another time. This reverts commit 38dc3d6f17bcf54ee3ff1614a392534d3a9e1ecc. --- 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 8811f9d9de..626d883648 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -148,14 +148,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.12.0") + (version "1.11.3") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" name "-" version ".tar.xz")) (sha256 (base32 - "1901wxh9k8kz3krfmvacf8xa8r4idfyisw8d80a2ql0bxiw2pb0m")))) + "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) -- cgit v1.2.3 From ecd13016517f0113016fef090782b725fd5e80ce Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 11 Sep 2018 18:23:29 -0400 Subject: gnu: libinput: Update to 1.12.0. * gnu/packages/freedesktop.scm (libinput): Update to 1.12.0. --- 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 ce67b6858b..c6bccd452d 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -148,14 +148,14 @@ freedesktop.org project.") (define-public libinput (package (name "libinput") - (version "1.11.3") + (version "1.12.0") (source (origin (method url-fetch) (uri (string-append "https://freedesktop.org/software/libinput/" name "-" version ".tar.xz")) (sha256 (base32 - "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk")))) + "1901wxh9k8kz3krfmvacf8xa8r4idfyisw8d80a2ql0bxiw2pb0m")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=false"))) -- cgit v1.2.3 From 6be445785a4eb97cbecff391ae5b9fde89cb83de Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 13 Sep 2018 19:35:21 +0200 Subject: gnu: youtube-viewer: Don't use unstable tarball. * gnu/packages/video.scm (youtube-viewer)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/video.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index aa2b4467fc..067a1ddc03 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1429,14 +1429,14 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (name "youtube-viewer") (version "3.3.4") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/trizen/youtube-viewer/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/trizen/youtube-viewer.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1dqaxkz5svv0lmxds6lppcpzhkq6gar2raw9gx6imrd7yz02fpgn")))) + "1kpq3mk81hpjp5q4mi907ds0dbif40a4dzmv2h2lq5pcp757sw6i")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) -- cgit v1.2.3 From 0b0b43ed7a10c1dcb7d053e0ac93023fd138ea01 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 13 Sep 2018 19:39:05 +0200 Subject: gnu: youtube-viewer: Update to 3.4.1. * gnu/packages/video.scm (youtube-viewer): Update to 3.4.1. --- 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 067a1ddc03..4882f0476a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1427,7 +1427,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (define-public youtube-viewer (package (name "youtube-viewer") - (version "3.3.4") + (version "3.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -1436,7 +1436,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (file-name (git-file-name name version)) (sha256 (base32 - "1kpq3mk81hpjp5q4mi907ds0dbif40a4dzmv2h2lq5pcp757sw6i")))) + "0axgb95lx81psgrb2a5rfdd8gl4mhsrzf41jas6l58d1xkaj54ri")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) -- cgit v1.2.3 From 581b6f5e969e57a0ac7068685641afa205cc8308 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Sep 2018 22:15:38 +0200 Subject: gnu: sudo: Update to 1.8.25p1. * gnu/packages/admin.scm (sudo): Update to 1.8.25p1. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8807ab18b5..c6e1044b2b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -963,7 +963,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.8.25") + (version "1.8.25p1") (source (origin (method url-fetch) (uri @@ -973,7 +973,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "0hfw6pcwjvv1vvnhb4n1p210306jm4npz99p9cfhbd33yrhhzkwx")) + "0nqri46d4dpycj96zin2f2wszmhm7q9mr68hhj9sp81pgmx9rjcx")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 7ec4f648e5939e5dc10e1b28515dac8b03b63652 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 12 Sep 2018 17:16:37 +0200 Subject: gnu: sg3_utils: Mark up description. * gnu/packages/scsi.scm (sg3_utils)[description]: Use @dfn{}. Wrap commands in @command{} rather than @code{}, and @itemize them. --- gnu/packages/scsi.scm | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index 2bb863cad9..f011af84c4 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -40,15 +40,24 @@ (synopsis "SCSI device utilities") (description "sg3-utils is a collection of utilities for devices that use the Small -Computer System Interface (SCSI) command set. It includes utilities to read -data from, write data to, control, modify, and query the state of SCSI -devices. For example, this package provides command-line tools to copy data -based on @code{dd} syntax and semantics (called @code{sg_dd}, @code{sgp_dd} -and @code{sgm_dd}), check INQUIRY data and VPD pages (@code{sg_inq}), check -mode and log pages (@code{sginfo}, @code{sg_modes} and @code{sg_logs}), spin -up and down disks (@code{sg_start}), do self tests (@code{sg_senddiag}), parse -sense data (@code{sg_decode_sense}), and perform various other functions. In -addition, this package includes a library, called libsgutils, which can be +Computer System Interface (@dfn{SCSI}) command set. It includes utilities to +read data from, write data to, control, modify, and query the state of SCSI +devices. + +For example, this package provides command-line tools to: +@itemize +@item copy data based on @code{dd} syntax and semantics (called @command{sg_dd}, +@command{sgp_dd}, and @command{sgm_dd}) +@item check @code{INQUIRY} data and @code{VPD pages} (@command{sg_inq}) +@item check mode and log pages (@command{sginfo}, @command{sg_modes}, and +@command{sg_logs}) +@item spin up and down disks (@command{sg_start}) +@item do self-tests (@code{sg_senddiag}) +@item parse sense data (@code{sg_decode_sense}) +@item and perform various other functions. +@end itemize + +In addition, this package includes a library, called libsgutils, which can be used in C and C++ programs to interact with SCSI devices.") ;; See README: "All utilities and libraries have either a "2 clause" BSD ;; license or are "GPL-2ed". [...] That BSD license was updated from the -- cgit v1.2.3 From f0314f65dfe31299fd2ef42f42d9691814f7856d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 20:23:50 +0200 Subject: gnu: Add perl-devel-checklib. * gnu/packages/perl.scm (perl-devel-checklib): New public variable. --- gnu/packages/perl.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 85604008e2..f556d19f3c 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2626,6 +2626,30 @@ the appropriate objects.") particular command is available.") (license (package-license perl)))) +(define-public perl-devel-checklib + (package + (name "perl-devel-checklib") + (version "1.13") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-" + version ".tar.gz")) + (sha256 + (base32 "1a19qkwxwz3wqb16cdabymfbf9kiydiifw90nd5srpq5hy8gvb94")))) + (build-system perl-build-system) + (native-inputs + `(("perl-io-captureoutput" ,perl-io-captureoutput) + ("perl-mock-config" ,perl-mock-config))) + (home-page "https://metacpan.org/release/Devel-CheckLib") + (synopsis "Check that a library is available") + (description + "@code{Devel::CheckLib} is a Perl module that checks whether a particular +C library and its headers are available. You can also check for the presence of +particular functions in a library, or even that those functions return +particular results.") + (license perl-license))) + (define-public perl-devel-checkcompiler (package (name "perl-devel-checkcompiler") -- cgit v1.2.3 From b6afe7b7f540c0effbf570d72d5a1efb45287f01 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 3 Sep 2018 16:59:46 +0200 Subject: gnu: Add r-abnormality. * gnu/packages/cran.scm (r-abnormality): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f8177da013..439cfcb014 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5797,3 +5797,28 @@ sampling and basic manipulation of Brazilian lawsuits identification number. It also implements functions for text cleaning, such as accentuation removal.") (license license:expat))) + +(define-public r-abnormality + (package + (name "r-abnormality") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "abnormality" version)) + (sha256 + (base32 "1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v")))) + (build-system r-build-system) + (propagated-inputs + `(("r-mass" ,r-mass) + ("r-matrix" ,r-matrix))) + (home-page "https://cran.r-project.org/web/packages/abnormality/") + (synopsis "Measure a subject's abnormality with respect to a reference population") + (description + "This package contains functions to implement the methodology and +considerations laid out by Marks et al. in the article \"Measuring abnormality +in high dimensional spaces: applications in biomechanical gait analysis\". +Using high-dimensional datasets to measure a subject's overall level of +abnormality as compared to a reference population is often needed in outcomes +research.") + (license license:expat))) -- cgit v1.2.3 From 317b139c5dc7e4501d79cd0952444b4b068bee5c Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 13 Sep 2018 10:42:54 +0200 Subject: gnu: rust: Update to 1.27.2. * gnu/packages/rust.scm (rust): Update to 1.27.2. --- gnu/packages/rust.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index b053bdce62..c40a47c4d9 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -790,8 +790,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (define-public rust (let ((base-rust - (rust-bootstrapped-package rust-1.26 "1.27.0" - "089d7rhw55zpvnw71dj8vil6qrylvl4xjr4m8bywjj83d4zq1f9c" + (rust-bootstrapped-package rust-1.26 "1.27.2" + "0pg1s37bhx9zqbynxyydq5j6q7kij9vxkcv8maz0m25prm88r0cs" #:patches '("rust-coresimd-doctest.patch" "rust-bootstrap-stage0-test.patch" -- cgit v1.2.3 From 016cabf7bee007fb580d355113de8aa13d0f0a2b Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 10 Sep 2018 13:21:38 +0200 Subject: gnu: Add r-abodoutlier. * gnu/packages/cran.scm (r-abodoutlier): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 439cfcb014..0c6a4908e8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5822,3 +5822,32 @@ Using high-dimensional datasets to measure a subject's overall level of abnormality as compared to a reference population is often needed in outcomes research.") (license license:expat))) + +(define-public r-abodoutlier + (package + (name "r-abodoutlier") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "abodOutlier" version)) + (sha256 + (base32 "1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj")))) + (properties `((upstream-name . "abodOutlier"))) + (build-system r-build-system) + (propagated-inputs + `(("r-cluster" ,r-cluster))) + (home-page "https://cran.r-project.org/web/packages/abodOutlier/") + (synopsis "Angle-based outlier detection") + (description + "This package performs angle-based outlier detection on a given data +frame. It offers three methods to process data: +@enumerate +@item full but slow implementation using all the data that has cubic + complexity; +@item a fully randomized method; +@item a method using k-nearest neighbours. +@end enumerate +These algorithms are well suited for high dimensional data outlier +detection.") + (license license:expat))) -- cgit v1.2.3 From 03c95f04147b8022983d39d49171db8eb08e8c59 Mon Sep 17 00:00:00 2001 From: pimi Date: Mon, 10 Sep 2018 14:50:07 +0200 Subject: gnu: Add r-abps. * gnu/packages/cran.scm (r-abps): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0c6a4908e8..5519b85d0b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5851,3 +5851,27 @@ frame. It offers three methods to process data: These algorithms are well suited for high dimensional data outlier detection.") (license license:expat))) + +(define-public r-abps + (package + (name "r-abps") + (version "0.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "ABPS" version)) + (sha256 + (base32 "1k3f5i34f4w2khkszb4qhwwcpiy7gsfh82vjr6rypwg6rx5rjclq")))) + (properties `((upstream-name . "ABPS"))) + (build-system r-build-system) + (propagated-inputs `(("r-kernlab" ,r-kernlab))) + (home-page "https://cran.r-project.org/web/packages/ABPS/") + (synopsis "Abnormal blood profile score to detect blood doping") + (description + "This package offers an implementation of the @dfn{Abnormal blood profile score} (ABPS). +The ABPS is a part of the Athlete biological passport program of the World +anti-doping agency, which combines several blood parameters into a single +score in order to detect blood doping. The package also contains functions to +calculate other scores used in anti-doping programs, such as the ratio of +hemoglobin to reticulocytes (OFF-score), as well as example data.") + (license license:gpl2+))) -- cgit v1.2.3 From 6ffffb3c96779cdbec692e3d8e20281f258d660f Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Thu, 13 Sep 2018 17:55:31 +0200 Subject: hydra: Remove useless 'parameterize'. * build-aux/hydra/gnu-system.scm (manifests->packages): Remove 'parameterize'. --- build-aux/hydra/gnu-system.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 7234e2d0e8..d6b0132807 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -330,12 +330,11 @@ valid." (set-current-module (make-user-module '((guix profiles) (gnu)))) (primitive-load manifest)))) - (parameterize ((%graft? #f)) - (delete-duplicates! - (map manifest-entry-item - (append-map (compose manifest-entries - load-manifest) - manifests))))) + (delete-duplicates! + (map manifest-entry-item + (append-map (compose manifest-entries + load-manifest) + manifests)))) ;;; -- cgit v1.2.3 From 1dd153b3aabcc05e2ed3863ea0571985c0cae307 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 14 Sep 2018 09:15:16 +0200 Subject: gnu: Add python-hic2cool. * gnu/packages/bioinformatics.scm (python-hic2cool): New variable. --- gnu/packages/bioinformatics.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f6410c3ca4..67f24a6170 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13699,3 +13699,27 @@ are highly customizable. Currently, it is possible to plot: bigwig, bed (many options), bedgraph, links (represented as arcs), and Hi-C matrices. pyGenomeTracks can make plots with or without Hi-C data.") (license license:gpl3+))) + +(define-public python-hic2cool + (package + (name "python-hic2cool") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "hic2cool" version)) + (sha256 + (base32 + "0xy6mhfns2lzib1kcr6419jjp6pmh0qx8z8na55lmiwn0ds8q9cl")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; no tests included + (propagated-inputs + `(("python-cooler" ,python-cooler))) + (home-page "https://github.com/4dn-dcic/hic2cool") + (synopsis "Converter for .hic and .cool files") + (description + "This package provides a converter between @code{.hic} files (from +juicer) and single-resolution or multi-resolution @code{.cool} files (for +cooler). Both @code{hic} and @code{cool} files describe Hi-C contact +matrices.") + (license license:expat))) -- cgit v1.2.3 From daa6036fda502460f626b7beb0afa93a0bac6d01 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Thu, 13 Sep 2018 08:54:36 -0500 Subject: gnu: Add openblas-ilp64. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (openblas-ilp64): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/maths.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index af41093fbb..d3e72128ca 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2018 Nadya Voronova ;;; Copyright © 2018 Adam Massmann ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018 Eric Brown ;;; ;;; This file is part of GNU Guix. ;;; @@ -2873,6 +2874,18 @@ parts of it.") "OpenBLAS is a BLAS library forked from the GotoBLAS2-1.13 BSD version.") (license license:bsd-3))) +(define-public openblas-ilp64 + (package (inherit openblas) + (name "openblas-ilp64") + (supported-systems '("x86_64-linux" "aarch64-linux" "mips64el-linux")) + (arguments + (substitute-keyword-arguments (package-arguments openblas) + ((#:make-flags flags '()) + `(append (list "INTERFACE64=1" "LIBNAMESUFFIX=ilp64") + ,flags)))) + (synopsis "Optimized BLAS library based on GotoBLAS (ILP64 version)") + (license license:bsd-3))) + (define* (make-blis implementation #:optional substitutable?) "Return a BLIS package with the given IMPLEMENTATION (see config/ in the source tree for a list of implementations.) -- cgit v1.2.3 From 13512e1b8f63b4d8fcb188fac992aa390149fe65 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 14 Sep 2018 11:11:54 +0200 Subject: git-download: 'git-predicate' returns #f on Git errors. Fixes a regression introduced in aed0a594058a59bc3bb1d2686391dc0e8a181b1f whereby 'git-predicate' would throw to 'git-error instead of returning #f as the docstring says. * guix/git-download.scm (git-predicate): Return #f upon 'git-error'. --- guix/git-download.scm | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/guix/git-download.scm b/guix/git-download.scm index e6e0ec2ac5..24cf11be5e 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -179,24 +179,28 @@ are relative to DIRECTORY, which is not necessarily the root of the checkout." (define (git-predicate directory) "Return a predicate that returns true if a file is part of the Git checkout -living at DIRECTORY. Upon Git failure, return #f instead of a predicate. +living at DIRECTORY. If DIRECTORY does not lie within a Git checkout, and +upon Git errors, return #f instead of a predicate. The returned predicate takes two arguments FILE and STAT where FILE is an absolute file name and STAT is the result of 'lstat'." - (let* ((files (git-file-list directory)) - (inodes (fold (lambda (file result) - (let ((stat - (lstat (string-append directory "/" - file)))) - (vhash-consv (stat:ino stat) (stat:dev stat) - result))) - vlist-null - files))) - (lambda (file stat) - ;; Comparing file names is always tricky business so we rely on inode - ;; numbers instead. - (match (vhash-assv (stat:ino stat) inodes) - ((_ . dev) (= dev (stat:dev stat))) - (#f #f))))) + (catch 'git-error + (lambda () + (let* ((files (git-file-list directory)) + (inodes (fold (lambda (file result) + (let ((stat + (lstat (string-append directory "/" + file)))) + (vhash-consv (stat:ino stat) (stat:dev stat) + result))) + vlist-null + files))) + (lambda (file stat) + ;; Comparing file names is always tricky business so we rely on inode + ;; numbers instead. + (match (vhash-assv (stat:ino stat) inodes) + ((_ . dev) (= dev (stat:dev stat))) + (#f #f))))) + (const #f))) ;;; git-download.scm ends here -- cgit v1.2.3 From 7a20877a184b5a9794741cf49740b88d61e8a2a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 14 Sep 2018 14:57:47 +0200 Subject: gnu: python-llvmlite: Remove obsolete patch. * gnu/packages/llvm.scm (python-llvmlite)[inputs]: Remove patch that is obsolete since the upgrade to LLVM 6.0.1. --- gnu/packages/llvm.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index cd710bcb79..d0791d00cc 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -417,15 +417,7 @@ code analysis tools.") "twine_cfg_undefined_behavior.patch")) (sha256 (base32 - "07h71n2m1mn9zcfgw04zglffknplb233zqbcd6pckq0wygkrxflp"))) - (origin - (method url-fetch) - (uri (string-append "https://raw.githubusercontent.com/numba/" - "llvmlite/v" version "/conda-recipes/" - "0001-Transforms-Add-missing-header-for-InstructionCombini.patch")) - (sha256 - (base32 - "1pp0z9696l6j4dwz7ypjrm4vvkj0d3mlf1g8zmiyk08akw5lz0cb"))))))))))) + "07h71n2m1mn9zcfgw04zglffknplb233zqbcd6pckq0wygkrxflp"))))))))))) (home-page "http://llvmlite.pydata.org") (synopsis "Wrapper around basic LLVM functionality") (description -- cgit v1.2.3 From e830c9d0b0ff7622b8bb86348ee0c97a28e2f2d8 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 14 Sep 2018 21:31:24 +0200 Subject: gnu: Rename "banana-pi" to "bananapi". * gnu/bootloader/u-boot.scm (u-boot-banana-pi-m2-ultra-bootloader): Rename to... (u-boot-bananapi-m2-ultra-bootloader): ...this. * gnu/packages/bootloaders.scm (u-boot-banana-pi-m2-ultra): Rename to... (u-boot-bananapi-m2-ultra): ...this. * gnu/system/install.scm (banana-pi-m2-ultra-installation-os): Rename to... (bananapi-m2-ultra-installation-os): ...this. --- gnu/bootloader/u-boot.scm | 6 +++--- gnu/packages/bootloaders.scm | 2 +- gnu/system/install.scm | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm index 52b38dd1ab..0157fde3da 100644 --- a/gnu/bootloader/u-boot.scm +++ b/gnu/bootloader/u-boot.scm @@ -31,7 +31,7 @@ u-boot-a20-olinuxino-lime-bootloader u-boot-a20-olinuxino-lime2-bootloader u-boot-a20-olinuxino-micro-bootloader - u-boot-banana-pi-m2-ultra-bootloader + u-boot-bananapi-m2-ultra-bootloader u-boot-beaglebone-black-bootloader u-boot-mx6cuboxi-bootloader u-boot-nintendo-nes-classic-edition-bootloader @@ -148,10 +148,10 @@ (inherit u-boot-allwinner-bootloader) (package u-boot-a20-olinuxino-micro))) -(define u-boot-banana-pi-m2-ultra-bootloader +(define u-boot-bananapi-m2-ultra-bootloader (bootloader (inherit u-boot-allwinner-bootloader) - (package u-boot-banana-pi-m2-ultra))) + (package u-boot-bananapi-m2-ultra))) (define u-boot-mx6cuboxi-bootloader (bootloader diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index eee66b2c5f..0ba31d867d 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -570,7 +570,7 @@ board-independent tools."))) `(("firmware" ,arm-trusted-firmware-pine64-plus) ,@(package-native-inputs base)))))) -(define-public u-boot-banana-pi-m2-ultra +(define-public u-boot-bananapi-m2-ultra (make-u-boot-package "Bananapi_M2_Ultra" "arm-linux-gnueabihf")) (define-public u-boot-a20-olinuxino-lime diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 95661dc973..a648ddf95e 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -47,7 +47,7 @@ a20-olinuxino-lime-installation-os a20-olinuxino-lime2-emmc-installation-os a20-olinuxino-micro-installation-os - banana-pi-m2-ultra-installation-os + bananapi-m2-ultra-installation-os beaglebone-black-installation-os mx6cuboxi-installation-os nintendo-nes-classic-edition-installation-os @@ -448,8 +448,8 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." "/dev/mmcblk0" ; SD card storage "ttyS0")) -(define banana-pi-m2-ultra-installation-os - (embedded-installation-os u-boot-banana-pi-m2-ultra-bootloader +(define bananapi-m2-ultra-installation-os + (embedded-installation-os u-boot-bananapi-m2-ultra-bootloader "/dev/mmcblk1" ; eMMC storage "ttyS0")) -- cgit v1.2.3 From 9e9e5d5a269f32fab596c83451824a50dbc2b62d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 11 Sep 2018 16:40:48 -0400 Subject: gnu: OpenSSL 1.1: Update to 1.1.1. * gnu/packages/tls.scm (openssl-next): Update to 1.1.1. [arguments]: Patch a `/usr/bin/env` invocation in the 'config' script. Adjust the documentation output. * gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch: Rename and ... * gnu/packages/patches/openssl-1.1-c-rehash-in.patch: ... adjust patch. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 +- gnu/packages/patches/openssl-1.1-c-rehash-in.patch | 19 ++++++++++++++ .../patches/openssl-1.1.0-c-rehash-in.patch | 19 -------------- gnu/packages/tls.scm | 30 ++++++++++++++++++---- 4 files changed, 45 insertions(+), 25 deletions(-) create mode 100644 gnu/packages/patches/openssl-1.1-c-rehash-in.patch delete mode 100644 gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7b230cb6f5..d37a193adb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1011,7 +1011,7 @@ dist_patch_DATA = \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.0.2-CVE-2018-0495.patch \ %D%/packages/patches/openssl-1.0.2-CVE-2018-0732.patch \ - %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch \ + %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/osip-CVE-2017-7853.patch \ diff --git a/gnu/packages/patches/openssl-1.1-c-rehash-in.patch b/gnu/packages/patches/openssl-1.1-c-rehash-in.patch new file mode 100644 index 0000000000..c96493b584 --- /dev/null +++ b/gnu/packages/patches/openssl-1.1-c-rehash-in.patch @@ -0,0 +1,19 @@ +This patch removes the explicit reference to the 'perl' binary, +such that OpenSSL does not retain a reference to Perl. + +The 'c_rehash' program is seldom used, but it is used nonetheless +to create symbolic links to certificates, for instance in the 'nss-certs' +package. + +diff --git a/tools/c_rehash.in b/tools/c_rehash.in +index 421fd89208..93aca4e168 100644 +--- a/tools/c_rehash.in ++++ b/tools/c_rehash.in +@@ -1,4 +1,6 @@ +-#!{- $config{HASHBANGPERL} -} ++eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' ++ & eval 'exec perl -wS "$0" $argv:q' ++ if 0; + + # {- join("\n# ", @autowarntext) -} + # Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved. diff --git a/gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch b/gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch deleted file mode 100644 index e3a982b7a8..0000000000 --- a/gnu/packages/patches/openssl-1.1.0-c-rehash-in.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch removes the explicit reference to the 'perl' binary, -such that OpenSSL does not retain a reference to Perl. - -The 'c_rehash' program is seldom used, but it is used nonetheless -to create symbolic links to certificates, for instance in the 'nss-certs' -package. - -diff --git a/tools/c_rehash.in b/tools/c_rehash.in -index 2fef627..9d40eae 100644 ---- a/tools/c_rehash.in -+++ b/tools/c_rehash.in -@@ -1,4 +1,6 @@ --#!{- $config{hashbangperl} -} -+eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' -+ & eval 'exec perl -wS "$0" $argv:q' -+ if 0; - - # {- join("\n# ", @autowarntext) -} - # Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved. diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 5e49509ddd..f7de901385 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -410,7 +410,7 @@ required structures.") (package (inherit openssl) (name "openssl") - (version "1.1.0i") + (version "1.1.1") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -420,13 +420,13 @@ required structures.") (string-append "ftp://ftp.openssl.org/source/old/" (string-trim-right version char-set:letter) "/" name "-" version ".tar.gz"))) - (patches (search-patches "openssl-1.1.0-c-rehash-in.patch")) + (patches (search-patches "openssl-1.1-c-rehash-in.patch")) (sha256 (base32 - "16fgaf113p6s5ixw227sycvihh3zx6f6rf0hvjjhxk68m12cigzb")))) + "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8")))) (outputs '("out" - "doc" ; 1.3MiB of man3 pages - "static")) ; 5.5MiB of .a files + "doc" ; 6.7 MiB of man3 pages and full HTML documentation + "static")) ; 6.4 MiB of .a files (arguments (substitute-keyword-arguments (package-arguments openssl) ((#:phases phases) @@ -439,6 +439,11 @@ required structures.") (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib"))) + ;; It's not a shebang so patch-source-shebangs misses it. + (substitute* "config" + (("/usr/bin/env") + (string-append (assoc-ref %build-inputs "coreutils") + "/bin/env"))) (invoke "./config" "shared" ;build shared libraries "--libdir=lib" @@ -460,6 +465,21 @@ required structures.") '("-mfpu=vfpv3") '()))))) + (delete 'move-man3-pages) + (add-after 'install 'move-extra-documentation + (lambda* (#:key outputs #:allow-other-keys) + ;; Move man3 pages and full HTML documentation to "doc". + (let* ((out (assoc-ref outputs "out")) + (man3 (string-append out "/share/man/man3")) + (html (string-append out "/share/doc/openssl")) + (doc (assoc-ref outputs "doc")) + (man-target (string-append doc "/share/man/man3")) + (html-target (string-append doc "/share/doc/openssl"))) + (copy-recursively man3 man-target) + (delete-file-recursively man3) + (copy-recursively html html-target) + (delete-file-recursively html) + #t))) ;; XXX: Duplicate this phase to make sure 'version' evaluates ;; in the current scope and not the inherited one. (replace 'remove-miscellany -- cgit v1.2.3 From 1d7cc6841e6a997a38acb6421e0592ab5b4749df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 14 Sep 2018 03:32:47 +0200 Subject: gnu: coq: INVOKE. * gnu/packages/ocaml.scm (coq)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/ocaml.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f21c2b2610..9e73eab1ea 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -486,16 +486,16 @@ written in Objective Caml.") (let* ((out (assoc-ref outputs "out")) (mandir (string-append out "/share/man")) (browser "icecat -remote \"OpenURL(%s,new-tab)\"")) - (zero? (system* "./configure" - "-prefix" out - "-mandir" mandir - "-browser" browser - "-coqide" "opt"))))) + (invoke "./configure" + "-prefix" out + "-mandir" mandir + "-browser" browser + "-coqide" "opt")))) (replace 'build (lambda _ - (zero? (system* "make" "-j" (number->string - (parallel-job-count)) - "world")))) + (invoke "make" + "-j" (number->string (parallel-job-count)) + "world"))) (delete 'check) (add-after 'install 'check (lambda _ @@ -505,7 +505,7 @@ written in Objective Caml.") (delete-file-recursively "coq-makefile/timing") ;; This one fails because we didn't build coqtop.byte. (delete-file-recursively "coq-makefile/findlib-package") - (zero? (system* "make")))))))) + (invoke "make"))))))) (home-page "https://coq.inria.fr") (synopsis "Proof assistant for higher-order logic") (description -- cgit v1.2.3 From ed017a78beabb29a520be977b7e3f0bc07ae0e91 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 14 Sep 2018 20:34:29 +0200 Subject: gnu: coq: Update to 8.8.1. * gnu/packages/ocaml.scm (coq): Update to 8.8.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9e73eab1ea..bcbcbb1404 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -457,7 +457,7 @@ written in Objective Caml.") (define-public coq (package (name "coq") - (version "8.8.0") + (version "8.8.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/coq/coq/archive/V" @@ -465,7 +465,7 @@ written in Objective Caml.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0g96k2x6lbddlmkmdaczvcpb2gwqi1ydbq9bv4gf9q38kv9w3xya")))) + "13cyvbg8cgqkg9wz0ax7jq03srj9k0lyvny97fcka4ai1zrzwln8")))) (native-search-paths (list (search-path-specification (variable "COQPATH") -- cgit v1.2.3 From 56f3b85bd3fc4c8e4a1ceb399d2f376bf4d2043b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 14 Sep 2018 00:01:49 +0200 Subject: gnu: python-iso8601: Update to 0.1.12. * gnu/packages/time.scm (python-iso8601): Update to 0.1.12. --- 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 fc831ab6cc..69aff5efaa 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -240,14 +240,14 @@ ISO 8601 dates, time and duration.") (define-public python-iso8601 (package (name "python-iso8601") - (version "0.1.11") + (version "0.1.12") (source (origin (method url-fetch) (uri (pypi-uri "iso8601" version)) (sha256 (base32 - "0c7gh3lsdjds262h0v1sqc66l7hqgfwbakn96qrhdbl0i3vm5yz8")))) + "10nyvvnrhw2w3p09v1ica4lgj6f4g9j3kkfx17qmraiq3w7b5i29")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From c924fe38dc39cd195e21878800011e56765e8960 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 13 Sep 2018 19:26:13 +0200 Subject: gnu: umoci: Update to 0.4.2. * gnu/packages/virtualization.scm (umoci): Update to 0.4.2. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 7427465f57..e3b9925059 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -873,7 +873,7 @@ Open Container Initiative specification.") (define-public umoci (package (name "umoci") - (version "0.4.0") + (version "0.4.2") (source (origin (method url-fetch) (uri (string-append @@ -882,7 +882,7 @@ Open Container Initiative specification.") (file-name (string-append "umoci-" version ".tar.xz")) (sha256 (base32 - "0hg7hs4dagj2fgymm4b4s68k1v2k2093s3jg0d94j0ixhfmyg9nd")))) + "1rq5jxcss9cmy05x9b2kh9ld57ribi8hgnx2w67jpmf343b83m4q")))) (build-system go-build-system) (arguments '(#:import-path "github.com/openSUSE/umoci" -- cgit v1.2.3 From 002d73a01fa5c39930471b81bb8938ab22bf7d93 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 02:38:15 +0200 Subject: gnu: libwps: Update to 0.4.10. * gnu/packages/libreoffice.scm (libwps): Update to 0.4.10. --- gnu/packages/libreoffice.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index cf8082bcaa..90be51cd59 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -695,19 +695,19 @@ from the old StarOffice (.sdc, .sdw, ...).") (define-public libwps (package (name "libwps") - (version "0.4.9") + (version "0.4.10") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "08j9nxnrzxsnq35d9l824ad8w8az42fivaxn8ajl85dv6g3v1ghk")))) + "1ji9zd4wxmas03g8jyx0ih0amrqfazm5874a2v9rd7va50sf088l")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) - (propagated-inputs ; in Requires field of .pkg + (propagated-inputs ; in Requires field of .pkg `(("librevenge" ,librevenge))) (inputs `(("boost" ,boost) @@ -716,7 +716,7 @@ from the old StarOffice (.sdc, .sdw, ...).") (synopsis "Import library for Microsoft Works text documents") (description "Libwps is a library for importing files in the Microsoft Works word processor file format.") - (license (list mpl2.0 lgpl2.1+)))) ; dual license + (license (list mpl2.0 lgpl2.1+)))) ; dual license (define-public libzmf (package -- cgit v1.2.3 From 49c941b43b64c8d53cd73b0d7200309cffebcdaa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 02:53:40 +0200 Subject: gnu: libmwaw: Update to 0.3.14. * gnu/packages/libreoffice.scm (libmwaw): Update to 0.3.14. --- gnu/packages/libreoffice.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 90be51cd59..35d49b0216 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -645,19 +645,19 @@ text documents, vector drawings, presentations and spreadsheets.") (define-public libmwaw (package (name "libmwaw") - (version "0.3.12") + (version "0.3.14") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1ryi1v38lgy5kv84fzjqkawidrg30y4hlqrz1v262792wzkad4bn")))) + "1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) - (propagated-inputs ; in Requires field of .pkg + (propagated-inputs ; in Requires field of .pkg `(("librevenge" ,librevenge))) (inputs `(("boost" ,boost) @@ -667,7 +667,7 @@ text documents, vector drawings, presentations and spreadsheets.") (description "Libmwaw contains some import filters for old Macintosh text documents (MacWrite, ClarisWorks, ... ) and for some graphics and spreadsheet documents.") - (license (list mpl2.0 lgpl2.1+)))) ; dual license + (license (list mpl2.0 lgpl2.1+)))) ; dual license (define-public libstaroffice (package -- cgit v1.2.3 From e1bf455cee4e45c8e420e5c011aa67f877b61aad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 00:27:31 +0200 Subject: gnu: emacs-magit-popup: Update to 2.12.4. * gnu/packages/emacs.scm (emacs-magit-popup): Update to 2.12.4. --- 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 770ca3c496..8d9ce8b136 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -579,7 +579,7 @@ support for Git-SVN.") (define-public emacs-magit-popup (package (name "emacs-magit-popup") - (version "2.12.3") + (version "2.12.4") (source (origin (method url-fetch) (uri (string-append @@ -588,7 +588,7 @@ support for Git-SVN.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1kz6vj67awkwf9y2wj6m3l2him3znm08z6bkdvnmfr6rwd96dr39")))) + "0pkg95ssdp4biznmgc2bvf74y4ihws8902zz5437zsfhb8p6f3kb")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From f9fe94c1f664141fbff85411e0f03dbbbc5c77a3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 00:31:07 +0200 Subject: gnu: emacs-magit-popup: Don't use unstable tarball. * gnu/packages/emacs.scm (emacs-magit-popup)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/emacs.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 8d9ce8b136..a799aa9899 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -581,14 +581,14 @@ support for Git-SVN.") (name "emacs-magit-popup") (version "2.12.4") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/magit/magit-popup/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/magit-popup.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0pkg95ssdp4biznmgc2bvf74y4ihws8902zz5437zsfhb8p6f3kb")))) + "08952nzn0cb6gxscqyiljk4fq2zxjvr3ism0lvgw0gs9hl5phiwx")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From aae96f8fac4a9302b4adb2f80bd205a76b843b6c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 03:05:01 +0200 Subject: gnu: libetpan: Don't use unstable tarball. * gnu/packages/mail.scm (libetpan)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/mail.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 024e75aaa1..38e2158cdc 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -949,12 +949,13 @@ useful features.") (name "libetpan") (version "1.8") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dinhviethoa/" name - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dinhviethoa/libetpan.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1sxnaglp5hb0z78sgnfzva4x8m4flqhicvm1dz0krkxdmfsafrsf")))) + (base32 "09xqy1n18qn63x7idfrpwm59lfkvb1p5vxkyksywvy4f6mn4pyxk")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) -- cgit v1.2.3 From 9f1b186afc5ce328cef90fa1d221a68d559b38fd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 03:31:41 +0200 Subject: gnu: libetpan: Update to 1.9.1. * gnu/packages/mail.scm (libetpan): Update to 1.9.1. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 38e2158cdc..304d1d6444 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -947,7 +947,7 @@ useful features.") (define-public libetpan (package (name "libetpan") - (version "1.8") + (version "1.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -955,7 +955,7 @@ useful features.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "09xqy1n18qn63x7idfrpwm59lfkvb1p5vxkyksywvy4f6mn4pyxk")))) + (base32 "1628lb1qvxixl64ifvjjr839hmirpx532klhv2mr7m6gmn7nlci5")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) -- cgit v1.2.3 From bbe2a947995879ac0580463a420050f3b429425e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 00:19:56 +0200 Subject: gnu: libsigrokdecode: Update to 0.5.2. * gnu/packages/electronics.scm (libsigrokdecode): Update to 0.5.2. --- gnu/packages/electronics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index af3ebeb805..d13f220b84 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -60,7 +60,7 @@ to take care of the OS-specific details when writing software that uses serial p (define-public libsigrokdecode (package (name "libsigrokdecode") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (string-append @@ -68,7 +68,7 @@ to take care of the OS-specific details when writing software that uses serial p version ".tar.gz")) (sha256 (base32 - "07mmb6s62ncqqgsc6szilj2yxixf6gg99ggbzsjlbhp4b9aqnga9")))) + "1w434nl1syjkvwl08lji3r9sr60lbxp1nqys8hqwzv2lgiwrx3g0")))) (outputs '("out" "doc")) (arguments `(#:phases -- cgit v1.2.3 From 25bc6370a47a3c3dfe5f752d3ee3141dac6bb750 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 21:42:09 +0200 Subject: gnu: snakemake: Update to 5.2.4. * gnu/packages/python.scm (snakemake): Update to 5.2.4. [propagated-inputs]: Add python-gitpython. --- gnu/packages/python.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 525ff3f027..b6dd3ebace 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5217,13 +5217,13 @@ Python.") (define-public snakemake (package (name "snakemake") - (version "5.2.2") + (version "5.2.4") (source (origin (method url-fetch) (uri (pypi-uri "snakemake" version)) (sha256 - (base32 "18x36n78ph5v1fxk54gvdbc3d8nfncha78phifg3lqaa9gifgzxd")))) + (base32 "0gj0xxgiq3mp9qyyrbfzldiaq1giliqw0in64nqiz7vx49myqj7z")))) (build-system python-build-system) (arguments ;; TODO: Package missing test dependencies. @@ -5241,7 +5241,8 @@ Python.") "/bin/snakemake"))) #t))))) (propagated-inputs - `(("python-wrapt" ,python-wrapt) + `(("python-gitpython" ,python-gitpython) + ("python-wrapt" ,python-wrapt) ("python-requests" ,python-requests) ("python-appdirs" ,python-appdirs) ("python-configargparse" ,python-configargparse) -- cgit v1.2.3 From 61853b74473f0d191f1bcb43fcfcc1418093ac86 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 2 Sep 2018 17:49:51 -0400 Subject: gnu: libjpeg: Improve description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image.scm (libjpeg)[description]: Add the list of the programs it provides. Signed-off-by: 宋文武 --- gnu/packages/image.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 78fb30c279..24a83dd683 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -267,8 +267,16 @@ files. It can compress them as much as 40% losslessly.") "Libjpeg implements JPEG image encoding, decoding, and transcoding. JPEG is a standardized compression method for full-color and gray-scale images. -The included programs provide conversion between the JPEG format and -image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats.") +It also includes programs that provide conversion between the JPEG format and +image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats, as well as +lossless JPEG manipulations such as rotation, scaling or cropping: +@enumerate +@item cjpeg +@item djpeg +@item jpegtran +@item rdjpgcom +@item wrjpgcom +@end enumerate") (license license:ijg) (home-page "http://www.ijg.org/"))) -- cgit v1.2.3 From 5c34d97187f8378249bf6a340ccde9e721a5a22d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 04:58:14 +0200 Subject: gnu: pybind11: Don't use unstable tarball. * gnu/packages/python.scm (pybind11)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/python.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b6dd3ebace..afb329654a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13784,14 +13784,14 @@ under Python 2.7.") (name "pybind11") (version "2.2.3") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/pybind/pybind11/archive/v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pybind/pybind11.git") + (commit (string-append "v" version)))) (sha256 (base32 - "1sj0x4fwsbnwdai5sxpw1l1vh8m5hpbkfk3zanxcbcgs39jpnfrs")) - (file-name (string-append name "-" version ".tar.gz")))) + "111aagiy7lwf3gzf2hzg7sbgs2lxgj473bf75bqqfmhcbvf71vsq")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs `(("python" ,python) -- cgit v1.2.3 From 33198171746558d0c956103f73a78d3ae3d676cf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 05:07:14 +0200 Subject: gnu: pybind11: Update to 2.2.4. * gnu/packages/python.scm (pybind11): Update to 2.2.4. --- 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 afb329654a..7a4f11b4b8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13782,7 +13782,7 @@ under Python 2.7.") (define-public pybind11 (package (name "pybind11") - (version "2.2.3") + (version "2.2.4") (source (origin (method git-fetch) (uri (git-reference @@ -13790,7 +13790,7 @@ under Python 2.7.") (commit (string-append "v" version)))) (sha256 (base32 - "111aagiy7lwf3gzf2hzg7sbgs2lxgj473bf75bqqfmhcbvf71vsq")) + "0pa79ymcasv8br5ifbx7878id5py2jpjac3i20cqxr6gs9l6ivlv")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs -- cgit v1.2.3 From 483be9bda6898ab2eee1d69d58ddea42054bc5fe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 04:45:45 +0200 Subject: gnu: ocaml-ounit: Update to 2.0.8. * gnu/packages/ocaml.scm (ocaml-ounit): Update to 2.0.8. --- gnu/packages/ocaml.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bcbcbb1404..7859696406 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -924,21 +924,20 @@ compilers that can directly deal with packages.") (define-public ocaml-ounit (package (name "ocaml-ounit") - (version "2.0.0") + (version "2.0.8") (source (origin (method url-fetch) - (uri (ocaml-forge-uri "ounit" version 1258)) + (uri (ocaml-forge-uri "ounit" version 1749)) (sha256 (base32 - "118xsadrx84pif9vaq13hv4yh22w9kmr0ypvhrs0viir1jr0ajjd")))) + "03ifp9hjcxg4m5j190iy373jcn4039d3vy10kmd8p4lfciwzwc1f")))) (build-system ocaml-build-system) (native-inputs - `(("libxml2" ,libxml2))) ; for xmllint + `(("libxml2" ,libxml2))) ; for xmllint (arguments `(#:phases (modify-phases %standard-phases - ;; Tests are done during build. - (delete 'check)))) + (delete 'check)))) ; tests are run during build (home-page "http://ounit.forge.ocamlcore.org") (synopsis "Unit testing framework for OCaml") (description "Unit testing framework for OCaml. It is similar to JUnit and -- cgit v1.2.3 From 81fb037f5ab51858fb7608d9ff836cf28c993f11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 03:33:20 +0200 Subject: gnu: libetpan: Use HTTPS home page. * gnu/packages/mail.scm (libetpan)[home-page]: Use HTTPS. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 304d1d6444..5435f89c42 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -979,7 +979,7 @@ useful features.") (invoke "sh" "autogen.sh")))) #:configure-flags '("--disable-static" "--disable-db"))) - (home-page "http://www.etpan.org/libetpan.html") + (home-page "https://www.etpan.org/libetpan.html") (synopsis "Portable middleware for email access") (description "The purpose of this mail library is to provide a portable, efficient -- cgit v1.2.3 From 021b42f5e7fd222299691e5d7f70e329b52c9b14 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 05:14:24 +0200 Subject: gnu: zsh: Update to 5.6.2. * gnu/packages/shells.scm (zsh): Update to 5.6.2. --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index c0f1c479ef..406766351c 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -292,7 +292,7 @@ history mechanism, job control and a C-like syntax.") (define-public zsh (package (name "zsh") - (version "5.6.1") + (version "5.6.2") (source (origin (method url-fetch) (uri (list (string-append @@ -303,7 +303,7 @@ history mechanism, job control and a C-like syntax.") ".tar.xz"))) (sha256 (base32 - "1s5kzfbfvixibb1sbzmmlrrx898zqwi5cfmnnq4bhcbx64zparlm")))) + "17iffliqcj4hv91g0bd2sxsyfcz51mfyh97sp2iyrs2p0mndc2x5")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") #:phases -- cgit v1.2.3 From 935d5ceb9bf6f8a759298521da2712db1ec12670 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 29 Aug 2018 00:53:34 -0400 Subject: gnu: Add python-pycountry. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-pycountry, python2-pycountry): New variables. Signed-off-by: 宋文武 --- gnu/packages/python.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7a4f11b4b8..a5da46dfdb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10858,6 +10858,37 @@ cases.") (define-public python2-ddt (package-with-python2 python-ddt)) +(define-public python-pycountry + (package + (name "python-pycountry") + (version "18.5.26") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pycountry" version)) + (sha256 + (base32 + "15q9j047s3yc9cfcxq1ch8b71f81na44cr6dydd5gxk0ki9a4akz")))) + (build-system python-build-system) + (home-page "https://bitbucket.org/flyingcircus/pycountry") + (synopsis "ISO databases for languages, countries, currencies, etc.") + (description + "@code{pycountry} provides the ISO databases for the standards: +@enumerate +@item 639-3 (Languages) +@item 3166 (Countries) +@item 3166-3 (Deleted Countries) +@item 3166-2 (Subdivisions of countries) +@item 4217 (Currencies) +@item 15924 (Scripts) +@end enumerate +It includes a copy from Debian’s pkg-isocodes and makes the data accessible +through a Python API.") + (license license:lgpl2.1+))) + +(define-public python2-pycountry + (package-with-python2 python-pycountry)) + (define-public python-pycosat (package (name "python-pycosat") -- cgit v1.2.3 From 2ee67781ff3246c32e4dcdfb3a9adc65967b33dd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 29 Aug 2018 01:27:04 -0400 Subject: gnu: Add python-ua-parser. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-ua-parser, python2-ua-parser): New variables. Signed-off-by: 宋文武 --- gnu/packages/python.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a5da46dfdb..3c8b68ee1e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5006,6 +5006,31 @@ toolkit. Use it to build trees of widgets.") (define-public python2-urwidtrees (package-with-python2 python-urwidtrees)) +(define-public python-ua-parser + (package + (name "python-ua-parser") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ua-parser" version)) + (sha256 + (base32 + "1jwdf58rhchjzzrad405pviv0iq24xa2xmmmdgcm2c8s6b4wzfwp")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;no test suite in release + (native-inputs + `(("python-pyyaml" ,python-pyyaml))) + (home-page "https://github.com/ua-parser/uap-python") + (synopsis "User agent parser") + (description + "@code{ua-parser} is a Python port of Browserscope's user agent parser.") + (license license:asl2.0))) + +(define-public python2-ua-parser + (package-with-python2 python-ua-parser)) + (define-public python-dbus (package (name "python-dbus") -- cgit v1.2.3 From 511f3be695bb4a3c83218e3fea273063da378051 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 29 Aug 2018 09:16:30 -0400 Subject: gnu: Add python-user-agents. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-user-agents, python2-user-agents): New variables. Signed-off-by: 宋文武 --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3c8b68ee1e..30b65f637b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5031,6 +5031,32 @@ toolkit. Use it to build trees of widgets.") (define-public python2-ua-parser (package-with-python2 python-ua-parser)) +(define-public python-user-agents + (package + (name "python-user-agents") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "user-agents" version)) + (sha256 + (base32 + "0fc00cd3j8dahq1zzn8pkgfgd7lq37bp2scmdma2n1c049vicgb4")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;missing devices.json test file in release + (propagated-inputs + `(("python-ua-parser" ,python-ua-parser))) + (home-page "https://github.com/selwin/python-user-agents") + (synopsis "User Agent strings parsing library") + (description + "A library to identify devices (phones, tablets) and their capabilities by +parsing (browser/HTTP) user agent strings.") + (license license:expat))) + +(define-public python2-user-agents + (package-with-python2 python-user-agents)) + (define-public python-dbus (package (name "python-dbus") -- cgit v1.2.3 From 4e9832dd3865978a3d70f4e596e45e7d3398204d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 06:13:42 +0200 Subject: gnu: gambit-c: Update home page. * gnu/packages/scheme.scm (gambit-c)[home-page]: Update. --- gnu/packages/scheme.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 2e46a8453f..7f26d71aa6 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -560,7 +560,7 @@ of libraries.") ;; interaction channel to stdin/stdout. (("gsi -:tl") "gsi -:d-,tl")) #t))))) - (home-page "http://www.iro.umontreal.ca/~gambit/") + (home-page "http://gambitscheme.org") (synopsis "Efficient Scheme interpreter and compiler") (description "Gambit consists of two main programs: gsi, the Gambit Scheme -- cgit v1.2.3 From 4be83af4276328e04ab3c8a3c22ee8242adbbe71 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 06:14:29 +0200 Subject: gnu: gambit-c: Update to 4.9.0. The tests makefile still contains the offending lines, but I was unable to reproduce the failure across 3 different machines. * gnu/packages/scheme.scm (gambit-c): Update to 4.9.0. [arguments]: Remove 'fix-tests' phase. --- gnu/packages/scheme.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 7f26d71aa6..9654fe36f5 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -532,7 +532,7 @@ of libraries.") (define-public gambit-c (package (name "gambit-c") - (version "4.8.9") + (version "4.9.0") (source (origin (method url-fetch) @@ -542,24 +542,13 @@ of libraries.") (string-map (lambda (c) (if (char=? c #\.) #\_ c)) version) ".tgz")) (sha256 - (base32 "16sg1s8myzxqpimj5ry6lfza0qfs157zj28bvmxwwgy89jd9m5v7")))) + (base32 "19862w9ij0g5xrkskl4g89xbs17gp9cc6cfcdca6dlfkb3lk6xhp")))) (build-system gnu-build-system) (arguments '(#:configure-flags ;; According to the ./configure script, this makes the build slower and ;; use >= 1 GB memory, but makes Gambit much faster. - '("--enable-single-host") - #:phases - (modify-phases %standard-phases - (add-before 'check 'fix-tests - (lambda _ - (substitute* '("tests/makefile") - ;; '-:' is how run-time options are set. 'tl' sets some terminal - ;; option, which makes it fail in our build environment. It - ;; recommends using 'd-' as a solution, which sets the REPL - ;; interaction channel to stdin/stdout. - (("gsi -:tl") "gsi -:d-,tl")) - #t))))) + '("--enable-single-host"))) (home-page "http://gambitscheme.org") (synopsis "Efficient Scheme interpreter and compiler") (description -- cgit v1.2.3 From 85a349787b26e91dc7839c2748cdf71637821bcc Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 15 Sep 2018 14:23:06 +0200 Subject: gnu: wine: Update to 3.0.3. * gnu/packages/wine.scm (wine): Update to 3.0.3. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index b818a3ccb5..ac3295c42b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -71,7 +71,7 @@ (define-public wine (package (name "wine") - (version "3.0.2") + (version "3.0.3") (source (origin (method url-fetch) (uri (string-append "https://dl.winehq.org/wine/source/" @@ -79,7 +79,7 @@ "/wine-" version ".tar.xz")) (sha256 (base32 - "1zv3nk31s758ghp4795ym3w8l5868c2dllmjx9245qh9ahvp3mya")))) + "18add8wqqz7y1aj8x0dcba7pqj9jkbhngwjv4yjmar3gxacmjr7b")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) -- cgit v1.2.3 From b947c614df00fbc5aac6f04ac55fb1abf48eed67 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 15 Sep 2018 14:23:50 +0200 Subject: gnu: wine-staging-patchset-data: Update to 3.16. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 3.16. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index ac3295c42b..bf702a5f16 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -225,7 +225,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "3.15") + (version "3.16") (source (origin (method git-fetch) @@ -235,7 +235,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "1rgbx4qnxaarkq5n8nvj57q0rhxcqbwm5897ws962fgxh6zymg9n")))) + "0c1bs9qpxlvld6jkwjri2v8jaixxn1r5b0m9r5hnkfrnpl7z7cfv")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) -- cgit v1.2.3 From e8079dd9e413075b63dd5b35a39647303ca5e83b Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sat, 15 Sep 2018 14:24:24 +0200 Subject: gnu: wine-staging: Update to 3.16. * gnu/packages/wine.scm (wine-staging): Update to 3.16. --- gnu/packages/wine.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index bf702a5f16..782776606d 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -281,7 +281,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "07mmd8r70ciqrxzdg2m2mg34kcnb43dk9nw1ljm8jbcznsawv8ic")))) + "0g55l41apiwgblfk9ihzd96003gd32w5ng79f96hmiwhyzwbqhxd")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("gtk+" ,gtk+) ("libva" ,libva) -- cgit v1.2.3 From 636579210f8098c86cc790837c459295f482cc38 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 15 Sep 2018 21:04:44 +0200 Subject: gnu: php: Update to 7.2.10. * gnu/packages/php.scm (php): Update to 7.2.10. --- gnu/packages/php.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 4981c60554..c78902c97c 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -63,7 +63,7 @@ (define-public php (package (name "php") - (version "7.2.8") + (version "7.2.10") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -71,7 +71,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "03zv1y8ygzsir60617hinpji3f4irk79zbp3ar1b8zcapq40gfjk")) + "1w0432i5wjga9z8x3rhc72h2ij1jd2aimg5xmhc0hg4f7951bhh1")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -237,6 +237,7 @@ ;; but with different error messages. ;; Expects "illegal character", instead gets "unknown error (84)". "ext/iconv/tests/bug52211.phpt" + "ext/iconv/tests/bug60494.phpt" ;; Expects "wrong charset", gets unknown error (22). "ext/iconv/tests/iconv_mime_decode_variation3.phpt" "ext/iconv/tests/iconv_strlen_error2.phpt" -- cgit v1.2.3 From cbb1b1686596d8d708293fe421ac02adde06060e Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Sat, 15 Sep 2018 11:03:31 +0200 Subject: admin: python-pyudev: Add dependency on python-six. * gnu/packages/admin.scm (python-pyudev): Add dependency on python-six. --- gnu/packages/admin.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c6e1044b2b..6949f60197 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2779,6 +2779,8 @@ support forum. It runs with the @code{/exec} command in most IRC clients.") #t)))))) (inputs `(("eudev" ,eudev))) + (propagated-inputs + `(("python-six" ,python-six))) (native-inputs `(("python-docutils" ,python-docutils) ("python-hypothesis" ,python-hypothesis) -- cgit v1.2.3 From 2db0f9c82d1fe71adc46e03e0d9886291e1a7c05 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Mon, 5 Feb 2018 11:40:59 +0100 Subject: gnu: Add ruby-yajl-ruby. * gnu/packages/ruby.scm (ruby-yajl-ruby): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ruby.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 616b86934d..7184c8a9cd 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3658,6 +3658,42 @@ features such as filtering and fine grained logging.") (home-page "https://github.com/pjotrp/bioruby-logger-plugin") (license license:expat))) +(define-public ruby-yajl-ruby + (package + (name "ruby-yajl-ruby") + (version "1.4.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "yajl-ruby" version)) + (sha256 + (base32 + "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "spec" + #:phases + (modify-phases %standard-phases + (add-before 'check 'patch-test-to-update-load-path + (lambda _ + (substitute* "spec/parsing/large_number_spec.rb" + (("require \"yajl\"") + "$LOAD_PATH << 'lib'; require 'yajl'")) + #t))))) + (native-inputs + `(("ruby-rake-compiler" ,ruby-rake-compiler) + ("ruby-rspec" ,ruby-rspec))) + (synopsis "Streaming JSON parsing and encoding library for Ruby") + (description + "Ruby C bindings to the Yajl JSON stream-based parser library. The API +is compatible with the JSON gem, so yajl-ruby can act as a drop in +replacement. + +A modified copy of yajl is used, and included in the package.") + (home-page "https://github.com/brianmario/yajl-ruby") + (license (list license:expat ; Ruby code, yajl_ext.c and yajl_ext.h + license:bsd-3)))) ; Included, modified copy of yajl + (define-public ruby-yard (package (name "ruby-yard") -- cgit v1.2.3 From ed4b6b1840f104aa7f1c57506d34764978492a98 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Mon, 5 Feb 2018 11:40:49 +0100 Subject: gnu: Add ruby-oj. * gnu/packages/ruby.scm (ruby-oj): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ruby.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 7184c8a9cd..0b68844985 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3193,6 +3193,43 @@ unacceptable HTML and/or CSS from a string.") (home-page "https://github.com/rgrove/sanitize/") (license license:expat))) +(define-public ruby-oj + (package + (name "ruby-oj") + (version "3.6.7") + (source + (origin + (method url-fetch) + ;; Version on rubygems.org does not contain Rakefile, so download from + ;; GitHub instead. + (uri (string-append "https://github.com/ohler55/oj/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1x28ga72jxlnmsd8g8c0fw81vlh54r0qgagw2lxsd3x3la091g2h")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "test_all" + #:phases + (modify-phases %standard-phases + (add-before 'check 'disable-bundler + (lambda _ + (substitute* "Rakefile" + (("Bundler\\.with_clean_env") "1.times") + (("bundle exec ") ""))))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-rake-compiler" ,ruby-rake-compiler))) + (synopsis "JSON parser for Ruby optimized for speed") + (description + "Oj is a JSON parser and generator for Ruby, where the encoding and +decoding of JSON is implemented as a C extension to Ruby.") + (home-page "http://www.ohler.com/oj") + (license (list license:expat ; Ruby code + license:bsd-3)))) ; extension code + (define-public ruby-ox (package (name "ruby-ox") -- cgit v1.2.3 From 1b6f5475a1e05797f096aca038f2a14b9feb5707 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Mon, 5 Feb 2018 11:40:40 +0100 Subject: gnu: Enable tests for ruby-multi-json. * gnu/packages/ruby.scm (ruby-multi-json)[version]: Update to 1.13.1. [source]: Switch to GitHub, so that the tests can be run. [arguments]: Enable running the tests, and add a patch to fix an issue running the tests. [native-inputs]: Add native-inputs required for running the tests. [home-page]: Use HTTPS. Signed-off-by: Christopher Baines --- gnu/packages/ruby.scm | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 0b68844985..b7bf6ca736 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2289,23 +2289,40 @@ net/http library.") (define-public ruby-multi-json (package (name "ruby-multi-json") - (version "1.12.2") + (version "1.13.1") (source (origin (method url-fetch) - (uri (rubygems-uri "multi_json" version)) + ;; Tests are not distributed at rubygems.org so download from GitHub + ;; instead. + (uri (string-append "https://github.com/intridea/multi_json/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x")))) + "1s64xqvrnrxmb59v6b2kchnisawg5ai9ky1w60dy6z6ws9la1xv4")))) (build-system ruby-build-system) (arguments - '(#:tests? #f)) ;; No testsuite included in the gem. + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-signing-key-reference + (lambda _ + (substitute* "multi_json.gemspec" + ((".*spec.signing_key.*") "")) + #t))))) + (native-inputs + `(("bundler" ,bundler) + ("ruby-rspec" ,ruby-rspec) + ("ruby-yard" ,ruby-yard) + ("ruby-json-pure" ,ruby-json-pure) + ("ruby-oj" ,ruby-oj) + ("ruby-yajl-ruby" ,ruby-yajl-ruby))) (synopsis "Common interface to multiple JSON libraries for Ruby") (description "This package provides a common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.") - (home-page "http://github.com/intridea/multi_json") + (home-page "https://github.com/intridea/multi_json") (license license:expat))) (define-public ruby-arel -- cgit v1.2.3 From 5edef88b8873ad73ceb74c8801487fc16d64965c Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Mon, 5 Feb 2018 11:40:29 +0100 Subject: gnu: Add ruby-multi-test. * gnu/packages/ruby.scm (ruby-multi-test): New variable. Signed-off-by: Christopher Baines --- gnu/packages/ruby.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b7bf6ca736..76e3cee81e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2325,6 +2325,32 @@ NSJSONSerialization, gson.rb, JrJackson, and OkJson.") (home-page "https://github.com/intridea/multi_json") (license license:expat))) +(define-public ruby-multi-test + (package + (name "ruby-multi-test") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "multi_test" version)) + (sha256 + (base32 + "1sx356q81plr67hg16jfwz9hcqvnk03bd9n75pmdw8pfxjfy1yxd")))) + (build-system ruby-build-system) + (arguments + '(;; Tests require different sets of specific gem versions to be available, + ;; and there is no gemfile that specifies the newest versions of + ;; dependencies to be tested. + #:tests? #f)) + (synopsis + "Interface to testing libraries loaded into a running Ruby process") + (description + "@code{multi_test} provides a uniform interface onto whatever testing +libraries that have been loaded into a running Ruby process to help control +rogue test/unit/autorun requires.") + (home-page "https://github.com/cucumber/multi_test") + (license license:expat))) + (define-public ruby-arel (package (name "ruby-arel") -- cgit v1.2.3 From ebbfc59c21d9888d43f36d8f23862030ebaaacce Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 16 Sep 2018 21:38:23 +0200 Subject: graph: Add '--system'. * guix/scripts/graph.scm (%options, show-help): Add '--system'. (%default-options): Add 'system'. (guix-graph): Pass #:system to 'run-with-store'. --- doc/guix.texi | 7 +++++++ guix/scripts/graph.scm | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index cccf166d03..9a19eb89cd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7711,6 +7711,13 @@ This is useful to precisely refer to a package, as in this example: @example guix graph -e '(@@@@ (gnu packages commencement) gnu-make-final)' @end example + +@item --system=@var{system} +@itemx -s @var{system} +Display the graph for @var{system}---e.g., @code{i686-linux}. + +The package dependency graph is largely architecture-independent, but there +are some architecture-dependent bits that this option allows you to visualize. @end table diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm index 346ca4ea88..145a574dba 100644 --- a/guix/scripts/graph.scm +++ b/guix/scripts/graph.scm @@ -439,6 +439,10 @@ package modules, while attempting to retain user package modules." (option '(#\e "expression") #t #f (lambda (opt name arg result) (alist-cons 'expression arg result))) + (option '(#\s "system") #t #f + (lambda (opt name arg result) + (alist-cons 'system arg + (alist-delete 'system result eq?)))) (option '(#\h "help") #f #f (lambda args (show-help) @@ -462,6 +466,8 @@ Emit a representation of the dependency graph of PACKAGE...\n")) --list-types list the available graph types")) (display (G_ " -e, --expression=EXPR consider the package EXPR evaluates to")) + (display (G_ " + -s, --system=SYSTEM consider the graph for SYSTEM--e.g., \"i686-linux\"")) (newline) (display (G_ " -h, --help display this help and exit")) @@ -472,7 +478,8 @@ Emit a representation of the dependency graph of PACKAGE...\n")) (define %default-options `((node-type . ,%package-node-type) - (backend . ,%graphviz-backend))) + (backend . ,%graphviz-backend) + (system . ,(%current-system)))) ;;; @@ -508,7 +515,8 @@ Emit a representation of the dependency graph of PACKAGE...\n")) (export-graph (concatenate nodes) (current-output-port) #:node-type type - #:backend backend))))))) + #:backend backend)) + #:system (assq-ref opts 'system)))))) #t) ;;; graph.scm ends here -- cgit v1.2.3 From 3c0e16391ed9a3e3e4611b940fb393c5f2ecea63 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 16 Sep 2018 21:58:19 +0200 Subject: channels: Add Guile-Git as a dependency of external channels. Fixes a regression introduced in aed0a594058a59bc3bb1d2686391dc0e8a181b1f whereby external channels would fail to build due to the lack of a (git) module. Reported by Alex ter Weele on #guix. * guix/channels.scm (channel-instance-derivations)[guile-gcrypt]: Remove. [dependencies]: New variable. Use it in the 2nd argument to 'build-channel-instance'. --- guix/channels.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index cf833db8b9..2e7bffae9f 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -207,10 +207,16 @@ INSTANCES." (guix-channel? (channel-instance-channel instance))) instances)) - ;; Guile-Gcrypt is a dependency of CORE-INSTANCE. - (define guile-gcrypt - (module-ref (resolve-interface '(gnu packages gnupg)) - 'guile-gcrypt)) + (define dependencies + ;; Dependencies of CORE-INSTANCE. + ;; FIXME: It would be best not to hard-wire this information here and + ;; instead query it to CORE-INSTANCE. + (list (module-ref (resolve-interface '(gnu packages gnupg)) + 'guile-gcrypt) + (module-ref (resolve-interface '(gnu packages guile)) + 'guile-git) + (module-ref (resolve-interface '(gnu packages guile)) + 'guile-bytestructures))) (mlet %store-monad ((core (build-channel-instance core-instance))) (mapm %store-monad @@ -218,7 +224,7 @@ INSTANCES." (if (eq? instance core-instance) (return core) (build-channel-instance instance - (list core guile-gcrypt)))) + (cons core dependencies)))) instances))) (define (whole-package-for-legacy name modules) -- cgit v1.2.3 From b9e1fddfd8c29b2fa6252ef52a75daa14aaabd3e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 9 Sep 2018 22:15:19 +0200 Subject: gnupg: Use 'gpgv' and keybox files; adjust 'guix refresh' accordingly. * guix/gnupg.scm (%gpgv-command, current-keyring): New variables (gnupg-verify): Add optional 'keyring' parameter. Use 'gpgv' instead of 'gpg' and pass it '--keyring'. (gnupg-receive-keys): Add optional 'keyring' parameter and honor it. (gnupg-verify*): Add #:keyring and honor it. * guix/scripts/refresh.scm (%options, show-help): Add '--keyring'. (guix-refresh): Parameterize CURRENT-KEYRING. * doc/guix.texi (Invoking guix refresh): Document '--keyring' and the keybox format. --- doc/guix.texi | 30 +++++++++++++++++++++++++ guix/gnupg.scm | 58 +++++++++++++++++++++++++++++++++++------------- guix/scripts/refresh.scm | 13 +++++++++-- 3 files changed, 83 insertions(+), 18 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 9a19eb89cd..8987b20fa9 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7268,6 +7268,36 @@ The following options can be used to customize GnuPG operation: Use @var{command} as the GnuPG 2.x command. @var{command} is searched for in @code{$PATH}. +@item --keyring=@var{file} +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). + +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.) + +You can export keys from your default GPG keyring into a keybox file using +commands like this one: + +@example +gpg --export rms@@gnu.org | kbxutil --import-openpgp >> mykeyring.kbx +@end example + +Likewise, you can fetch keys to a specific keybox file like this: + +@example +gpg --no-default-keyring --keyring mykeyring.kbx \ + --recv-keys @value{OPENPGP-SIGNING-KEY-ID} +@end example + +@ref{GPG Configuration Options, @option{--keyring},, gnupg, Using the GNU +Privacy Guard}, for more information on GPG's @option{--keyring} option. + @item --key-download=@var{policy} Handle missing OpenPGP keys according to @var{policy}, which may be one of: diff --git a/guix/gnupg.scm b/guix/gnupg.scm index ac0ed5ab2d..b30ce461b4 100644 --- a/guix/gnupg.scm +++ b/guix/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2010, 2011, 2013, 2014, 2016 Ludovic Courtès +;;; Copyright © 2010, 2011, 2013, 2014, 2016, 2018 Ludovic Courtès ;;; Copyright © 2013 Nikita Karetnikov ;;; ;;; This file is part of GNU Guix. @@ -24,9 +24,12 @@ #:use-module (ice-9 rdelim) #:use-module (ice-9 i18n) #:use-module (srfi srfi-1) - #:use-module (guix ui) + #:use-module (guix i18n) + #:use-module ((guix utils) #:select (config-directory)) + #:use-module ((guix build utils) #:select (mkdir-p)) #:export (%gpg-command %openpgp-key-server + current-keyring gnupg-verify gnupg-verify* gnupg-status-good-signature? @@ -42,13 +45,25 @@ ;; The GnuPG 2.x command-line program name. (make-parameter (or (getenv "GUIX_GPG_COMMAND") "gpg"))) +(define %gpgv-command + ;; The 'gpgv' program. + (make-parameter (or (getenv "GUIX_GPGV_COMMAND") "gpgv"))) + +(define current-keyring + ;; The default keyring of "trusted keys". + (make-parameter (string-append (config-directory #:ensure? #f) + "/gpg/trustedkeys.kbx"))) + (define %openpgp-key-server ;; The default key server. Note that keys.gnupg.net appears to be ;; unreliable. (make-parameter "pgp.mit.edu")) -(define (gnupg-verify sig file) - "Verify signature SIG for FILE. Return a status s-exp if GnuPG failed." +(define* (gnupg-verify sig file + #:optional (keyring (current-keyring))) + "Verify signature SIG for FILE against the keys in KEYRING. All the keys in +KEYRING as assumed to be \"trusted\", whether or not they expired or were +revoked. Return a status s-exp if GnuPG failed." (define (status-line->sexp line) ;; See file `doc/DETAILS' in GnuPG. @@ -117,8 +132,8 @@ (loop (read-line input) (cons (status-line->sexp line) result))))) - (let* ((pipe (open-pipe* OPEN_READ (%gpg-command) "--status-fd=1" - "--verify" sig file)) + (let* ((pipe (open-pipe* OPEN_READ (%gpgv-command) "--status-fd=1" + "--keyring" keyring sig file)) (status (parse-status pipe))) ;; Ignore PIPE's exit status since STATUS above should contain all the ;; info we need. @@ -145,12 +160,21 @@ missing key." (_ #f))) status)) -(define (gnupg-receive-keys key-id server) - (system* (%gpg-command) "--keyserver" server "--recv-keys" key-id)) +(define* (gnupg-receive-keys key-id server + #:optional (keyring (current-keyring))) + (unless (file-exists? keyring) + (mkdir-p (dirname keyring)) + (call-with-output-file keyring (const #t))) ;create an empty keybox + + (system* (%gpg-command) "--keyserver" server + "--no-default-keyring" "--keyring" keyring + "--recv-keys" key-id)) (define* (gnupg-verify* sig file - #:key (key-download 'interactive) - (server (%openpgp-key-server))) + #:key + (key-download 'interactive) + (server (%openpgp-key-server)) + (keyring (current-keyring))) "Like `gnupg-verify', but try downloading the public key if it's missing. Return #t if the signature was good, #f otherwise. KEY-DOWNLOAD specifies a download policy for missing OpenPGP keys; allowed values: 'always', 'never', @@ -161,15 +185,17 @@ and 'interactive' (default)." (define (download-and-try-again) ;; Download the missing key and try again. (begin - (gnupg-receive-keys missing server) - (gnupg-status-good-signature? (gnupg-verify sig file)))) + (gnupg-receive-keys missing server keyring) + (gnupg-status-good-signature? (gnupg-verify sig file + keyring)))) (define (receive?) (let ((answer - (begin (format #t (G_ "~a~a~%") - "Would you like to download this key " - "and add it to your keyring?") - (read-line)))) + (begin + (format #t (G_ "Would you like to add this key \ +to keyring '~a'?~%") + keyring) + (read-line)))) (string-match (locale-yes-regexp) answer))) (and missing diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index bcc23bd39c..58fc64db1f 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Alex Kost @@ -89,6 +89,9 @@ (lambda (opt name arg result) (alist-cons 'list-dependent? #t result))) + (option '("keyring") #t #f + (lambda (opt name arg result) + (alist-cons 'keyring arg result))) (option '("key-server") #t #f (lambda (opt name arg result) (alist-cons 'key-server arg result))) @@ -138,6 +141,8 @@ specified with `--select'.\n")) -l, --list-dependent list top-level dependent packages that would need to be rebuilt as a result of upgrading PACKAGE...")) (newline) + (display (G_ " + --keyring=FILE use FILE as the keyring of upstream OpenPGP keys")) (display (G_ " --key-server=HOST use HOST as the OpenPGP key server")) (display (G_ " @@ -437,7 +442,11 @@ update would trigger a complete rebuild." (%openpgp-key-server))) (%gpg-command (or (assoc-ref opts 'gpg-command) - (%gpg-command)))) + (%gpg-command))) + (current-keyring + (or (assoc-ref opts 'keyring) + (string-append (config-directory) + "/upstream/trustedkeys.kbx")))) (for-each (cut update-package store <> updaters #:key-download key-download -- cgit v1.2.3 From 31fdfc0cdd31f4e7c371a2da7404ea8f616a77fc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Sep 2018 23:26:28 +0200 Subject: gnu: dmidecode: Update to 3.2. * gnu/packages/admin.scm (dmidecode): Update to 3.2. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6949f60197..e7e34ab97f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1236,7 +1236,7 @@ network, which causes enabled computers to power on.") (define-public dmidecode (package (name "dmidecode") - (version "3.1") + (version "3.2") (source (origin (method url-fetch) (uri (string-append @@ -1244,7 +1244,7 @@ network, which causes enabled computers to power on.") version ".tar.xz")) (sha256 (base32 - "1h0sg0lxa15nzf8s7884p6q7p6md9idm0c79wyqmk32l4ndwwrnp")))) + "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From b55d75f133e782ef31fd20b8b454694198ef0c71 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 16 Sep 2018 19:11:33 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.156. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.156. --- 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 d4e9a5de95..9463d001a7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.155" - "1gcnwrgv0xghr550lcl6dmxdl59drzbi02mwp78g8vjql6ihdfys" + (make-linux-libre "4.4.156" + "13j4jb4hifh3fah2ysy2425fakwqqdh2z23lf4i0frxa1xl974h2" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From bf9d141a6561acbfe2f84bf26cc1d907eaeb6baa Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 16 Sep 2018 19:12:10 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.127. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.127. --- 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 9463d001a7..822dd3ec5d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.126" - "0qa9zxa7isn20b9sbjcyrqfynd00phddv3yindp5dmvsng1kwxj8" + (make-linux-libre "4.9.127" + "0q7h5gnl3ikic0pvwrxp78pz56yvijhz6s84gb92xywi1v3dd8mh" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From c333c8b6f19413d1545014cb0922cf78fa9d652a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 16 Sep 2018 19:12:53 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.70. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.70. (%linux-libre-4.14-hash): 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 822dd3ec5d..f1cf542650 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.69") -(define %linux-libre-4.14-hash "08pw5hywlx3rsavj74qa17fm9hmhaw2rb1d3ahaqmd1zzsddb3qf") +(define %linux-libre-4.14-version "4.14.70") +(define %linux-libre-4.14-hash "138v51m6k57wnvlf9c22dad0w819mfb8f95i6w99mlg69qpwdvag") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From ad99df39904c6326a9d4a446b1e4e9184c797974 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 16 Sep 2018 19:13:42 -0400 Subject: gnu: linux-libre: Update to 4.18.8. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.8. (%linux-libre-hash): 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 f1cf542650..e34c67cb0f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.7") -(define %linux-libre-hash "1gn3ip2blczfr5hl20x6c93z8v7h528kl423pzkcn22hin6717wd") +(define %linux-libre-version "4.18.8") +(define %linux-libre-hash "163awpba1yd0x33xzj5dczimk4y96xc28syc4w2ad0qafgapng8l") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 4fed15fba3b1a846b4e6c50a91f7ad2be856bbf7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 17 Sep 2018 01:13:42 -0400 Subject: gnu: mbedtls-apache: Update to 2.7.6. * gnu/packages/tls.scm (mbedtls-apache): Update to 2.7.6. --- 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 f7de901385..0cdb02b0aa 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -842,7 +842,7 @@ then ported to the GNU / Linux environment.") (define-public mbedtls-apache (package (name "mbedtls-apache") - (version "2.7.5") + (version "2.7.6") (source (origin (method url-fetch) @@ -852,7 +852,7 @@ then ported to the GNU / Linux environment.") version "-apache.tgz")) (sha256 (base32 - "0h4vks2z68bkwzg093mn0a7aqsva8rxr4m971n4bkasa17cjlc51")))) + "0fl2nrxvlgx9ja7yy3kd1zadpr98fxbvn3f6fl2mj87gryhkfqlk")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 956bcc8ed2625e1eb4dbd29d4edbc229b7d3a8c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 12:45:52 +0200 Subject: gnu: python-dirsync: Update to 2.2.3. * gnu/packages/python.scm (python-dirsync): Update to 2.2.3. [native-inputs]: Remove unzip. --- gnu/packages/python.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 30b65f637b..6927924a68 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11607,17 +11607,15 @@ perform the operations required for synchronizing plain text.") (define-public python-dirsync (package (name "python-dirsync") - (version "2.2.2") + (version "2.2.3") (source (origin (method url-fetch) - (uri (pypi-uri "dirsync" version ".zip")) + (uri (pypi-uri "dirsync" version)) (sha256 (base32 - "1hcdvmkwd5512zbxpin0k7bx5bkgzy3swjx7d0kj1y45af6r75v2")))) + "1r40fkanksagcszf1ag85mdr8w7rgc7196n6s1qlsk2abw6i7v0z")))) (build-system python-build-system) - (native-inputs - `(("unzip" ,unzip))) (propagated-inputs `(("six" ,python-six))) (home-page "https://bitbucket.org/tkhyn/dirsync") -- cgit v1.2.3 From 36aff81aa3f683e3dd4b36ee0f008cf425af3c59 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 12:17:27 +0200 Subject: gnu: powwow: Use HTTPS home page. * gnu/packages/games.scm (powwow)[home-page]: Use HTTPS. --- 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 2015e3ce47..5a409ba690 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2707,7 +2707,7 @@ is attributed to Albert Einstein.") (inputs `(("ncurses" ,ncurses))) (build-system gnu-build-system) - (home-page "http://www.hoopajoo.net/projects/powwow.html") + (home-page "https://www.hoopajoo.net/projects/powwow.html") (synopsis "MUD and telnet client") (description "POWWOW is a client software which can be used for telnet as well as for -- cgit v1.2.3 From 99d386a71fb182c9e1d49d96e3d24dddf985c9c8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 12:18:05 +0200 Subject: gnu: powwow: Update to 1.2.18. * gnu/packages/games.scm (powwow): Update to 1.2.18. --- 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 5a409ba690..8be87f6f55 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2694,7 +2694,7 @@ is attributed to Albert Einstein.") (define-public powwow (package (name "powwow") - (version "1.2.17") + (version "1.2.18") (source (origin (method url-fetch) (uri (string-append @@ -2703,7 +2703,7 @@ is attributed to Albert Einstein.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1xmsg2y7qcvj67i9ilnih0mvfxcpni7fzrz343x9rdfnkkzf3pp8")))) + "1gf0jc1vfv05lxij51n3c1dqn3aiiy2kj1v6q14an3wm7yl7cllp")))) (inputs `(("ncurses" ,ncurses))) (build-system gnu-build-system) -- cgit v1.2.3 From a09a21190fd39a86111e15998fa19b9cae361b61 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 12:25:56 +0200 Subject: gnu: libiptcdata: Mark up description. * gnu/packages/image.scm (libiptcdata)[description]: Use @dfn{}. --- gnu/packages/image.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 24a83dd683..c3eb48ad0d 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1379,8 +1379,9 @@ medical image data, e.g. magnetic resonance image (MRI) and functional MRI (build-system gnu-build-system) (home-page "http://libiptcdata.sourceforge.net/") (synopsis "IPTC metadata manipulation library") - (description "Libiptcdata is a C library for manipulating the International -Press Telecommunications Council (IPTC) metadata stored within multimedia files + (description + "Libiptcdata is a C library for manipulating the International Press +Telecommunications Council (@dfn{IPTC}) metadata stored within multimedia files such as images. This metadata can include captions and keywords, often used by popular photo management applications. The library provides routines for parsing, viewing, modifying, and saving this metadata.") -- cgit v1.2.3 From f6a4d57e06f6ee80159cdf1cc74896beffdc3b87 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 11:35:48 +0200 Subject: gnu: foo2zjs: Update to 20180910. * gnu/packages/cups.scm (foo2zjs): Update to 20180910. --- 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 3150c25019..986280f4cb 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -588,14 +588,14 @@ printer/driver specific, but spooler-independent PPD file.") (define-public foo2zjs (package (name "foo2zjs") - (version "20171202") + (version "20180910") (source (origin (method url-fetch) ;; XXX: This is an unversioned URL! (uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz") (sha256 (base32 - "10m1ksbzqsrsl4faqyl73ahfnj2hv1y3zrmr366zvjg7w3l6ag5n")))) + "1clddqy4y4vvws0lllv1v90dfiihihdc23bn93c544yb3fvmwmr6")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From ee127549a371e72f217598f38a81f8b8d16206b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 11:36:15 +0200 Subject: gnu: efl: Update to 1.21.1. * gnu/packages/enlightenment.scm (efl): Update to 1.21.1. --- 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 40a5ec1cf4..87c2f2e58e 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -62,7 +62,7 @@ (define-public efl (package (name "efl") - (version "1.21.0") + (version "1.21.1") (source (origin (method url-fetch) (uri (string-append @@ -70,7 +70,7 @@ version ".tar.xz")) (sha256 (base32 - "0jxfrcz2aq1synxzd6sh9nhxz7fg9qgz0idr8zj6gaiplmwbwrby")))) + "0a5907h896pvpix7a6idc2fspzy6d78xrzf84k8y9fyvnd14nxs4")))) (outputs '("out" ; 49 MB "include")) ; 17 MB (build-system gnu-build-system) -- cgit v1.2.3 From d68aa41573bff6614a73ea28249cfd88fe206d38 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 11:36:31 +0200 Subject: gnu: enlightenment: Update to 0.22.4. * gnu/packages/enlightenment.scm (enlightenment): Update to 0.22.4. --- 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 87c2f2e58e..45dc1dbbeb 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -251,7 +251,7 @@ Libraries with some extra bells and whistles.") (define-public enlightenment (package (name "enlightenment") - (version "0.22.3") + (version "0.22.4") (source (origin (method url-fetch) (uri @@ -259,7 +259,7 @@ Libraries with some extra bells and whistles.") name "/" name "-" version ".tar.xz")) (sha256 (base32 - "16zydv7z94aw3rywmb9gr8ya85k7b75h22wng95lfx1x0y1yb0ad")) + "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r")) (patches (search-patches "enlightenment-fix-setuid-path.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 3809824199cdd52446176c9cd4761dd09f732542 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 17 Sep 2018 22:00:26 +0200 Subject: store: Add missing buffer flushes. This could result in deadlock in unusual situations, whereby we'd start waiting for a reply while the query hasn't been flushed to the socket. * guix/store.scm (buffering-output-port)[flush]: Add call to 'force-output'. (add-to-store): Add call to 'write-buffered-output'. --- guix/store.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guix/store.scm b/guix/store.scm index af7f6980cf..cc5dcef247 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -770,6 +770,7 @@ bytevector) as its internal buffer, and a thunk to flush this output port." (define (flush) (put-bytevector port buffer 0 total) + (force-output port) (set! total 0)) (define (write bv offset count) @@ -927,6 +928,7 @@ path." (write-int (if recursive? 1 0) port) (write-string hash-algo port) (write-file file-name port #:select? select?) + (write-buffered-output server) (let loop ((done? (process-stderr server))) (or done? (loop (process-stderr server)))) (read-store-path port))))) -- cgit v1.2.3 From e83b2b0fdd2458242837b60d4da7f09802ca07a6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 17 Sep 2018 22:02:31 +0200 Subject: git: Choose a saner default for '%repository-cache-directory'. * guix/git.scm (%repository-cache-directory): Use 'cache-directory' by default unless running as root. --- guix/git.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/git.scm b/guix/git.scm index 3d0eb93d9b..d007916662 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -36,7 +36,8 @@ latest-repository-commit)) (define %repository-cache-directory - (make-parameter "/var/cache/guix/checkouts")) + (make-parameter (string-append (cache-directory #:ensure? #f) + "/checkouts"))) (define-syntax-rule (with-libgit2 thunk ...) (begin -- cgit v1.2.3 From 56c240ba8c8afa5945ec05acf3b32908d92fc45f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 17 Sep 2018 23:18:08 +0200 Subject: gnu: Add confusion-mdl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lisp.scm (confusion-mdl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/lisp.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 720ac070cc..f9e03b18b6 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2018 Benjamin Slade ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,6 +63,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages version-control) #:use-module (gnu packages xorg) + #:use-module (gnu packages perl) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) @@ -1442,3 +1444,47 @@ compressor. It works on data produced by @code{parse-js} to generate a `(("sbcl" ,sbcl) ("sbcl-cl-uglify-js" ,sbcl-cl-uglify-js))) (synopsis "JavaScript compressor"))) + +(define-public confusion-mdl + (let* ((commit "12a055581fc262225272df43287dae48281900f5")) + (package + (name "confusion-mdl") + (version "0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://gitlab.com/emacsomancer/" name)) + (commit commit))) + (sha256 + (base32 + "1zi8kflzvwqg97ha1sa5xjisbjs5z1mvbpa772vfxiv5ksnpxp0d")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply invoke "make" "CC=gcc" make-flags))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "mdli" bin) + #t)))))) + (native-inputs + `(("perl" ,perl))) + (inputs + `(("libgc" ,libgc))) + (synopsis "Interpreter for the MIT Design Language (MDL)") + (description "MDL (the MIT Design Language) is a descendant of Lisp. It +was originally developed in 1971 on the PDP-10 computer under the Incompatible +Timesharing System (ITS) to provide high level language support for the +Dynamic Modeling Group at MIT's Project MAC. Infocom built the original +PDP-10 Zork in MDL and their later ZIL (Zork Implementation Language) was +based on a subset of MDL. Confusion is a MDL interpreter that works just well +enough to play the original mainframe Zork all the way through.") + (home-page "http://www.russotto.net/git/mrussotto/confusion/src/master/src/README") + (license license:gpl3+)))) -- cgit v1.2.3 From 0edc232be92d62cd67b38192ee6d959ee30f599f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 14:32:16 +0200 Subject: gnu: gourmet: Use INVOKE. * gnu/packages/nutrition.scm (gourmet)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/nutrition.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nutrition.scm b/gnu/packages/nutrition.scm index 0e03253cf1..5006f99ffc 100644 --- a/gnu/packages/nutrition.scm +++ b/gnu/packages/nutrition.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,8 +63,8 @@ (modify-phases %standard-phases (replace 'install (lambda* (#:key make-flags #:allow-other-keys) - (zero? (system* "python" "setup.py" "install" "--prefix" - (assoc-ref %outputs "out")))))))) + (invoke "python" "setup.py" "install" "--prefix" + (assoc-ref %outputs "out"))))))) (home-page "http://thinkle.github.io/gourmet/") (synopsis "Recipe organizer") (description -- cgit v1.2.3 From b22c44f1ea7a06fefdbe80b579f1c9a1bad2213f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 13:51:12 +0200 Subject: gnu: cinnamon-desktop: Use Guix's built-in bootstrap phase. * gnu/packages/cinnamon.scm (cinnamon-desktop)[arguments]: Remove 'autoconf' phase. Add 'skip-premature-configure' phase. --- gnu/packages/cinnamon.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm index 65aea47d5a..7cac863f92 100644 --- a/gnu/packages/cinnamon.scm +++ b/gnu/packages/cinnamon.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Nils Gillmann +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,13 +51,10 @@ (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'autoconf + (add-before 'bootstrap 'skip-premature-configure (lambda _ - (mkdir-p "m4") - (zero? - (and (system* "glib-gettextize" "--force" "--copy") - (system* "intltoolize" "--force" "--copy" "--automake") - (system* "autoreconf" "--verbose" "--force" "--install")))))))) + (setenv "NOCONFIGURE" "set") + #t))))) ;; TODO: package 'libgsystem'. (inputs `(("accountsservice" ,accountsservice) -- cgit v1.2.3 From 8ecd843df5652f63e9f270159936b504357ef2b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 22:40:30 +0200 Subject: gnu: exfat-utils: Update to 1.3.0. * gnu/packages/mtools.scm (exfat-utils): Update to 1.3.0. --- gnu/packages/mtools.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mtools.scm b/gnu/packages/mtools.scm index 3bfc4e76cf..f49a035b41 100644 --- a/gnu/packages/mtools.scm +++ b/gnu/packages/mtools.scm @@ -49,7 +49,7 @@ FAT-specific file attributes.") (define-public exfat-utils (package (name "exfat-utils") - (version "1.2.8") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append @@ -57,7 +57,7 @@ FAT-specific file attributes.") version "/" name "-" version ".tar.gz")) (sha256 (base32 - "09yf41mgwp8wg0psq347d5razllilx1sd4ij9173nri47p9465jw")))) + "0da8f8mm1sbwqp7prh78qk33xm0b8kk2d5is7mh2szlhgdxd1syz")))) (build-system gnu-build-system) (home-page "https://github.com/relan/exfat") (synopsis "Utilities to manipulate exFAT file systems") -- cgit v1.2.3 From 7c0ed27a8bc49ff80ec7e52f1f0b145815e0abc1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Sep 2018 10:54:38 +0200 Subject: gnu: ncmpc: Update to 0.30. * gnu/packages/mpd.scm (ncmpc): Update to 0.30. [arguments]: Add 'expand-C++-include-path' phase. [inputs]: Add gcc-8. --- gnu/packages/mpd.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 5c82bf9ba1..c024152dda 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -33,6 +33,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages avahi) #:use-module (gnu packages boost) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) @@ -185,7 +186,7 @@ player daemon.") (define-public ncmpc (package (name "ncmpc") - (version "0.29") + (version "0.30") (source (origin (method url-fetch) (uri @@ -194,12 +195,23 @@ player daemon.") "/ncmpc-" version ".tar.xz")) (sha256 (base32 - "04jzv1hfdvgbn391523jb2h3yhq9a40pjrg41sl3wf3jf6vajs7g")))) + "18qj3cgqczgfk334x0ywxwa1ckrk9fbjyp34n4zzcxwaifshrzp3")))) (build-system meson-build-system) (arguments `(#:configure-flags - (list "-Dcurses=ncurses"))) - (inputs `(("glib" ,glib) + (list "-Dcurses=ncurses") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'expand-C++-include-path + ;; Make /include/c++/ext/string_conversions.h find . + (lambda* (#:key inputs #:allow-other-keys) + (let* ((path "CPLUS_INCLUDE_PATH") + (gcc (assoc-ref inputs "gcc")) + (c++ (string-append gcc "/include/c++"))) + (setenv path (string-append c++ ":" (getenv path))) + #t)))))) + (inputs `(("gcc", gcc-8) ; for its C++14 support + ("glib" ,glib) ("libmpdclient" ,libmpdclient) ("ncurses" ,ncurses))) (native-inputs `(("gettext" ,gettext-minimal) ; for xgettext -- cgit v1.2.3 From 487cf5aaf620fa56ddc76c854a34289dfdf04e93 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 14:42:05 +0200 Subject: gnu: rc: Simplify. * gnu/packages/shells.scm (rc)[source]: Replace magic commit ID with the tagged release. Use GIT-FILE-NAME. [arguments]: Remove 'autoreconf' phase (relying on Guix's built-in 'bootstrap' phase instead) and adjust the ordering of 'patch-trip.rc' accordingly. --- gnu/packages/shells.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 406766351c..245496aaaf 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -155,23 +155,18 @@ and syntax highlighting.") (method git-fetch) (uri (git-reference (url "https://github.com/rakitzis/rc.git") - ;; commit name 'release: rc-1.7.4' - (commit "c884da53a7c885d46ace2b92de78946855b18e92"))) + (commit (string-append "v" version)))) (sha256 (base32 - "00mgzvrrh9w96xa85g4gjbsvq02f08k4jwjcdnxq7kyh5xgiw95l")) - (file-name (string-append name "-" version "-checkout")))) + "0vj1h4pcg13vxsiydmmk87dr2sra9h4gwx0c4q6fjsiw4in78rrd")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-edit=gnu") #:phases (modify-phases %standard-phases - (add-after - 'unpack 'autoreconf - (lambda _ (zero? (system* "autoreconf" "-vfi")))) - (add-before - 'autoreconf 'patch-trip.rc + (add-before 'bootstrap 'patch-trip.rc (lambda _ (substitute* "trip.rc" (("/bin/pwd") (which "pwd")) -- cgit v1.2.3 From 4999f45ea962ac79a23d028e2b393055b3786fe7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Sep 2018 13:21:15 +0200 Subject: gnu: libburn: Update to 1.5.0. * gnu/packages/cdrom.scm (libburn): Update to 1.5.0. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 4b051e22d4..425a785bcd 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -727,14 +727,14 @@ laid out on the image.") (define-public libburn (package (name "libburn") - (version "1.4.8") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "http://files.libburnia-project.org/releases/" "libburn-" version ".tar.gz")) (sha256 (base32 - "19lxnzn8bz70glrrrn2hs43gf5g7gfbcka9rcbckhv1pb7is509y")))) + "1gg2kgnqvaa2fwghai62prxz6slpak1f6bvgjh8m4dn16v114asq")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 8190578fa0d18b1859f2c996a6fd78a4866718d2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Sep 2018 13:21:23 +0200 Subject: gnu: libisofs: Update to 1.5.0. * gnu/packages/cdrom.scm (libisofs): Update to 1.5.0. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 425a785bcd..91a9310eae 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -749,14 +749,14 @@ DVD-RW, DVD-R, DVD-R/DL, BD-R, and BD-RE.") (define-public libisofs (package (name "libisofs") - (version "1.4.8") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "http://files.libburnia-project.org/releases/" "libisofs-" version ".tar.gz")) (sha256 (base32 - "0scvqb72qq24wcg814p1iw1dknldl21hr1hxsc1wy9vc6vgyk7fw")))) + "001l3akf3wb6msl9man776w560iqyvsbwwzs7d7y7msx13irspys")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) -- cgit v1.2.3 From d99051715abb0fd6968a06948fc77f32728a710b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Sep 2018 13:21:31 +0200 Subject: gnu: xorriso: Update to 1.5.0. * gnu/packages/cdrom.scm (xorriso): Update to 1.5.0. --- gnu/packages/cdrom.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 91a9310eae..d8dc9ee6f9 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -152,14 +152,14 @@ libcdio.") (define-public xorriso (package (name "xorriso") - (version "1.4.8") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/xorriso/xorriso-" version ".tar.gz")) (sha256 (base32 - "10c44yr3dpmwxa7rf23mwfsy1bahny3jpcg9ig0xjv090jg0d0pc")))) + "0aq6lvlwlkxz56l5sbvgycr6j5c82ch2bv6zrnc2345ibfpafgx9")))) (build-system gnu-build-system) (inputs `(("acl" ,acl) -- cgit v1.2.3 From 56c180750c8b7aca5ae82d133caac7c398c688b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Sep 2018 13:20:48 +0200 Subject: gnu: busybox: Update to 1.29.3. * gnu/packages/busybox.scm (busybox): Update to 1.29.3. --- gnu/packages/busybox.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 480b777574..5f1613bb4c 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -31,7 +31,7 @@ (define-public busybox (package (name "busybox") - (version "1.29.1") + (version "1.29.3") (source (origin (method url-fetch) (uri (string-append @@ -39,7 +39,7 @@ version ".tar.bz2")) (sha256 (base32 - "1hqlr5b3bsyb6avadz1z4za6pyl32r1krnpcpwwqilhnx8q0f9gw")))) + "1dzg45vgy2w1xcd3p6h8d76ykhabbvk1h0lf8yb24ikrwlv8cr4p")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 32b3611375b942051c1e35612f630a4879f1247a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 18 Sep 2018 15:24:05 -0400 Subject: gnu: Go 1.10: Update to 1.10.4. * gnu/packages/golang.scm (go-1.10): Update to 1.10.4. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b4a088a051..fd4c362d36 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -389,7 +389,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (package (inherit go-1.9) (name "go") - (version "1.10.3") + (version "1.10.4") (source (origin (method url-fetch) @@ -397,7 +397,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") name version ".src.tar.gz")) (sha256 (base32 - "1wjmw65nfkkzz084695gdgn13sbjcaafy2y5370d214pdk31qysn")))) + "10ap5pan71y2hdwzv4cg8wx4sy8fkcz5520rm1ldjg25xmjlkr3g")))) (arguments (substitute-keyword-arguments (package-arguments go-1.9) ((#:phases phases) -- cgit v1.2.3 From 000bbe02e21353f30c915d5b88f2de316d3634a1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Sep 2018 21:37:23 +0200 Subject: store: Add another missing buffer flush. This is a followup to 3809824199cdd52446176c9cd4761dd09f732542. * guix/store.scm (add-file-tree-to-store): Add 'write-buffered-output' call. --- guix/store.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/store.scm b/guix/store.scm index cc5dcef247..f88cdefe87 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -1044,6 +1044,7 @@ an arbitrary directory layout in the store without creating a derivation." #:file-port file-port #:symlink-target symlink-target #:directory-entries directory-entries) + (write-buffered-output server) (let loop ((done? (process-stderr server))) (or done? (loop (process-stderr server)))) (let ((result (read-store-path port))) -- cgit v1.2.3 From cda08dd339112c78881e91597326498331b16dca Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Sep 2018 22:33:30 +0200 Subject: tests: Skip 'self-contained-tarball' test unconditionally. * tests/pack.scm ("self-contained-tarball"): Skip unconditionally. --- tests/pack.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/pack.scm b/tests/pack.scm index d4596f863a..c57c6848ff 100644 --- a/tests/pack.scm +++ b/tests/pack.scm @@ -51,7 +51,12 @@ (test-begin "pack") -(unless (network-reachable?) (test-skip 1)) +;; FIXME: The following test would rebuild the world (and likely fail) as a +;; consequence of commit c45477d2a1a651485feede20fe0f3d15aec48b39 (and related +;; changes) that made guile-sqlite3 a dependency of the derivation. +;; See . +(test-skip 1) + (test-assertm "self-contained-tarball" (mlet* %store-monad ((profile (profile-derivation (packages->manifest -- cgit v1.2.3 From 912adda316886cef5f3f870e53d607bf8d02222f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Sep 2018 22:49:41 +0200 Subject: describe: Work correctly on generation-less profiles. Previously a command like: $(readlink -f ~/.config/guix/current)/bin/guix describe would succeed without printing anything. * guix/scripts/describe.scm (display-profile-info): Don't call 'generation-file-name' when NUMBER is zero. * guix/scripts/pull.scm (display-profile-content): Likewise. --- guix/scripts/describe.scm | 6 ++++-- guix/scripts/pull.scm | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm index fdff07d0e3..c1a20fe26c 100644 --- a/guix/scripts/describe.scm +++ b/guix/scripts/describe.scm @@ -134,8 +134,10 @@ in the format specified by FMT." ;; Show most recently installed packages last. (reverse (manifest-entries - (profile-manifest (generation-file-name profile - number))))))))) + (profile-manifest + (if (zero? number) + profile + (generation-file-name profile number)))))))))) (display-package-search-path fmt)) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 976e054a84..c0686f16bf 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -233,7 +233,9 @@ way and displaying details about the channel's source code." ;; Show most recently installed packages last. (reverse (manifest-entries - (profile-manifest (generation-file-name profile number)))))) + (profile-manifest (if (zero? number) + profile + (generation-file-name profile number))))))) (define (indented-string str indent) "Return STR with each newline preceded by IDENT spaces." -- cgit v1.2.3 From 0058888c7efe4063f80180ff446513869420423f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Sep 2018 23:07:18 +0200 Subject: gnu: Add guile-debbugs. * gnu/packages/guile.scm (guile-debbugs): New variable. --- gnu/packages/guile.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 4ee887b749..c66183b9db 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -2206,4 +2206,31 @@ endpoint. Additionally, it provides an interface to write SPARQL queries using S-expressions.") (license license:gpl3+))) +(define-public guile-debbugs + (package + (name "guile-debbugs") + (version "0.0.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/guile-debbugs/guile-debbugs-" + version ".tar.gz")) + (sha256 + (base32 + "16l8910p57im6s3j93xhdaqvgfy6ms5n97177mrch3y961z5hy0i")) + (modules '((guix build utils))) + (snippet + '(substitute* "Makefile.in" + (("^godir = (.*)/ccache" _ prefix) + (string-append "godir = " prefix "/site-ccache")))))) + (build-system gnu-build-system) + (native-inputs + `(("guile" ,guile-2.2) + ("pkg-config" ,pkg-config))) + (home-page "https://savannah.gnu.org/projects/guile-debbugs/") + (synopsis "Guile interface to the Debbugs bug tracking service") + (description + "This package provides a Guile library to communicate with a Debbugs bug +tracker's SOAP service, such as @url{https://bugs.gnu.org}.") + (license license:gpl3+))) + ;;; guile.scm ends here -- cgit v1.2.3 From 1d2b542d34ebec498d1424af81220a00ed0d6a24 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Sep 2018 23:12:30 +0200 Subject: pull: Assume 'set-tls-certificate-locations!' is available. * guix/scripts/pull.scm (honor-lets-encrypt-certificates!): Call 'set-tls-certificate-locations!' unconditionally. --- guix/scripts/pull.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index c0686f16bf..04c8ef672f 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -176,17 +176,7 @@ Download and deploy the latest version of Guix.\n")) (certs (string-append (derivation->output-path drv) "/etc/ssl/certs"))) (build-derivations store (list drv)) - - ;; In the past Guile-Git would not provide this procedure. - (if (module-defined? (resolve-interface '(git)) - 'set-tls-certificate-locations!) - (set-tls-certificate-locations! certs) - (begin - ;; In this case we end up using whichever certificates OpenSSL - ;; chooses to use: $SSL_CERT_FILE, $SSL_CERT_DIR, or /etc/ssl/certs. - (warning (G_ "cannot enforce use of the Let's Encrypt \ -certificates~%")) - (warning (G_ "please upgrade Guile-Git~%")))))) + (set-tls-certificate-locations! certs))) (define (report-git-error error) "Report the given Guile-Git error." -- cgit v1.2.3 From 20f8d73face564deec2f21130fb465c8c3d9a8e9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Sep 2018 23:19:18 +0200 Subject: pull: Use /etc/ssl/certs by default if it exists and is non-empty. Previously, on machines where /etc/ssl/certs did exist, we'd have this: $ unset SSL_CERT_DIR $ unset SSL_CERT_FILE $ guix pull Updating channel 'guix' from Git repository at 'https://git.savannah.gnu.org/git/guix.git'... guix pull: error: Git error: the SSL certificate is invalid This is because we'd let OpenSSL look for certificates in its default location, which is an empty directory in its own prefix. * guix/scripts/pull.scm (honor-x509-certificates): New procedure. (guix-pull): Use it instead of calling 'honor-lets-encrypt-certificates!'. --- guix/scripts/pull.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 04c8ef672f..10e1a99e54 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -178,6 +178,17 @@ Download and deploy the latest version of Guix.\n")) (build-derivations store (list drv)) (set-tls-certificate-locations! certs))) +(define (honor-x509-certificates store) + "Use the right X.509 certificates for Git checkouts over HTTPS." + (let ((file (getenv "SSL_CERT_FILE")) + (directory (or (getenv "SSL_CERT_DIR") "/etc/ssl/certs"))) + (if (or (and file (file-exists? file)) + (and=> (stat directory #f) + (lambda (st) + (> (stat:nlink st) 2)))) + (set-tls-certificate-locations! directory file) + (honor-lets-encrypt-certificates! store)))) + (define (report-git-error error) "Report the given Guile-Git error." ;; Prior to Guile-Git commit b6b2760c2fd6dfaa5c0fedb43eeaff06166b3134, @@ -423,13 +434,7 @@ Use '~/.config/guix/channels.scm' instead.")) (parameterize ((%graft? (assoc-ref opts 'graft?)) (%repository-cache-directory cache)) (set-build-options-from-command-line store opts) - - ;; When certificates are already installed, use them. - ;; Otherwise, use the Let's Encrypt certificates, which we - ;; know Savannah uses. - (let ((certs (or (getenv "SSL_CERT_DIR") "/etc/ssl/certs"))) - (unless (file-exists? certs) - (honor-lets-encrypt-certificates! store))) + (honor-x509-certificates store) (let ((instances (latest-channel-instances store channels))) (format (current-error-port) -- cgit v1.2.3 From 1cfcb841eddbe6b2bfed6dfaad6bcebff66e7a16 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 18 Sep 2018 12:18:23 +0200 Subject: gnu: git-credential-netrc: Add Git.pm to PERL5LIB. * gnu/packages/version-control.scm (git)[credential-netrc]: Add Git.pm to PERL5LIB. --- gnu/packages/version-control.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 3774961786..58c870df5a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -309,6 +309,13 @@ as well as the classic centralized workflow.") (let* ((netrc (assoc-ref outputs "credential-netrc"))) (install-file "contrib/credential/netrc/git-credential-netrc" (string-append netrc "/bin")) + ;; Previously, Git.pm was automatically found by netrc. + ;; Perl 5.26 changed how it locates modules so that @INC no + ;; longer includes the current working directory (the Perl + ;; community calls this "dotless @INC"). + (wrap-program (string-append netrc "/bin/git-credential-netrc") + `("PERL5LIB" ":" prefix + (,(string-append (assoc-ref outputs "out") "/share/perl5")))) #t))) (add-after 'install 'split (lambda* (#:key inputs outputs #:allow-other-keys) -- cgit v1.2.3 From 4a90fcf9e7a71a1672d9aa86f367f07ad297f899 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 19 Sep 2018 12:18:26 +0200 Subject: gnu: mrustc: Enable tests. * gnu/packages/rust.scm (mrustc)[arguments]: Add #:test-target. <#:phases>[install]: Don't install test output. --- gnu/packages/rust.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index c40a47c4d9..e1c32dbe10 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -200,7 +200,7 @@ in turn be used to build the final Rust.") ("rustc" ,(rust-source "1.19.0" "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1aswpvad81y8qm")))) (arguments - `(#:tests? #f + `(#:test-target "local_tests" #:make-flags (list (string-append "LLVM_CONFIG=" (assoc-ref %build-inputs "llvm") "/bin/llvm-config")) @@ -250,6 +250,7 @@ in turn be used to build the final Rust.") (gcc (assoc-ref inputs "gcc"))) ;; These files are not reproducible. (for-each delete-file (find-files "output" "\\.txt$")) + (delete-file-recursively "output/local_tests") (mkdir-p lib) (copy-recursively "output" lib/rust) (mkdir-p bin) -- cgit v1.2.3 From 6c1a6584149b542321597741b3f1459743be2b3e Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 19 Sep 2018 14:38:10 +0200 Subject: gnu: rust@1.19.0: Install libtest. * gnu/packages/rust.scm (rust-1.19)[arguments]<#:phases>[build]: Build libtest. --- gnu/packages/rust.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e1c32dbe10..74de6f3ae1 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -411,6 +411,8 @@ test = { path = \"../libtest\" } "output/rustc-build/rustc" "-C" (string-append "linker=" (getenv "CC")) + ;; Required for libterm. + "-Z" "force-unstable-if-unmarked" "-L" "output/target-libs" (string-append "src/" name "/lib.rs") "-o" @@ -430,7 +432,13 @@ test = { path = \"../libtest\" } ("libpanic_unwind") ;; Uses "cc" to link. ("libstd" "-l" "dl" "-l" "rt" "-l" "pthread") - ("libarena"))) + ("libarena") + + ;; Test dependencies: + + ("libgetopts") + ("libterm") + ("libtest"))) #t))) ;; This phase is overridden by newer versions. (replace 'check -- cgit v1.2.3 From c5c1e410cfc175df8b4b61c1a3d42850bb268bf3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 19 Sep 2018 14:20:03 +0200 Subject: gnu: Reinstate xf86-video-ast. * gnu/packages/patches/xf86-video-ast-remove-mibstore.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/xorg.scm (xf86-video-ast): New public variable. --- gnu/local.mk | 1 - .../patches/xf86-video-ast-remove-mibstore.patch | 90 ---------------------- gnu/packages/xorg.scm | 48 +++++------- 3 files changed, 21 insertions(+), 118 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-ast-remove-mibstore.patch diff --git a/gnu/local.mk b/gnu/local.mk index d37a193adb..0ead43acd9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1229,7 +1229,6 @@ dist_patch_DATA = \ %D%/packages/patches/xapian-revert-5489fb2f8.patch \ %D%/packages/patches/xboing-CVE-2004-0149.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ - %D%/packages/patches/xf86-video-ast-remove-mibstore.patch \ %D%/packages/patches/xf86-video-geode-glibc-2.20.patch \ %D%/packages/patches/xf86-video-i128-remove-mibstore.patch \ %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \ diff --git a/gnu/packages/patches/xf86-video-ast-remove-mibstore.patch b/gnu/packages/patches/xf86-video-ast-remove-mibstore.patch deleted file mode 100644 index 58a44ae260..0000000000 --- a/gnu/packages/patches/xf86-video-ast-remove-mibstore.patch +++ /dev/null @@ -1,90 +0,0 @@ -Removes references to mibstore.h and miInitializeBackingStore, which -have been removed from xorg-server. Zack Rusin -wrote: "It was a noop for at least 5 years and it has been removed." -See: http://patches.openembedded.org/patch/46133/ - -diff -ru xf86-video-ast-0.93.10.orig/src/ast_2dtool.c xf86-video-ast-0.93.10/src/ast_2dtool.c ---- xf86-video-ast-0.93.10.orig/src/ast_2dtool.c 2012-03-23 21:40:56.000000000 -0400 -+++ xf86-video-ast-0.93.10/src/ast_2dtool.c 2014-12-19 02:42:32.422383728 -0500 -@@ -27,7 +27,6 @@ - #include "xf86_OSproc.h" - #include "xf86cmap.h" - #include "compiler.h" --#include "mibstore.h" - #include "vgaHW.h" - #include "mipointer.h" - #include "micmap.h" -diff -ru xf86-video-ast-0.93.10.orig/src/ast_accel.c xf86-video-ast-0.93.10/src/ast_accel.c ---- xf86-video-ast-0.93.10.orig/src/ast_accel.c 2012-03-23 21:40:56.000000000 -0400 -+++ xf86-video-ast-0.93.10/src/ast_accel.c 2014-12-19 02:41:55.534200809 -0500 -@@ -27,7 +27,6 @@ - #include "xf86_OSproc.h" - #include "xf86cmap.h" - #include "compiler.h" --#include "mibstore.h" - #include "vgaHW.h" - #include "mipointer.h" - #include "micmap.h" -diff -ru xf86-video-ast-0.93.10.orig/src/ast_cursor.c xf86-video-ast-0.93.10/src/ast_cursor.c ---- xf86-video-ast-0.93.10.orig/src/ast_cursor.c 2012-03-23 21:40:56.000000000 -0400 -+++ xf86-video-ast-0.93.10/src/ast_cursor.c 2014-12-19 02:42:37.258407708 -0500 -@@ -27,7 +27,6 @@ - #include "xf86_OSproc.h" - #include "xf86cmap.h" - #include "compiler.h" --#include "mibstore.h" - #include "vgaHW.h" - #include "mipointer.h" - #include "micmap.h" -diff -ru xf86-video-ast-0.93.10.orig/src/ast_driver.c xf86-video-ast-0.93.10/src/ast_driver.c ---- xf86-video-ast-0.93.10.orig/src/ast_driver.c 2012-03-23 21:40:56.000000000 -0400 -+++ xf86-video-ast-0.93.10/src/ast_driver.c 2014-12-19 02:42:50.710474414 -0500 -@@ -31,7 +31,6 @@ - #endif - #include "xf86cmap.h" - #include "compiler.h" --#include "mibstore.h" - #include "vgaHW.h" - #include "mipointer.h" - #include "micmap.h" -@@ -865,7 +864,6 @@ - } - #endif /* end of Accel_2D */ - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - -diff -ru xf86-video-ast-0.93.10.orig/src/ast_mode.c xf86-video-ast-0.93.10/src/ast_mode.c ---- xf86-video-ast-0.93.10.orig/src/ast_mode.c 2012-03-23 21:40:56.000000000 -0400 -+++ xf86-video-ast-0.93.10/src/ast_mode.c 2014-12-19 02:42:24.894346398 -0500 -@@ -27,7 +27,6 @@ - #include "xf86_OSproc.h" - #include "xf86cmap.h" - #include "compiler.h" --#include "mibstore.h" - #include "vgaHW.h" - #include "mipointer.h" - #include "micmap.h" -diff -ru xf86-video-ast-0.93.10.orig/src/ast_tool.c xf86-video-ast-0.93.10/src/ast_tool.c ---- xf86-video-ast-0.93.10.orig/src/ast_tool.c 2012-03-23 21:40:56.000000000 -0400 -+++ xf86-video-ast-0.93.10/src/ast_tool.c 2014-12-19 02:42:03.930242443 -0500 -@@ -27,7 +27,6 @@ - #include "xf86_OSproc.h" - #include "xf86cmap.h" - #include "compiler.h" --#include "mibstore.h" - #include "vgaHW.h" - #include "mipointer.h" - #include "micmap.h" -diff -ru xf86-video-ast-0.93.10.orig/src/ast_vgatool.c xf86-video-ast-0.93.10/src/ast_vgatool.c ---- xf86-video-ast-0.93.10.orig/src/ast_vgatool.c 2012-03-23 21:40:56.000000000 -0400 -+++ xf86-video-ast-0.93.10/src/ast_vgatool.c 2014-12-19 02:42:18.406314226 -0500 -@@ -27,7 +27,6 @@ - #include "xf86_OSproc.h" - #include "xf86cmap.h" - #include "compiler.h" --#include "mibstore.h" - #include "vgaHW.h" - #include "mipointer.h" - #include "micmap.h" diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 30e46fac7c..90f4bf4f59 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2645,33 +2645,27 @@ as USB mice.") "xf86-video-ark is an Ark Logic video driver for the Xorg X server.") (license license:x11))) -;; This driver depends on XAA which has been removed from xorg-server. -;; -;; (define-public xf86-video-ast -;; (package -;; (name "xf86-video-ast") -;; (version "0.93.10") -;; (source -;; (origin -;; (method url-fetch) -;; (uri (string-append -;; "mirror://xorg/individual/driver/xf86-video-ast-" -;; version -;; ".tar.bz2")) -;; (sha256 -;; (base32 -;; "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69")) -;; (patches (search-patches "xf86-video-ast-remove-mibstore.patch")))) -;; (build-system gnu-build-system) -;; (inputs `(("xorg-server" ,xorg-server))) -;; (native-inputs `(("pkg-config" ,pkg-config))) -;; (home-page "https://www.x.org/wiki/") -;; (synopsis "ASpeed Technologies video driver for X server") -;; (description -;; "xf86-video-ast is an ASpeed Technologies video driver for the Xorg -;; X server.") -;; (license license:x11))) - +(define-public xf86-video-ast + (package + (name "xf86-video-ast") + (version "1.1.5") + (home-page "https://cgit.freedesktop.org/xorg/driver/xf86-video-ast/") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/driver/xf86-video-ast-" + version ".tar.bz2")) + (sha256 + (base32 + "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy")))) + (build-system gnu-build-system) + (inputs `(("xorg-server" ,xorg-server))) + (native-inputs `(("pkg-config" ,pkg-config))) + (synopsis "ASpeed Technologies video driver for X server") + (description + "xf86-video-ast is an ASpeed Technologies video driver for the Xorg +X server.") + (license license:x11))) (define-public xf86-video-ati (package -- cgit v1.2.3 From 622ef2b90aceeb20bddbd168ea4383ba9acbfca0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 19 Sep 2018 15:13:00 +0200 Subject: gnu: arpack-ng: Don't use unstable tarball. * gnu/packages/maths.scm (arpack-ng)[source]: Use GIT-FETCH. --- gnu/packages/maths.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d3e72128ca..b9f36600d8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -462,14 +462,13 @@ computing convex hulls.") (name "arpack-ng") (version "3.6.2") (home-page "https://github.com/opencollab/arpack-ng") - (source - (origin - (method url-fetch) - (uri (string-append home-page "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "16jrvdl0gh78rrfnvrcxwys4slwfh6qmwwjhfc9d6vwrvq184g37")))) + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08yg5rbsnrni9v04x5a8frav6yp7x6lwvai5j93a37b1p59jsgsl")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From f03c4ec64987a339084cd1d43a0c1e402174355b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 19 Sep 2018 15:13:59 +0200 Subject: gnu: arpack-ng: Update to 3.6.3. * gnu/packages/maths.scm (arpack-ng): Update to 3.6.3. --- 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 b9f36600d8..e51afb3bb9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -460,7 +460,7 @@ computing convex hulls.") (define-public arpack-ng (package (name "arpack-ng") - (version "3.6.2") + (version "3.6.3") (home-page "https://github.com/opencollab/arpack-ng") (source (origin (method git-fetch) @@ -468,7 +468,7 @@ computing convex hulls.") (file-name (git-file-name name version)) (sha256 (base32 - "08yg5rbsnrni9v04x5a8frav6yp7x6lwvai5j93a37b1p59jsgsl")))) + "1wljl96yqxc9v8r49c37lscwkdp58kaacfb9p6s6nvpm31haax4y")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From f6ae59c2e04bc85a7e11c0574942335c6843bc65 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 19 Sep 2018 15:14:18 +0200 Subject: gnu: feh: Update to 2.28. * gnu/packages/image-viewers.scm (feh): Update to 2.28. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 87546045a6..512795ce89 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -60,7 +60,7 @@ (define-public feh (package (name "feh") - (version "2.27.1") + (version "2.28") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "10zk76l491s22qrv86rax6cvpgwyl3qq0izl2pbk0k1z1kw3ihvf")))) + "1nfka7w6pzj2bbwx8vydr2wwm7z8mrbqiy1xrq97c1g5bxy2vlhk")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From 4d679255dad798da0bbac22412e4f3f4d09a771a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 19 Sep 2018 15:16:24 +0200 Subject: gnu: glm: Update to 0.9.9.2. * gnu/packages/maths.scm (glm): Update to 0.9.9.2. --- 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 e51afb3bb9..704ae9781b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3229,7 +3229,7 @@ Failure to do so will result in a library with poor performance.") (define-public glm (package (name "glm") - (version "0.9.9.1") + (version "0.9.9.2") (source (origin (method url-fetch) @@ -3237,7 +3237,7 @@ Failure to do so will result in a library with poor performance.") version "/glm-" version ".zip")) (sha256 (base32 - "042a23hmxfs429czkmlg5ixf28aikzfbw18780prj2gcd4flgw8h")))) + "1m2gws1d7l6h4mdn0ap74pfnm3vva3kk8rybdqd5x4lksd1mk6r0")))) (build-system cmake-build-system) (native-inputs `(("unzip" ,unzip))) -- cgit v1.2.3 From 7fd3082522e7007b47a6aa765d10a9cc3277b36d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 19 Sep 2018 10:54:46 +0200 Subject: services: udev: Simplify 'start' method. * gnu/services/base.scm (udev-shepherd-service)[start](find): Remove. (udev): Hardwire the eudev file name. Use 'fork+exec-command' instead of 'primitive-fork' and 'exec-command'. --- gnu/services/base.scm | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 921914ccdf..beb473151d 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1846,16 +1846,9 @@ item of @var{packages}." (documentation "Populate the /dev directory, dynamically.") (start #~(lambda () - (define find - (@ (srfi srfi-1) find)) - (define udevd - ;; Choose the right 'udevd'. - (find file-exists? - (map (lambda (suffix) - (string-append #$udev suffix)) - '("/libexec/udev/udevd" ;udev - "/sbin/udevd")))) ;eudev + ;; 'udevd' from eudev. + #$(file-append udev "/sbin/udevd")) (define (wait-for-udevd) ;; Wait until someone's listening on udevd's control @@ -1891,24 +1884,20 @@ item of @var{packages}." (make-static-device-nodes directory) (umask old-umask)) - (let ((pid (primitive-fork))) - (case pid - ((0) - (exec-command (list udevd))) - (else - ;; Wait until udevd is up and running. This - ;; appears to be needed so that the events - ;; triggered below are actually handled. - (wait-for-udevd) - - ;; Trigger device node creation. - (system* #$(file-append udev "/bin/udevadm") - "trigger" "--action=add") - - ;; Wait for things to settle down. - (system* #$(file-append udev "/bin/udevadm") - "settle") - pid))))) + (let ((pid (fork+exec-command (list udevd)))) + ;; Wait until udevd is up and running. This appears to + ;; be needed so that the events triggered below are + ;; actually handled. + (wait-for-udevd) + + ;; Trigger device node creation. + (system* #$(file-append udev "/bin/udevadm") + "trigger" "--action=add") + + ;; Wait for things to settle down. + (system* #$(file-append udev "/bin/udevadm") + "settle") + pid))) (stop #~(make-kill-destructor)) ;; When halting the system, 'udev' is actually killed by -- cgit v1.2.3 From 241358dc94b3c2039a4aa05bcb18b4d1ef6f6d35 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 19 Sep 2018 12:41:45 +0200 Subject: services: networking: Remove unbound variable reference in 'stop'. * gnu/services/base.scm (static-networking-shepherd-service): Remove spurious ":" in 'stop' method inadvertently introduced in commit c9436025a90b86047ba2203d58bbf238f8f9b2f9. --- 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 beb473151d..5ba2c6b86d 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2122,7 +2122,7 @@ This service is not part of @var{%base-services}." AF_INET INADDR_ANY 0))) (set-network-interface-flags sock #$interface 0) (close-port sock) -: #f))) + #f))) (respawn? #f)))))) (define (static-networking-etc-files interfaces) -- cgit v1.2.3 From 7b6b7cdcc5d50cb25c140145b30028c5569c62af Mon Sep 17 00:00:00 2001 From: Andy Patterson Date: Thu, 30 Aug 2018 01:36:28 -0400 Subject: build-system/asdf: Handle all asdf dependency specifications. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add support for dependencies of the form (:version ), (:feature ) and (:require ), as defined by . * guix/build/lisp-utils.scm (normalize-dependency): New variable. (make-asd-file)[dependencies]: Use it to generate dependencies with normalized names. [dependency-name]: New variable. [registry]: Use it to flatten the normalized dependencies. Signed-off-by: Ludovic Courtès --- guix/build/lisp-utils.scm | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm index 21cb620d59..3a7afab43d 100644 --- a/guix/build/lisp-utils.scm +++ b/guix/build/lisp-utils.scm @@ -81,6 +81,20 @@ "Replace invalid characters in STR with a hyphen." (string-join (string-tokenize str valid-char-set) "-")) +(define (normalize-dependency dependency) + "Normalize the name of DEPENDENCY. Handles dependency definitions of the +dependency-def form described by +." + (match dependency + ((':version name rest ...) + `(:version ,(normalize-string name) ,@rest)) + ((':feature feature-specification dependency-specification) + `(:feature + ,feature-specification + ,(normalize-dependency dependency-specification))) + ((? string? name) (normalize-string name)) + (require-specification require-specification))) + (define (inputs->asd-file-map inputs) "Produce a hash table of the form (system . asd-file), where system is the name of an ASD system, and asd-file is the full path to its definition." @@ -273,16 +287,24 @@ system to find its dependencies, as described by GENERATE-DEPENDENCY-LINKS." (system-dependencies system system-asd-file))) (if (eq? 'NIL deps) '() - (map normalize-string deps)))) + (map normalize-dependency deps)))) (define lisp-input-map (inputs->asd-file-map inputs)) + (define dependency-name + (match-lambda + ((':version name _ ...) name) + ((':feature _ dependency-specification) + (dependency-name dependency-specification)) + ((? string? name) name) + (_ #f))) + (define registry (filter-map hash-get-handle (make-list (length dependencies) lisp-input-map) - dependencies)) + (map dependency-name dependencies))) (call-with-output-file asd-file (lambda (port) -- cgit v1.2.3 From 29a3ffb44623701c2c24b8e921e23d03dde02a4a Mon Sep 17 00:00:00 2001 From: Andy Patterson Date: Thu, 30 Aug 2018 01:36:29 -0400 Subject: build-system/asdf: Log lisp system invocations. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/build/lisp-system.scm: (lisp-eval-program): Log the arguments to system*. Signed-off-by: Ludovic Courtès --- guix/build/lisp-utils.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm index 3a7afab43d..9cf479dac5 100644 --- a/guix/build/lisp-utils.scm +++ b/guix/build/lisp-utils.scm @@ -119,9 +119,10 @@ name of an ASD system, and asd-file is the full path to its definition." (define (lisp-eval-program program) "Evaluate PROGRAM with a given LISP implementation." - (unless (zero? (apply system* - (lisp-invocation program))) - (error "lisp-eval-program failed!" (%lisp) program))) + (define invocation (lisp-invocation program)) + (format #t "Invoking ~a: ~{~s ~}~%" (%lisp-type) invocation) + (unless (zero? (apply system* invocation)) + (error "lisp-eval-program failed!" invocation))) (define (spread-statements program argument-name) "Return a list with the statements from PROGRAM spread between -- cgit v1.2.3 From e831a1668b0556068343dce8cecacef2014a96e9 Mon Sep 17 00:00:00 2001 From: Andy Patterson Date: Thu, 30 Aug 2018 01:36:30 -0400 Subject: build-system/asdf: Use invoke. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/build/lisp-utils.scm (lisp-eval-program): Replace system* and error handling with invoke. Signed-off-by: Ludovic Courtès --- guix/build/lisp-utils.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm index 9cf479dac5..7c0a68ca97 100644 --- a/guix/build/lisp-utils.scm +++ b/guix/build/lisp-utils.scm @@ -121,8 +121,7 @@ name of an ASD system, and asd-file is the full path to its definition." "Evaluate PROGRAM with a given LISP implementation." (define invocation (lisp-invocation program)) (format #t "Invoking ~a: ~{~s ~}~%" (%lisp-type) invocation) - (unless (zero? (apply system* invocation)) - (error "lisp-eval-program failed!" invocation))) + (apply invoke invocation)) (define (spread-statements program argument-name) "Return a list with the statements from PROGRAM spread between -- cgit v1.2.3 From 5f6908d664c3af6bd1805a769640ba5240602230 Mon Sep 17 00:00:00 2001 From: Andy Patterson Date: Thu, 30 Aug 2018 01:36:31 -0400 Subject: build-system/asdf: Adopt asdf conventions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The asdf documentation specifies that asdf:load-asd should be preferred to calling load on a system definition file. * guix/build/lisp-utils.scm (compile-system): Replace load with asdf:load-asd. (system-dependencies): Likewise. (test-system): Likewise. Signed-off-by: Ludovic Courtès --- guix/build/lisp-utils.scm | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm index 7c0a68ca97..6470cfec97 100644 --- a/guix/build/lisp-utils.scm +++ b/guix/build/lisp-utils.scm @@ -152,8 +152,7 @@ with PROGRAM." first." (lisp-eval-program `((require :asdf) - (let ((*package* (find-package :asdf))) - (load ,asd-file)) + (asdf:load-asd (truename ,asd-file) :name ,(normalize-string system)) (asdf:operate 'asdf:compile-bundle-op ,system)))) (define (system-dependencies system asd-file) @@ -162,8 +161,7 @@ asdf:system-depends-on. First load the system's ASD-FILE." (define deps-file ".deps.sexp") (define program `((require :asdf) - (let ((*package* (find-package :asdf))) - (load ,asd-file)) + (asdf:load-asd (truename ,asd-file) :name ,(normalize-string system)) (with-open-file (stream ,deps-file :direction :output) (format stream @@ -203,19 +201,18 @@ asdf:system-depends-on. First load the system's ASD-FILE." Also load TEST-ASD-FILE if necessary." (lisp-eval-program `((require :asdf) - (let ((*package* (find-package :asdf))) - (load ,asd-file) - ,@(if test-asd-file - `((load ,test-asd-file)) - ;; Try some likely files. - (map (lambda (file) - `(when (uiop:file-exists-p ,file) - (load ,file))) - (list - (string-append system "-tests.asd") - (string-append system "-test.asd") - "tests.asd" - "test.asd")))) + (asdf:load-asd (truename ,asd-file) :name ,(normalize-string system)) + ,@(if test-asd-file + `((asdf:load-asd (truename ,test-asd-file))) + ;; Try some likely files. + (map (lambda (file) + `(when (uiop:file-exists-p ,file) + (asdf:load-asd (truename ,file)))) + (list + (string-append system "-tests.asd") + (string-append system "-test.asd") + "tests.asd" + "test.asd"))) (asdf:test-system ,system)))) (define (string->lisp-keyword . strings) -- cgit v1.2.3 From 1d98b44ea6618f602fb1f54eb07109a1fe92cefd Mon Sep 17 00:00:00 2001 From: Andy Patterson Date: Thu, 30 Aug 2018 01:36:32 -0400 Subject: gnu: sbcl-slynk: Fix the build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lisp.scm (sbcl-slynk-boot0): Update to commit cbf84c36c4eca8b032e3fd16177a7bc02df3ec4c. [origin]: Replace slynk/util references with the built system name slynk-util. Remove compile-time invocations of slynk-require. (sbcl-slynk-util): Inherit from sbcl-slynk-boot0. [inputs]: Add sbcl-slynk-boot0. [arguments]: Set an appropriate asd-file and asd-system-name. (sbcl-slynk-arglists)[arguments]: Set an appropriate asdf-system-name. (sbcl-slynk-fancy-inspector)[arguments]: Likewise. (sbcl-slynk-package-fu)[arguments]: Likewise. (sbcl-slynk-mrepl)[arguments]: Likewise. (sbcl-slynk-trace-dialog)[arguments]: Likewise. (sbcl-slynk-profiler)[arguments]: Likewise. (sbcl-slynk-indentation)[arguments]: Likewise. (sbcl-slynk-retro)[arguments]: Likewise. Signed-off-by: Ludovic Courtès --- gnu/packages/lisp.scm | 68 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f9e03b18b6..82ba6eedf0 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1011,8 +1011,8 @@ productive, customizable lisp based systems.") ;; we expose the union of these as `sbcl-slynk'. The following variable ;; describes the base module. (define sbcl-slynk-boot0 - (let ((revision "1") - (commit "5706cd45d484a4f25795abe8e643509d31968aa2")) + (let ((revision "2") + (commit "cbf84c36c4eca8b032e3fd16177a7bc02df3ec4c")) (package (name "sbcl-slynk-boot0") (version (string-append "1.0.0-beta-" revision "." (string-take commit 7))) @@ -1024,7 +1024,7 @@ productive, customizable lisp based systems.") (url "https://github.com/joaotavora/sly.git") (commit commit))) (sha256 - (base32 "0h4gg3sndl2bf6jdnx9nrf14p9hhi43hagrl0f4v4l11hczl8w81")) + (base32 "13dyhsravn591p7g6is01mp2ynzjnnj7pwgi57r6xqmd4611y9vh")) (file-name (string-append "slynk-" version "-checkout")) (modules '((guix build utils) (ice-9 ftw))) @@ -1035,14 +1035,19 @@ productive, customizable lisp based systems.") (substitute* "slynk/slynk.asd" (("\\.\\./contrib") "contrib") - (("\\(defsystem :slynk-util") - "(defsystem :slynk-util :depends-on (:slynk)")) + (("\\(defsystem :slynk/util") + "(defsystem :slynk/util :depends-on (:slynk)") + ((":depends-on \\(:slynk :slynk/util\\)") + ":depends-on (:slynk :slynk-util)")) (substitute* "contrib/slynk-trace-dialog.lisp" (("\\(slynk::reset-inspector\\)") ; Causes problems on load "nil")) (substitute* "contrib/slynk-profiler.lisp" (("slynk:to-line") "slynk-pprint-to-line")) + (substitute* "contrib/slynk-fancy-inspector.lisp" + (("slynk/util") "slynk-util") + ((":compile-toplevel :load-toplevel") "")) (rename-file "contrib" "slynk/contrib") ;; Move slynk's contents into the base directory for easier ;; access @@ -1082,15 +1087,20 @@ multiple inspectors with independent history.") (arguments (substitute-keyword-arguments (package-arguments sbcl-slynk-boot0) ((#:asd-file _ "") "slynk.asd") - ((#:asd-system-name _ #f) #f))))) + ((#:asd-system-name _ #f) "slynk/arglists"))))) (define ecl-slynk-arglists (sbcl-package->ecl-package sbcl-slynk-arglists)) (define sbcl-slynk-util (package - (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-util"))) + (inherit sbcl-slynk-boot0) + (name "sbcl-slynk-util") + (inputs `(("slynk" ,sbcl-slynk-boot0))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-boot0) + ((#:asd-file _ "") "slynk.asd") + ((#:asd-system-name _ #f) "slynk/util"))))) (define ecl-slynk-util (sbcl-package->ecl-package sbcl-slynk-util)) @@ -1100,7 +1110,10 @@ multiple inspectors with independent history.") (inherit sbcl-slynk-arglists) (name "sbcl-slynk-fancy-inspector") (inputs `(("slynk-util" ,sbcl-slynk-util) - ,@(package-inputs sbcl-slynk-arglists))))) + ,@(package-inputs sbcl-slynk-arglists))) + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/fancy-inspector"))))) (define ecl-slynk-fancy-inspector (sbcl-package->ecl-package sbcl-slynk-fancy-inspector)) @@ -1108,15 +1121,21 @@ multiple inspectors with independent history.") (define sbcl-slynk-package-fu (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-package-fu"))) + (name "sbcl-slynk-package-fu") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/package-fu"))))) (define ecl-slynk-package-fu (sbcl-package->ecl-package sbcl-slynk-package-fu)) (define sbcl-slynk-mrepl (package - (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-mrepl"))) + (inherit sbcl-slynk-fancy-inspector) + (name "sbcl-slynk-mrepl") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/mrepl"))))) (define ecl-slynk-mrepl (sbcl-package->ecl-package sbcl-slynk-mrepl)) @@ -1124,7 +1143,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-trace-dialog (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-trace-dialog"))) + (name "sbcl-slynk-trace-dialog") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/trace-dialog"))))) (define ecl-slynk-trace-dialog (sbcl-package->ecl-package sbcl-slynk-trace-dialog)) @@ -1132,7 +1154,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-profiler (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-profiler"))) + (name "sbcl-slynk-profiler") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/profiler"))))) (define ecl-slynk-profiler (sbcl-package->ecl-package sbcl-slynk-profiler)) @@ -1140,7 +1165,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-stickers (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-stickers"))) + (name "sbcl-slynk-stickers") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/stickers"))))) (define ecl-slynk-stickers (sbcl-package->ecl-package sbcl-slynk-stickers)) @@ -1148,7 +1176,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-indentation (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-indentation"))) + (name "sbcl-slynk-indentation") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/indentation"))))) (define ecl-slynk-indentation (sbcl-package->ecl-package sbcl-slynk-indentation)) @@ -1156,7 +1187,10 @@ multiple inspectors with independent history.") (define sbcl-slynk-retro (package (inherit sbcl-slynk-arglists) - (name "sbcl-slynk-retro"))) + (name "sbcl-slynk-retro") + (arguments + (substitute-keyword-arguments (package-arguments sbcl-slynk-arglists) + ((#:asd-system-name _ #f) "slynk/retro"))))) (define ecl-slynk-retro (sbcl-package->ecl-package sbcl-slynk-retro)) -- cgit v1.2.3 From 508d5c5fa883a3cee53f8da358d853d4b245496c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 15 Sep 2018 23:35:17 -0400 Subject: gnu: OpenSC: Update to 0.19.0 [security fixes]. Fixes CVE-2018-{16391,16392,16393,16418,16419,16420,16421,16422,16423,16424, 16425,16426,16427}. * gnu/packages/security-token.scm (opensc): Update to 0.19.0. --- gnu/packages/security-token.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 4b748b6644..2ebf09cfe2 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -220,7 +220,7 @@ website for more information about Yubico and the YubiKey.") (define-public opensc (package (name "opensc") - (version "0.18.0") + (version "0.19.0") (source (origin (method url-fetch) (uri (string-append @@ -228,7 +228,7 @@ website for more information about Yubico and the YubiKey.") version "/opensc-" version ".tar.gz")) (sha256 (base32 - "0mrpik6ifzh27ws7h0viv8nwgcdj3fp5whaldmj0zhfi1l1zzh4v")))) + "09jqzl18z5qfrf4vf2nvbpdm3mphpgfkl3ww1clkaxh2z56hwnic")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From e266043e670f4318679664f3af4401dab7cce52b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 19 Sep 2018 17:31:34 -0400 Subject: gnu: shotwell: Update to 0.28.4. * gnu/packages/gnome.scm (shotwell): Update to 0.28.4. --- 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 1a0cc9cc11..6a34e81f13 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4432,7 +4432,7 @@ metadata in photo and video files of various formats.") (define-public shotwell (package (name "shotwell") - (version "0.28.0") + (version "0.28.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4440,7 +4440,7 @@ metadata in photo and video files of various formats.") name "-" version ".tar.xz")) (sha256 (base32 - "1d797nmlz9gs6ri0h65b76s40ss6ma6h6405xqx03lhg5xni3kmg")))) + "03k7n2kmzqn11kf3733w7m6xjh2b5q9xr84za2hli11fjymzaxm9")))) (build-system glib-or-gtk-build-system) (propagated-inputs `(("dconf" ,dconf))) -- cgit v1.2.3 From 29a000b6028e69877c4697a37f5cdef256807129 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Sep 2018 15:28:46 +0200 Subject: gnu: sg3-utils: Update to 1.44. * gnu/packages/scsi.scm (sg3-utils): Update to 1.44. --- gnu/packages/scsi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index f011af84c4..f8c5d5ef60 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -27,14 +27,14 @@ (define-public sg3-utils (package (name "sg3-utils") - (version "1.43") + (version "1.44") (source (origin (method url-fetch) (uri (string-append "http://sg.danny.cz/sg/p/sg3_utils-" version ".tar.xz")) (sha256 (base32 - "04l58wvncqk6lfh4lashsl3ccsa1114hkd6vwi1h1cbmq2fw9c8v")))) + "01avlgrbxlij8spish4i69ji1m49biz4mbayzzc2qx0hcl8ar56a")))) (build-system gnu-build-system) (home-page "http://sg.danny.cz/sg/sg3_utils.html") (synopsis "SCSI device utilities") -- cgit v1.2.3 From e564d33ce8b7bda66c3e8ef0779cef03890838da Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Sep 2018 14:33:10 +0200 Subject: gnu: gourmet: Use HTTPS home page. * gnu/packages/nutrition.scm (gourmet)[home-page]: Use HTTPS. --- gnu/packages/nutrition.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/nutrition.scm b/gnu/packages/nutrition.scm index 5006f99ffc..9397630afd 100644 --- a/gnu/packages/nutrition.scm +++ b/gnu/packages/nutrition.scm @@ -65,7 +65,7 @@ (lambda* (#:key make-flags #:allow-other-keys) (invoke "python" "setup.py" "install" "--prefix" (assoc-ref %outputs "out"))))))) - (home-page "http://thinkle.github.io/gourmet/") + (home-page "https://thinkle.github.io/gourmet/") (synopsis "Recipe organizer") (description "Gourmet Recipe Manager is a recipe organizer that allows you to collect, -- cgit v1.2.3 From 7616d75fd68b3a0af3861c3f86e82d3ae7fb7677 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Sep 2018 04:08:17 +0200 Subject: Use INVOKE in (gnu packages telephony). * gnu/packages/telephony.scm (libiax2, mumble)[arguments]: Use INVOKE. --- gnu/packages/telephony.scm | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 2055034117..05916cde5c 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Francesco Frassinelli ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Jovany Leandro G.C ;;; ;;; This file is part of GNU Guix. @@ -314,7 +314,7 @@ protocol (RFC 3550).") `(#:phases (modify-phases %standard-phases (add-after 'unpack 'autoconf (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) + (invoke "autoreconf" "-vfi")))))) (home-page "https://gitlab.savoirfairelinux.com/sflphone/libiax2") (synopsis "Inter-Asterisk-Protocol library") (description "LibIAX2 implements the Inter-Asterisk-Protocol for relaying @@ -393,27 +393,27 @@ address of one of the participants.") (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "qmake" "main.pro" "-recursive" - (string-append "CONFIG+=" - (string-join - (list "no-update" - "no-ice" - "no-embed-qt-translations" - "no-bundled-speex" - "pch" - "no-bundled-opus" - "no-celt" - "no-alsa" - "no-oss" - "no-portaudio" - "speechd" - "no-g15" - "no-bonjour" - "release"))) - (string-append "DEFINES+=" - "PLUGIN_PATH=" - (assoc-ref outputs "out") - "/lib/mumble"))))) + (invoke "qmake" "main.pro" "-recursive" + (string-append "CONFIG+=" + (string-join + (list "no-update" + "no-ice" + "no-embed-qt-translations" + "no-bundled-speex" + "pch" + "no-bundled-opus" + "no-celt" + "no-alsa" + "no-oss" + "no-portaudio" + "speechd" + "no-g15" + "no-bonjour" + "release"))) + (string-append "DEFINES+=" + "PLUGIN_PATH=" + (assoc-ref outputs "out") + "/lib/mumble")))) (add-before 'configure 'fix-libspeechd-include (lambda _ (substitute* "src/mumble/TextToSpeech_unix.cpp" -- cgit v1.2.3 From 4f66ae2899c3ba6cd49845e40641ba93b47e0a76 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Sep 2018 23:15:10 +0200 Subject: gnu: ruby-heredoc-unindent: Fix typo in description. * gnu/packages/ruby.scm (ruby-heredoc-unindent)[description]: Fix typo. --- gnu/packages/ruby.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 76e3cee81e..99ad125e3c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5873,7 +5873,7 @@ hashes more powerful.") (synopsis "Heredoc indentation cleaner") (description "This gem removes common margin from indented strings, such as the ones produced by indented heredocs. In other words, it strips out -leading whitespace chars at the beggining of each line, but only as much as +leading whitespace chars at the beginning of each line, but only as much as the line with the smallest margin. It is acknowledged that many strings defined by heredocs are just code and -- cgit v1.2.3 From 9923d5a40fa3e5950c2291d84b34961af497294e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Sep 2018 03:23:37 +0200 Subject: gnu: Use INVOKE & return #t from Ruby package phases. * gnu/packages/maths.scm (ruby-asciimath)[arguments]: Return #t from all phases. * gnu/packages/rails.scm (ruby-debug-inspector)[arguments]: Substitute INVOKE for SYSTEM*. * gnu/packages/ruby.scm (ruby-permutation, ruby-blankslate) (ruby-minitest-pretty-diff, ruby-guard, ruby-rb-inotify, ruby-tins) (ruby-gem-hadar, ruby-term-ansicolor, ruby-json-pure) (ruby-activesupport, ruby-redcloth, ruby-netrc, ruby-unf-ext, ruby-yard) (ruby-turn, ruby-sqlite3, ruby-shoulda-context, ruby-shoulda-matchers) (ruby-shoulda, ruby-httpclient, ruby-ansi, ruby-bio-commandeer) (ruby-rubytest, ruby-brass, ruby-qed, ruby-ae, ruby-lemon, ruby-hashery) (ruby-rc4, ruby-concurrent)[arguments]: Likewise. --- gnu/packages/maths.scm | 3 ++- gnu/packages/rails.scm | 14 +++++----- gnu/packages/ruby.scm | 73 +++++++++++++++++++++++++------------------------- 3 files changed, 44 insertions(+), 46 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 704ae9781b..736bac163e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2084,7 +2084,8 @@ porting.") (lambda _ (substitute* "spec/parser_spec.rb" (("\\\\\"") - "\""))))))) + "\"")) + #t))))) (native-inputs `(("bundler" ,bundler) ("ruby-rspec" ,ruby-rspec))) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 7f171eaa6e..5348d914cf 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Matthew Jordan +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,14 +81,11 @@ migration.") (modify-phases %standard-phases (replace 'check (lambda _ - (and - (zero? (system* "rake" "compile")) - (zero? - (system* - "ruby" "-Ilib" "-e" - (string-append - "require 'debug_inspector'; RubyVM::DebugInspector." - "open{|dc| p dc.backtrace_locations}"))))))))) + (invoke "rake" "compile") + (invoke "ruby" "-Ilib" "-e" + (string-append + "require 'debug_inspector'; RubyVM::DebugInspector." + "open{|dc| p dc.backtrace_locations}"))))))) (synopsis "Ruby wrapper for the MRI 2.0 debug_inspector API") (description "This package provides a Ruby wrapper for the MRI 2.0 debug_inspector diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 99ad125e3c..3673bf2346 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1114,7 +1114,7 @@ and inspect the environment.") #t)) (replace 'check (lambda _ - (zero? (system* "ruby" "-Ilib" "test/test.rb"))))))) + (invoke "ruby" "-Ilib" "test/test.rb")))))) (synopsis "Library to perform operations with sequence permutations") (description "This package provides a Ruby library to perform different operations with permutations of sequences, such as strings and arrays.") @@ -1618,7 +1618,7 @@ objects.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? (system* "rspec" "spec/"))))))) + (lambda _ (invoke "rspec" "spec/")))))) (native-inputs `(("bundler" ,bundler) ("ruby-rspec" ,ruby-rspec))) @@ -2028,7 +2028,7 @@ is to be run.") (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "script/test"))))))) + (invoke "script/test")))))) (native-inputs `(("bundler" ,bundler) ("ruby-turn" ,ruby-turn))) @@ -2603,7 +2603,7 @@ invocation, and source and documentation browsing.") #t)) (replace 'build (lambda _ - (zero? (system* "gem" "build" "guard.gemspec"))))))) + (invoke "gem" "build" "guard.gemspec")))))) (propagated-inputs `(("ruby-formatador" ,ruby-formatador) ("ruby-listen" ,ruby-listen) @@ -2718,7 +2718,7 @@ IANA Time Zone database packaged as Ruby modules for use with @code{TZInfo}.") ;; list of files. (replace 'build (lambda _ - (zero? (system* "gem" "build" "rb-inotify.gemspec"))))))) + (invoke "gem" "build" "rb-inotify.gemspec")))))) (propagated-inputs `(("ruby-ffi" ,ruby-ffi))) (native-inputs @@ -2811,7 +2811,7 @@ documentation for Ruby code.") ;; causes an error. (substitute* "tins.gemspec" (("\"lib/spruz\", ") "")) - (zero? (system* "gem" "build" "tins.gemspec"))))))) + (invoke "gem" "build" "tins.gemspec")))))) (synopsis "Assorted tools for Ruby") (description "Tins is a Ruby library providing assorted tools.") (home-page "https://github.com/flori/tins") @@ -2836,7 +2836,7 @@ documentation for Ruby code.") (modify-phases %standard-phases (replace 'build (lambda _ - (zero? (system* "gem" "build" "gem_hadar.gemspec"))))))) + (invoke "gem" "build" "gem_hadar.gemspec")))))) (propagated-inputs `(("git" ,git) ("ruby-tins" ,ruby-tins) @@ -2913,7 +2913,7 @@ Ruby's large and slower test/unit.") (modify-phases %standard-phases (replace 'build (lambda _ - (zero? (system* "gem" "build" "term-ansicolor.gemspec"))))))) + (invoke "gem" "build" "term-ansicolor.gemspec")))))) (propagated-inputs `(("ruby-tins" ,ruby-tins))) (native-inputs @@ -3021,7 +3021,7 @@ a native C extension.") (lambda _ ;; Regenerate gemspec so loosened dependency constraints are ;; propagated. - (zero? (system* "rake" "gemspec"))))))) + (invoke "rake" "gemspec")))))) (native-inputs `(("bundler" ,bundler) ("ragel" ,ragel) @@ -3105,8 +3105,8 @@ you about the changes.") (modify-phases %standard-phases (replace 'check (lambda _ - ;; There is no tests, instead attempt to load the library. - (zero? (system* "ruby" "-Ilib" "-r" "active_support"))))))) + ;; There are no tests, instead attempt to load the library. + (invoke "ruby" "-Ilib" "-r" "active_support")))))) (propagated-inputs `(("ruby-concurrent" ,ruby-concurrent) ("ruby-i18n" ,ruby-i18n) @@ -3316,7 +3316,7 @@ alternative to Marshal for Object serialization. ") ;; existing gemspec. (replace 'build (lambda _ - (zero? (system* "gem" "build" "redcloth.gemspec"))))))) + (invoke "gem" "build" "redcloth.gemspec")))))) (native-inputs `(("bundler" ,bundler) ("ruby-diff-lcs" ,ruby-diff-lcs) @@ -3394,9 +3394,9 @@ other things and it comes with a command line interface.") ;; There is no Rakefile and minitest can only run one file at once, ;; so we have to iterate over all test files. (lambda _ - (and (map (lambda (file) - (zero? (system* "ruby" "-Itest" file))) - (find-files "./test" "test_.*\\.rb")))))))) + (map (lambda (file) + (invoke "ruby" "-Itest" file)) + (find-files "./test" "test_.*\\.rb"))))))) (native-inputs `(("ruby-minitest" ,ruby-minitest))) (synopsis "Library to read and update netrc files") @@ -3421,7 +3421,7 @@ including comments and whitespace.") `(#:phases (modify-phases %standard-phases (add-after 'build 'build-ext - (lambda _ (zero? (system* "rake" "compile:unf_ext"))))))) + (lambda _ (invoke "rake" "compile:unf_ext")))))) (native-inputs `(("bundler" ,bundler) ("ruby-rake-compiler" ,ruby-rake-compiler) @@ -3797,7 +3797,7 @@ A modified copy of yajl is used, and included in the package.") ;; $HOME needs to be set to somewhere writeable for tests to run (setenv "HOME" "/tmp") ;; Run tests without using 'rake' to avoid dependencies. - (zero? (system* "rspec"))))))) + (invoke "rspec")))))) (native-inputs `(("ruby-rspec" ,ruby-rspec) ("ruby-rack" ,ruby-rack))) @@ -3984,7 +3984,7 @@ name and provides query methods such as @{RubyEngine.mri?}.") ;; without issue. (replace 'check (lambda _ - (zero? (system* "ruby" "-Ilib" "bin/turn" "-h"))))))) + (invoke "ruby" "-Ilib" "bin/turn" "-h")))))) (propagated-inputs `(("ruby-ansi" ,ruby-ansi) ("ruby-minitest" ,ruby-minitest-4))) @@ -4124,7 +4124,7 @@ neither too verbose nor too minimal.") #t)) (add-before 'check 'add-gemtest-file ;; This file exists in the repository but is not distributed. - (lambda _ (zero? (system* "touch" ".gemtest"))))))) + (lambda _ (invoke "touch" ".gemtest")))))) (inputs `(("sqlite" ,sqlite))) (native-inputs @@ -4158,7 +4158,7 @@ engine.") (lambda _ ;; Do not run tests to avoid circular dependence with rails. ;; Instead just import the library to test. - (zero? (system* "ruby" "-Ilib" "-r" "shoulda-context"))))))) + (invoke "ruby" "-Ilib" "-r" "shoulda-context")))))) (synopsis "Test::Unit context framework extracted from Shoulda") (description "@code{shoulda-context} is the context framework extracted from Shoulda. @@ -4187,7 +4187,7 @@ names.") (lambda _ ;; Do not run tests to avoid circular dependence with rails. Instead ;; just import the library to test. - (zero? (system* "ruby" "-Ilib" "-r" "shoulda-matchers"))))))) + (invoke "ruby" "-Ilib" "-r" "shoulda-matchers")))))) (propagated-inputs `(("ruby-activesupport" ,ruby-activesupport))) (synopsis "Collection of testing matchers extracted from Shoulda") @@ -4227,7 +4227,7 @@ more complex, and error-prone.") (replace 'check ;; Don't run tests to avoid circular dependence with rails. Instead ;; just import the library to test. - (lambda _ (zero? (system* "ruby" "-Ilib" "-r" "shoulda"))))))) + (lambda _ (invoke "ruby" "-Ilib" "-r" "shoulda")))))) (propagated-inputs `(("ruby-shoulda-context" ,ruby-shoulda-context) ("ruby-shoulda-matchers" ,ruby-shoulda-matchers-2))) @@ -4380,10 +4380,9 @@ It has built-in support for the legacy @code{cookies.txt} and (replace 'check (lambda* (#:key tests? #:allow-other-keys) (if tests? - (zero? - (system* "ruby" - "-Ilib" - "test/runner.rb")) + (invoke "ruby" + "-Ilib" + "test/runner.rb") #t)))))) (native-inputs `(("ruby-rack" ,ruby-rack))) @@ -4422,7 +4421,7 @@ requests either using arguments or with an interactive prompt.") ;; be require'd. (replace 'check (lambda _ - (zero? (system* "ruby" "-Ilib" "-r" "ansi")))) + (invoke "ruby" "-Ilib" "-r" "ansi"))) (add-before 'validate-runpath 'replace-broken-symlink (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -4493,7 +4492,7 @@ subprocess.") ;; Run test without calling 'rake' so that jeweler is ;; not required as an input. (lambda _ - (zero? (system* "rspec" "spec/bio-commandeer_spec.rb"))))))) + (invoke "rspec" "spec/bio-commandeer_spec.rb")))))) (propagated-inputs `(("ruby-bio-logger" ,ruby-bio-logger) ("ruby-systemu" ,ruby-systemu))) @@ -4530,7 +4529,7 @@ detail to ease debugging.") (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "ruby" "-Ilib" "-r" "rubytest"))))))) + (invoke "ruby" "-Ilib" "-r" "rubytest")))))) (propagated-inputs `(("ruby-ansi" ,ruby-ansi))) (synopsis "Universal test harness for Ruby") @@ -4560,7 +4559,7 @@ single pass.") (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "ruby" "-Ilib" "-r" "brass"))))))) + (invoke "ruby" "-Ilib" "-r" "brass")))))) (synopsis "Basic foundational assertions framework") (description "BRASS (Bare-Metal Ruby Assertion System Standard) is a basic @@ -4588,7 +4587,7 @@ make use of.") (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "ruby" "-Ilib" "bin/qed" "--copyright"))))))) + (invoke "ruby" "-Ilib" "bin/qed" "--copyright")))))) (propagated-inputs `(("ruby-ansi" ,ruby-ansi) ("ruby-brass" ,ruby-brass))) @@ -4622,7 +4621,7 @@ requirement specifications systems like Cucumber.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? (system* "qed")))) + (lambda _ (invoke "qed"))) (add-before 'validate-runpath 'replace-broken-symlink (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -4660,7 +4659,7 @@ for reuse by other test frameworks.") (arguments `(#:phases (modify-phases %standard-phases - (replace 'check (lambda _ (zero? (system* "qed"))))))) + (replace 'check (lambda _ (invoke "qed")))))) (propagated-inputs `(("ruby-ae" ,ruby-ae) ("ruby-ansi" ,ruby-ansi) @@ -4716,8 +4715,8 @@ Rubytest-based test frameworks. It provides the @code{rubytest} executable.") (modify-phases %standard-phases (replace 'check (lambda _ - (and (zero? (system* "qed")) - (zero? (system* "rubytest" "-Ilib" "-Itest" "test/")))))))) + (invoke "qed") + (invoke "rubytest" "-Ilib" "-Itest" "test/")))))) (native-inputs `(("ruby-rubytest-cli" ,ruby-rubytest-cli) ("ruby-qed" ,ruby-qed) @@ -4751,7 +4750,7 @@ specific use case.") (modify-phases %standard-phases (replace 'check (lambda _ - (zero? (system* "rspec" "spec/rc4_spec.rb"))))))) + (invoke "rspec" "spec/rc4_spec.rb")))))) (native-inputs `(("ruby-rspec" ,ruby-rspec-2))) (synopsis "Implementation of the RC4 algorithm") @@ -5005,7 +5004,7 @@ call.") (add-before 'check 'rake-compile ;; Fix the test error described at ;; https://github.com/ruby-concurrency/concurrent-ruby/pull/408 - (lambda _ (zero? (system* "rake" "compile")))) + (lambda _ (invoke "rake" "compile"))) (add-before 'check 'remove-timecop-dependency ;; Remove timecop-dependent tests as having timecop as a depedency ;; causes circular depedencies. -- cgit v1.2.3 From 2385ecb22450f7d6671013808df1398945b80264 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Sep 2018 04:13:51 +0200 Subject: Use INVOKE in (gnu packages shells). * gnu/packages/shells.scm (mksh)[arguments]: Use INVOKE... (scsh)[arguments]: ...and also return #t from all phases. --- gnu/packages/shells.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 245496aaaf..8362d00f60 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -417,7 +417,7 @@ use of experts and novices alike.") #t)) (add-after 'unpack 'autoreconf (lambda _ - (zero? (system* "autoreconf"))))))) + (invoke "autoreconf")))))) (inputs `(("scheme48" ,scheme48) ("scheme48-rx" ,scheme48-rx))) @@ -623,7 +623,7 @@ interactive POSIX shell targeted at resource-constrained systems.") (replace 'build (lambda _ (setenv "CC" "gcc") - (zero? (system* (which "sh") "Build.sh")))) + (invoke (which "sh") "Build.sh"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -632,7 +632,8 @@ interactive POSIX shell targeted at resource-constrained systems.") (install-file "mksh" bin) (with-directory-excursion bin (symlink "mksh" "ksh")) - (install-file "mksh.1" man))))))) + (install-file "mksh.1" man) + #t)))))) (home-page "https://www.mirbsd.org/mksh.htm") (synopsis "Korn Shell from MirBSD") (description "mksh is an actively developed free implementation of the -- cgit v1.2.3 From e61c2991e4d4dce4f3134c343fde5a2980622271 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Sep 2018 04:04:01 +0200 Subject: Use INVOKE in (gnu packages xdisorg). * gnu/packages/xdisorg.scm (scrot, unclutter, xautolock, nxbelld) [arguments]: Use INVOKE. --- gnu/packages/xdisorg.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 7c326eb8d0..c31680b246 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -476,9 +476,8 @@ move windows, switch between desktops, etc.).") (let* ((out (assoc-ref outputs "out")) (doc (string-append out "/share/doc/scrot"))) (mkdir-p doc) - (zero? - (system* "make" "install" - (string-append "docsdir=" doc))))))))) + (invoke "make" "install" + (string-append "docsdir=" doc)))))))) (inputs `(("libx11" ,libx11) ("giblib" ,giblib))) @@ -585,10 +584,9 @@ include cursor in the resulting image.") (man1 (string-append out "/share/man/man1"))) (mkdir-p bin) (mkdir-p man1) - (zero? - (system* "make" "install" "install.man" - (string-append "BINDIR=" bin) - (string-append "MANDIR=" man1))))))))) + (invoke "make" "install" "install.man" + (string-append "BINDIR=" bin) + (string-append "MANDIR=" man1)))))))) (inputs `(("libx11" ,libx11))) (home-page "http://ftp.x.org/contrib/utilities/") (synopsis "Hide idle mouse cursor") @@ -1344,7 +1342,7 @@ invert colors on a specific display/screen.") #:phases (modify-phases %standard-phases (add-before 'configure 'autoreconf (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) + (invoke "autoreconf" "-vfi")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config) @@ -1403,7 +1401,7 @@ or playing a PCM encoded WAVE file.") #t))) (add-after 'install 'install/man (lambda _ - (zero? (system* "make" "install.man"))))))) + (invoke "make" "install.man")))))) (home-page "http://ibiblio.org/pub/Linux/X11/screensavers/") (synopsis "Program launcher for idle X sessions") (description "Xautolock monitors input devices under the X Window -- cgit v1.2.3 From 4eb161962f9d3a4065d2dfe75bb4c19ac6f6c035 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Sep 2018 04:34:07 +0200 Subject: gnu: opusfile: Update to 0.11. * gnu/packages/xiph.scm (opusfile): Update to 0.11. --- gnu/packages/xiph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index a9f4a2ab87..7ecfa580ec 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -387,7 +387,7 @@ decoding .opus files.") (define opusfile (package (name "opusfile") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) (uri (string-append @@ -395,7 +395,7 @@ decoding .opus files.") ".tar.gz")) (sha256 (base32 - "0bs1376sd131qdh7198jp64vv5d17az5wyy4y7srrvw7p8k3bq28")))) + "1gq3aszzl5glgbajw5p1f5a1kdyf23w5vjdmwwrk246syin9pkkl")))) (build-system gnu-build-system) (propagated-inputs `(("opus" ,opus))) -- cgit v1.2.3 From 84c7fbfd6d1c24c14ae9a719b5aa2a41853cf4a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Sep 2018 04:40:41 +0200 Subject: gnu: ccid: Update to 1.4.30. * gnu/packages/security-token.scm (ccid): Update to 1.4.30. --- gnu/packages/security-token.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 2ebf09cfe2..4495069c0d 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -56,7 +56,7 @@ (define-public ccid (package (name "ccid") - (version "1.4.29") + (version "1.4.30") (source (origin (method url-fetch) (uri (string-append @@ -64,7 +64,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "0kdqmbma6sclsrbxy9w85h7cs0v11if4nc2r9v09613k8pl2lhx5")))) + "0z7zafdg75fr1adlv2x0zz34s07gljcjg2lsz76s1048w1xhh5xc")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "--enable-usbdropdir=" %output @@ -77,7 +77,7 @@ (("/bin/echo") (which "echo"))) #t))))) (native-inputs - `(("pcsc-lite" ,pcsc-lite) ; only required for headers + `(("pcsc-lite" ,pcsc-lite) ; only required for headers ("perl" ,perl) ("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 3e63a83c0fa5621a272f0a43dc2dfcb46081804e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 20 Sep 2018 04:48:41 +0200 Subject: gnu: u-boot: Use HTTPS home page. * gnu/packages/bootloaders.scm (u-boot)[home-page]: Use HTTPS. --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 0ba31d867d..4ba9d2e043 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -381,7 +381,7 @@ tree binary files. These are board description files used by Linux and BSD.") ("sdl" ,sdl) ("swig" ,swig))) (build-system gnu-build-system) - (home-page "http://www.denx.de/wiki/U-Boot/") + (home-page "https://www.denx.de/wiki/U-Boot/") (synopsis "ARM bootloader") (description "U-Boot is a bootloader used mostly for ARM boards. It also initializes the boards (RAM etc).") -- cgit v1.2.3 From 9926b8f8096a0198cc34585bf7424eba0c98aee2 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 17 Aug 2018 16:39:07 +0530 Subject: gnu: services: Add iptables service. * gnu/services/networking.scm (): New record type. (iptables-service-type): New variable. * gnu/tests/networking.scm (run-iptables-test): New procedure. (%test-iptables): New variable. * doc/guix.texi (Networking Services): Document it. --- doc/guix.texi | 48 +++++++++++++++++ gnu/services/networking.scm | 56 ++++++++++++++++++- gnu/tests/networking.scm | 129 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 231 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 8987b20fa9..b925485be5 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11612,6 +11612,54 @@ Thus, it can be instantiated like this: @end lisp @end defvr +@cindex iptables +@defvr {Scheme Variable} iptables-service-type +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. + +@lisp +(service iptables-service-type + (iptables-configuration + (ipv4-rules (plain-file "iptables.rules" "*filter +:INPUT ACCEPT +:FORWARD ACCEPT +:OUTPUT ACCEPT +-A INPUT -p tcp --dport 22 -j ACCEPT +-A INPUT -j REJECT --reject-with icmp-port-unreachable +COMMIT +")) + (ipv6-rules (plain-file "ip6tables.rules" "*filter +:INPUT ACCEPT +:FORWARD ACCEPT +:OUTPUT ACCEPT +-A INPUT -p tcp --dport 22 -j ACCEPT +-A INPUT -j REJECT --reject-with icmp6-port-unreachable +COMMIT +")))) +@end lisp +@end defvr + +@deftp {Data Type} iptables-configuration +The data type representing the configuration of iptables. + +@table @asis +@item @code{iptables} (default: @code{iptables}) +The iptables package that provides @code{iptables-restore} and +@code{ip6tables-restore}. +@item @code{ipv4-rules} (default: @code{%iptables-accept-all-rules}) +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}). +@item @code{ipv6-rules} (default: @code{%iptables-accept-all-rules}) +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}). +@end table +@end deftp + @cindex NTP @cindex real time clock @deffn {Scheme Procedure} ntp-service [#:ntp @var{ntp}] @ diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index b6b5ee3fec..bd1d5a2706 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Chris Marusich +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -103,7 +104,14 @@ wpa-supplicant-service-type openvswitch-service-type - openvswitch-configuration)) + openvswitch-configuration + + iptables-configuration + iptables-configuration? + iptables-configuration-iptables + iptables-configuration-ipv4-rules + iptables-configuration-ipv6-rules + iptables-service-type)) ;;; Commentary: ;;; @@ -1108,4 +1116,50 @@ networking.")))) switch designed to enable massive network automation through programmatic extension."))) +;;; +;;; iptables +;;; + +(define %iptables-accept-all-rules + (plain-file "iptables-accept-all.rules" + "*filter +:INPUT ACCEPT +:FORWARD ACCEPT +:OUTPUT ACCEPT +COMMIT +")) + +(define-record-type* + iptables-configuration make-iptables-configuration iptables-configuration? + (iptables iptables-configuration-iptables + (default iptables)) + (ipv4-rules iptables-configuration-ipv4-rules + (default %iptables-accept-all-rules)) + (ipv6-rules iptables-configuration-ipv6-rules + (default %iptables-accept-all-rules))) + +(define iptables-shepherd-service + (match-lambda + (($ iptables ipv4-rules ipv6-rules) + (let ((iptables-restore (file-append iptables "/sbin/iptables-restore")) + (ip6tables-restore (file-append iptables "/sbin/ip6tables-restore"))) + (shepherd-service + (documentation "Packet filtering framework") + (provision '(iptables)) + (start #~(lambda _ + (invoke #$iptables-restore #$ipv4-rules) + (invoke #$ip6tables-restore #$ipv6-rules))) + (stop #~(lambda _ + (invoke #$iptables-restore #$%iptables-accept-all-rules) + (invoke #$ip6tables-restore #$%iptables-accept-all-rules)))))))) + +(define iptables-service-type + (service-type + (name 'iptables) + (description + "Run @command{iptables-restore}, setting up the specified rules.") + (extensions + (list (service-extension shepherd-root-service-type + (compose list iptables-shepherd-service)))))) + ;;; networking.scm ends here diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index 381c5caf14..ceba7f7d5d 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Chris Marusich +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,9 +30,11 @@ #:use-module (guix store) #:use-module (guix monads) #:use-module (gnu packages bash) + #:use-module (gnu packages linux) #:use-module (gnu packages networking) #:use-module (gnu services shepherd) - #:export (%test-inetd %test-openvswitch %test-dhcpd %test-tor)) + #:use-module (ice-9 match) + #:export (%test-inetd %test-openvswitch %test-dhcpd %test-tor %test-iptables)) (define %inetd-os ;; Operating system with 2 inetd services. @@ -434,3 +437,127 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (name "tor") (description "Test a running Tor daemon configuration.") (value (run-tor-test)))) + +(define* (run-iptables-test) + "Run tests of 'iptables-service-type'." + (define iptables-rules + "*filter +:INPUT ACCEPT +:FORWARD ACCEPT +:OUTPUT ACCEPT +-A INPUT -p tcp -m tcp --dport 7 -j REJECT --reject-with icmp-port-unreachable +COMMIT +") + + (define ip6tables-rules + "*filter +:INPUT ACCEPT +:FORWARD ACCEPT +:OUTPUT ACCEPT +-A INPUT -p tcp -m tcp --dport 7 -j REJECT --reject-with icmp6-port-unreachable +COMMIT +") + + (define inetd-echo-port 7) + + (define os + (marionette-operating-system + (simple-operating-system + (dhcp-client-service) + (service inetd-service-type + (inetd-configuration + (entries (list + (inetd-entry + (name "echo") + (socket-type 'stream) + (protocol "tcp") + (wait? #f) + (user "root")))))) + (service iptables-service-type + (iptables-configuration + (ipv4-rules (plain-file "iptables.rules" iptables-rules)) + (ipv6-rules (plain-file "ip6tables.rules" ip6tables-rules))))) + #:imported-modules '((gnu services herd)) + #:requirements '(inetd iptables))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (srfi srfi-64) + (gnu build marionette)) + (define marionette + (make-marionette (list #$(virtual-machine os)))) + + (define (dump-iptables iptables-save marionette) + (marionette-eval + `(begin + (use-modules (ice-9 popen) + (ice-9 rdelim) + (ice-9 regex)) + (call-with-output-string + (lambda (out) + (call-with-port + (open-pipe* OPEN_READ ,iptables-save) + (lambda (in) + (let loop ((line (read-line in))) + ;; iptables-save does not output rules in the exact + ;; same format we loaded using iptables-restore. It + ;; adds comments, packet counters, etc. We remove + ;; these additions. + (unless (eof-object? line) + (cond + ;; Remove comments + ((string-match "^#" line) #t) + ;; Remove packet counters + ((string-match "^:([A-Z]*) ([A-Z]*) .*" line) + => (lambda (match-record) + (format out ":~a ~a~%" + (match:substring match-record 1) + (match:substring match-record 2)))) + ;; Pass other lines without modification + (else (display line out) + (newline out))) + (loop (read-line in))))))))) + marionette)) + + (mkdir #$output) + (chdir #$output) + + (test-begin "iptables") + + (test-equal "iptables-save dumps the same rules that were loaded" + (dump-iptables #$(file-append iptables "/sbin/iptables-save") + marionette) + #$iptables-rules) + + (test-equal "ip6tables-save dumps the same rules that were loaded" + (dump-iptables #$(file-append iptables "/sbin/ip6tables-save") + marionette) + #$ip6tables-rules) + + (test-error "iptables firewall blocks access to inetd echo service" + 'misc-error + (wait-for-tcp-port inetd-echo-port marionette #:timeout 5)) + + ;; TODO: This test freezes up at the login prompt without any + ;; relevant messages on the console. Perhaps it is waiting for some + ;; timeout. Find and fix this issue. + ;; (test-assert "inetd echo service is accessible after iptables firewall is stopped" + ;; (begin + ;; (marionette-eval + ;; '(begin + ;; (use-modules (gnu services herd)) + ;; (stop-service 'iptables)) + ;; marionette) + ;; (wait-for-tcp-port inetd-echo-port marionette #:timeout 5))) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "iptables" test)) + +(define %test-iptables + (system-test + (name "iptables") + (description "Test a running iptables daemon.") + (value (run-iptables-test)))) -- cgit v1.2.3 From 166b2c970e7ae1533002f6e853d71678908f9b84 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 13 Sep 2018 01:49:16 +0200 Subject: gnu: eolie: Update home page. * gnu/packages/gnome.scm (eolie)[home-page]: Set to wiki.gnome.org/Apps/Eolie. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6a34e81f13..99f4c1271a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4150,7 +4150,7 @@ work and the interface is well tested.") ("gtkspell3" ,gtkspell3) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("webkitgtk" ,webkitgtk))) - (home-page "https://github.com/gnumdk/eolie/") + (home-page "https://wiki.gnome.org/Apps/Eolie") (synopsis "Web browser for GNOME") (description "Eolie is a new web browser for GNOME. It features Firefox sync support, -- cgit v1.2.3 From 3e12df7d71547b4eca718b6b0e1fc244722dcc39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Sep 2018 14:35:45 +0200 Subject: gnu: Add emacs-dired-sidebar. * gnu/packages/emacs.scm (emacs-dired-sidebar): New public variable. --- gnu/packages/emacs.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index a799aa9899..9b3a90bd33 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -7182,6 +7182,28 @@ the actual transformations.") @end itemize\n") (license license:gpl3+)))) +(define-public emacs-dired-sidebar + (let ((commit "06bd0d40bab812c61a668129daf29ba359424454") + (revision "0")) + (package + (name "emacs-dired-sidebar") + (home-page "https://github.com/jojojames/dired-sidebar") + (version (git-version "0.0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit commit))) + (sha256 + (base32 + "0lvwvq6sl80sha9fq5m4568sg534dhmifyjqw75bqddcbf3by84x")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dired-subtree" ,emacs-dired-hacks))) + (synopsis "Sidebar for Emacs using Dired") + (description + "This package provides a sidebar for Emacs similar to @code{NeoTree} +or @code{treemacs}, but leveraging @code{Dired} to do the job of display.") + (license license:gpl3+)))) + (define-public emacs-which-key (package (name "emacs-which-key") -- cgit v1.2.3 From 985d542e028517b2888fa61831233a2b60dc7d48 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Sep 2018 14:00:02 +0200 Subject: gnu: gstreamer: Update to 1.14.3. * gnu/packages/gstreamer.scm (gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, python-gst): Update to 1.14.3. --- gnu/packages/gstreamer.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index f556861857..21acd9f150 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -102,7 +102,7 @@ arrays of data.") (define-public gstreamer (package (name "gstreamer") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) @@ -111,7 +111,7 @@ arrays of data.") version ".tar.xz")) (sha256 (base32 - "029fi3v0vrravysgfwhfkrb3ndg64sjmigbb0iwr7wpkk5r15mjb")))) + "0mh4755an4gk0z3ygqhjpdjk0r2cwswbpwfgl0x6qmnln4757bhk")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments @@ -150,7 +150,7 @@ This package provides the core library and elements.") (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) @@ -158,7 +158,7 @@ This package provides the core library and elements.") name "-" version ".tar.xz")) (sha256 (base32 - "0z0wy0p0nxxqhsis3n517d6ykldm02g7rca9fhq9kxb9m05yidx4")))) + "0lkr1fm3bz21nqq9vi5v74mlxw6dd6i7piw00fhc5zz0dg1ikczh")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs @@ -209,7 +209,7 @@ for the GStreamer multimedia library.") (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) @@ -218,7 +218,7 @@ for the GStreamer multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "1bfa4n6xhr4v4wga8pv1y00rm1aka498snw6kgszy2w624l5wmy0")))) + "0pgzgfqbfp8lz2ns68797xfxdr0cr5rpi93wd1h2grhbmzkbq4ji")))) (build-system gnu-build-system) (inputs `(("aalib" ,aalib) @@ -268,14 +268,14 @@ developers consider to have good quality code and correct functionality.") (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "1bqy3dn7q4kdkd4lqznyly8fv854d0hhncv88jk6ai4rf3dbgyil")))) + "1mczcna91f3kkk3yv5fkfa8nmqdr9d93aq9z4d8sv18vkiflw8mj")))) (outputs '("out" "doc")) (build-system gnu-build-system) (arguments @@ -344,7 +344,7 @@ par compared to the rest.") (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) @@ -352,7 +352,7 @@ par compared to the rest.") name "/" name "-" version ".tar.xz")) (sha256 (base32 - "0s9xrz8knfv06fj1nbv3iq4xj7dj4cnzj3xvgb7zs89rv7crgq2m")))) + "01i31g5rvw36rjlyi9w24n0g1xa6053d14vaiba6vqpas727z123")))) (build-system gnu-build-system) (inputs `(("gst-plugins-base" ,gst-plugins-base) @@ -382,7 +382,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") (define-public gst-libav (package (name "gst-libav") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) (uri (string-append @@ -390,7 +390,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") name "-" version ".tar.xz")) (sha256 (base32 - "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca")) + "0xxnb80yhfa42x4wx1928zydaal35b2mcj0zdcdsv1apnjdm40wv")) (modules '((guix build utils))) (snippet '(begin @@ -418,7 +418,7 @@ compression formats through the use of the libav library.") (define-public python-gst (package (name "python-gst") - (version "1.14.2") + (version "1.14.3") (source (origin (method url-fetch) (uri (string-append @@ -426,7 +426,7 @@ compression formats through the use of the libav library.") "gst-python-" version ".tar.xz")) (sha256 (base32 - "08nb011acyvlz48fqh8c084k0dlssz9b7wha7zzk797inidbwh6w")))) + "01w3mpimbm8drifhrkvpns79h15kd9h9v0dynr7yb12kjrnfghsg")))) (build-system gnu-build-system) (arguments ;; XXX: Factorize python-sitedir with python-build-system. -- cgit v1.2.3 From 26358ac5ab612e3ba5cc965994853f4a6616220c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 20 Sep 2018 13:13:25 +0200 Subject: gnu: Add r-parmigene. * gnu/packages/cran.scm (r-parmigene): New variable. --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5519b85d0b..58e9ad09c7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5875,3 +5875,23 @@ score in order to detect blood doping. The package also contains functions to calculate other scores used in anti-doping programs, such as the ratio of hemoglobin to reticulocytes (OFF-score), as well as example data.") (license license:gpl2+))) + +(define-public r-parmigene + (package + (name "r-parmigene") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "parmigene" version)) + (sha256 + (base32 + "1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/parmigene/") + (synopsis "Mutual information estimation for gene network reconstruction") + (description + "This package provides a parallel estimation of the mutual information +based on entropy estimates from k-nearest neighbors distances and algorithms +for the reconstruction of gene regulatory networks.") + (license license:agpl3+))) -- cgit v1.2.3 From 391fc11f0e492b06fa6eb31535e1e34165040b7d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 20 Sep 2018 15:53:20 +0200 Subject: gnu: python2-scikit-learn: Fix check phase. * gnu/packages/machine-learning.scm (python2-scikit-learn)[arguments]: Override check phase to disable broken tests and pass environment variables. --- gnu/packages/machine-learning.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 9aa61bd8f8..990a6c771a 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -750,7 +750,24 @@ data analysis.") (license license:bsd-3))) (define-public python2-scikit-learn - (package-with-python2 python-scikit-learn)) + (let ((parent (package-with-python2 python-scikit-learn))) + (package (inherit parent) + (arguments + (substitute-keyword-arguments (package-arguments parent) + ((#:phases phases) + `(modify-phases ,phases + (replace 'check + (lambda _ + ;; Restrict OpenBLAS threads to prevent segfaults while testing! + (setenv "OPENBLAS_NUM_THREADS" "1") + ;; Some tests expect to be able to write to HOME. + (setenv "HOME" "/tmp") + ;; Disable tests that require network access + (delete-file "sklearn/datasets/tests/test_kddcup99.py") + (delete-file "sklearn/datasets/tests/test_mldata.py") + (delete-file "sklearn/datasets/tests/test_rcv1.py") + (invoke "pytest" "sklearn") + #t))))))))) (define-public python-autograd (let* ((commit "442205dfefe407beffb33550846434baa90c4de7") -- cgit v1.2.3 From e30397dddb0c8ba130b9c77b3305f6da6508e766 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 20 Sep 2018 16:02:38 +0200 Subject: gnu: ghc-xml-conduit: Update to 1.8.0.1. * gnu/packages/haskell.scm (ghc-xml-conduit): Update to 1.8.0.1. [inputs]: Add ghc-doctest. --- gnu/packages/haskell.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index eb629cf138..0c6c30acd2 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6729,7 +6729,7 @@ documents.") (define-public ghc-xml-conduit (package (name "ghc-xml-conduit") - (version "1.7.1.2") + (version "1.8.0.1") (source (origin (method url-fetch) @@ -6737,11 +6737,12 @@ documents.") "xml-conduit-" version ".tar.gz")) (sha256 (base32 - "0n4k0rq9j5cc9kdvj9xbx8gmiqlyk5x6pw8yxzw5wfsw7qkych2s")))) + "177gmyigxql1pn3ncz0r8annwv5cbxnihbgrrg1dhm4gmc9jy2wq")))) (build-system haskell-build-system) (inputs `(("ghc-conduit" ,ghc-conduit) ("ghc-conduit-extra" ,ghc-conduit-extra) + ("ghc-doctest" ,ghc-doctest) ("ghc-resourcet" ,ghc-resourcet) ("ghc-text" ,ghc-text) ("ghc-xml-types" ,ghc-xml-types) -- cgit v1.2.3 From a235ea4f30785e42cedf9a52d22c1e6650901fdd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 20 Sep 2018 16:03:06 +0200 Subject: gnu: ghc-pandoc-citeproc: Update to 0.14.3.1. * gnu/packages/haskell.scm (ghc-pandoc-citeproc): Update to 0.14.3.1. --- gnu/packages/haskell.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 0c6c30acd2..6b774c358a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6763,7 +6763,7 @@ the @code{conduit} package.") (define-public ghc-pandoc-citeproc (package (name "ghc-pandoc-citeproc") - (version "0.12.2.5") + (version "0.14.3.1") (source (origin (method url-fetch) @@ -6772,7 +6772,7 @@ the @code{conduit} package.") version ".tar.gz")) (sha256 (base32 - "1l58nbflcnlznc93qimkk7ghk2gv8kipf45zf88piqa2zys41yyx")))) + "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22")))) (build-system haskell-build-system) (arguments `(#:phases -- cgit v1.2.3 From 89ee8a6edf7ceae66ff86e88778e07e80aa119fd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 20 Sep 2018 17:46:34 +0200 Subject: gnu: rsem: Update to 1.3.1. * gnu/packages/bioinformatics.scm (rsem): Update to 1.3.1. [source]: Fetch from git; remove patch; delete bundled samtools. [arguments]: Pass make flags; adjust phases. [inputs]: Remove ncurses and samtools-0.1; add htslib-1.3. * gnu/packages/patches/rsem-makefile.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/bioinformatics.scm | 91 +++-- gnu/packages/patches/rsem-makefile.patch | 682 ------------------------------- 3 files changed, 52 insertions(+), 722 deletions(-) delete mode 100644 gnu/packages/patches/rsem-makefile.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0ead43acd9..4bca986619 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1115,7 +1115,6 @@ dist_patch_DATA = \ %D%/packages/patches/reptyr-fix-gcc-7.patch \ %D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ - %D%/packages/patches/rsem-makefile.patch \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-store-checksum-override.patch \ %D%/packages/patches/ruby-rubygems-276-for-ruby24.patch \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 67f24a6170..10330cd8b2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4800,66 +4800,79 @@ phylogenies.") (define-public rsem (package (name "rsem") - (version "1.2.20") + (version "1.3.1") (source (origin - (method url-fetch) - (uri - (string-append "http://deweylab.biostat.wisc.edu/rsem/src/rsem-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/deweylab/RSEM.git") + (commit (string-append "v" version)))) (sha256 - (base32 "0nzdc0j0hjllhsd5f2xli95dafm3nawskigs140xzvjk67xh0r9q")) - (patches (search-patches "rsem-makefile.patch")) + (base32 "1jlq11d1p8qp64w75yj8cnbbd1a93viq10pzsbwal7vdn8fg13j1")) + (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet '(begin - ;; remove bundled copy of boost + ;; remove bundled copy of boost and samtools (delete-file-recursively "boost") + (delete-file-recursively "samtools-1.3") #t)))) (build-system gnu-build-system) (arguments `(#:tests? #f ;no "check" target + #:make-flags + (list (string-append "BOOST=" + (assoc-ref %build-inputs "boost") + "/include/") + (string-append "SAMHEADERS=" + (assoc-ref %build-inputs "htslib") + "/include/htslib/sam.h") + (string-append "SAMLIBS=" + (assoc-ref %build-inputs "htslib") + "/lib/libhts.a")) #:phases (modify-phases %standard-phases ;; No "configure" script. ;; Do not build bundled samtools library. (replace 'configure - (lambda _ - (substitute* "Makefile" - (("^all : sam/libbam.a") "all : ")) - #t)) + (lambda _ + (substitute* "Makefile" + (("^all : \\$\\(PROGRAMS\\).*") "all: $(PROGRAMS)\n") + (("^\\$\\(SAMLIBS\\).*") "")) + #t)) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (string-append (assoc-ref outputs "out"))) - (bin (string-append out "/bin/")) - (perl (string-append out "/lib/perl5/site_perl"))) - (mkdir-p bin) - (mkdir-p perl) - (for-each (lambda (file) - (install-file file bin)) - (find-files "." "rsem-.*")) - (install-file "rsem_perl_utils.pm" perl)) - #t)) - (add-after - 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (prog) - (wrap-program (string-append out "/bin/" prog) - `("PERL5LIB" ":" prefix - (,(string-append out "/lib/perl5/site_perl"))))) - '("rsem-plot-transcript-wiggles" - "rsem-calculate-expression" - "rsem-generate-ngvector" - "rsem-run-ebseq" - "rsem-prepare-reference"))) - #t))))) + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (string-append (assoc-ref outputs "out"))) + (bin (string-append out "/bin/")) + (perl (string-append out "/lib/perl5/site_perl"))) + (mkdir-p bin) + (mkdir-p perl) + (for-each (lambda (file) + (install-file file bin)) + (find-files "." "rsem-.*")) + (install-file "rsem_perl_utils.pm" perl)) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (prog) + (wrap-program (string-append out "/bin/" prog) + `("PERL5LIB" ":" prefix + (,(string-append out "/lib/perl5/site_perl"))))) + '("rsem-calculate-expression" + "rsem-control-fdr" + "rsem-generate-data-matrix" + "rsem-generate-ngvector" + "rsem-plot-transcript-wiggles" + "rsem-prepare-reference" + "rsem-run-ebseq" + "rsem-run-prsem-testing-procedure"))) + #t))))) (inputs `(("boost" ,boost) - ("ncurses" ,ncurses) ("r-minimal" ,r-minimal) ("perl" ,perl) - ("samtools" ,samtools-0.1) + ("htslib" ,htslib-1.3) ("zlib" ,zlib))) (home-page "http://deweylab.biostat.wisc.edu/rsem/") (synopsis "Estimate gene expression levels from RNA-Seq data") diff --git a/gnu/packages/patches/rsem-makefile.patch b/gnu/packages/patches/rsem-makefile.patch deleted file mode 100644 index 5481dc685f..0000000000 --- a/gnu/packages/patches/rsem-makefile.patch +++ /dev/null @@ -1,682 +0,0 @@ -This patch simplifies the Makefile, making it much easier to build rsem -without the bundled version of samtools. It has already been submitted -upstream: https://github.com/bli25wisc/RSEM/pull/11 - -From 161894e91a16c7e15af57e4fcfe8cb613711c7fa Mon Sep 17 00:00:00 2001 -From: Ricardo Wurmus -Date: Wed, 22 Apr 2015 14:51:07 +0200 -Subject: [PATCH 1/7] remove all headers from Makefile - ---- - Makefile | 95 +++++++++++----------------------------------------------------- - 1 file changed, 16 insertions(+), 79 deletions(-) - -diff --git a/Makefile b/Makefile -index 54e2603..3a55ed8 100644 ---- a/Makefile -+++ b/Makefile -@@ -10,133 +10,70 @@ all : $(PROGRAMS) - sam/libbam.a : - cd sam ; ${MAKE} all - --Transcript.h : utils.h -- --Transcripts.h : utils.h my_assert.h Transcript.h -- --rsem-extract-reference-transcripts : utils.h my_assert.h GTFItem.h Transcript.h Transcripts.h extractRef.cpp -+rsem-extract-reference-transcripts : extractRef.cpp - $(CC) -Wall -O3 extractRef.cpp -o rsem-extract-reference-transcripts - --rsem-synthesis-reference-transcripts : utils.h my_assert.h Transcript.h Transcripts.h synthesisRef.cpp -+rsem-synthesis-reference-transcripts : synthesisRef.cpp - $(CC) -Wall -O3 synthesisRef.cpp -o rsem-synthesis-reference-transcripts - --BowtieRefSeqPolicy.h : RefSeqPolicy.h -- --RefSeq.h : utils.h -- --Refs.h : utils.h RefSeq.h RefSeqPolicy.h PolyARules.h -- -- - rsem-preref : preRef.o - $(CC) preRef.o -o rsem-preref - --preRef.o : utils.h RefSeq.h Refs.h PolyARules.h RefSeqPolicy.h AlignerRefSeqPolicy.h preRef.cpp -+preRef.o : preRef.cpp - $(CC) $(COFLAGS) preRef.cpp - -- --SingleRead.h : Read.h -- --SingleReadQ.h : Read.h -- --PairedEndRead.h : Read.h SingleRead.h -- --PairedEndReadQ.h : Read.h SingleReadQ.h -- -- --PairedEndHit.h : SingleHit.h -- --HitContainer.h : GroupInfo.h -- -- --SamParser.h : sam/sam.h sam/bam.h utils.h my_assert.h SingleRead.h SingleReadQ.h PairedEndRead.h PairedEndReadQ.h SingleHit.h PairedEndHit.h Transcripts.h -- -- - rsem-parse-alignments : parseIt.o sam/libbam.a - $(CC) -o rsem-parse-alignments parseIt.o sam/libbam.a -lz -lpthread - --parseIt.o : utils.h GroupInfo.h Read.h SingleRead.h SingleReadQ.h PairedEndRead.h PairedEndReadQ.h SingleHit.h PairedEndHit.h HitContainer.h SamParser.h Transcripts.h sam/sam.h sam/bam.h parseIt.cpp -+parseIt.o : parseIt.cpp - $(CC) -Wall -O2 -c -I. parseIt.cpp - -- --rsem-build-read-index : utils.h buildReadIndex.cpp -+rsem-build-read-index : buildReadIndex.cpp - $(CC) -O3 buildReadIndex.cpp -o rsem-build-read-index - -- --simul.h : boost/random.hpp -- --ReadReader.h : SingleRead.h SingleReadQ.h PairedEndRead.h PairedEndReadQ.h ReadIndex.h -- --SingleModel.h : utils.h my_assert.h Orientation.h LenDist.h RSPD.h Profile.h NoiseProfile.h ModelParams.h RefSeq.h Refs.h SingleRead.h SingleHit.h ReadReader.h simul.h -- --SingleQModel.h : utils.h my_assert.h Orientation.h LenDist.h RSPD.h QualDist.h QProfile.h NoiseQProfile.h ModelParams.h RefSeq.h Refs.h SingleReadQ.h SingleHit.h ReadReader.h simul.h -- --PairedEndModel.h : utils.h my_assert.h Orientation.h LenDist.h RSPD.h Profile.h NoiseProfile.h ModelParams.h RefSeq.h Refs.h SingleRead.h PairedEndRead.h PairedEndHit.h ReadReader.h simul.h -- --PairedEndQModel.h : utils.h my_assert.h Orientation.h LenDist.h RSPD.h QualDist.h QProfile.h NoiseQProfile.h ModelParams.h RefSeq.h Refs.h SingleReadQ.h PairedEndReadQ.h PairedEndHit.h ReadReader.h simul.h -- --HitWrapper.h : HitContainer.h -- --sam_rsem_aux.h : sam/bam.h -- --sam_rsem_cvt.h : sam/bam.h Transcript.h Transcripts.h -- --BamWriter.h : sam/sam.h sam/bam.h sam_rsem_aux.h sam_rsem_cvt.h SingleHit.h PairedEndHit.h HitWrapper.h Transcript.h Transcripts.h -- --sampling.h : boost/random.hpp -- --WriteResults.h : utils.h my_assert.h GroupInfo.h Transcript.h Transcripts.h RefSeq.h Refs.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h -- - rsem-run-em : EM.o sam/libbam.a - $(CC) -o rsem-run-em EM.o sam/libbam.a -lz -lpthread - --EM.o : utils.h my_assert.h Read.h SingleRead.h SingleReadQ.h PairedEndRead.h PairedEndReadQ.h SingleHit.h PairedEndHit.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h Refs.h GroupInfo.h HitContainer.h ReadIndex.h ReadReader.h Orientation.h LenDist.h RSPD.h QualDist.h QProfile.h NoiseQProfile.h ModelParams.h RefSeq.h RefSeqPolicy.h PolyARules.h Profile.h NoiseProfile.h Transcript.h Transcripts.h HitWrapper.h BamWriter.h sam/bam.h sam/sam.h simul.h sam_rsem_aux.h sampling.h boost/random.hpp WriteResults.h EM.cpp -+EM.o : EM.cpp - $(CC) $(COFLAGS) EM.cpp - --bc_aux.h : sam/bam.h -- --BamConverter.h : utils.h my_assert.h sam/sam.h sam/bam.h sam_rsem_aux.h sam_rsem_cvt.h bc_aux.h Transcript.h Transcripts.h -- --rsem-tbam2gbam : utils.h Transcripts.h Transcript.h bc_aux.h BamConverter.h sam/sam.h sam/bam.h sam/libbam.a sam_rsem_aux.h sam_rsem_cvt.h tbam2gbam.cpp sam/libbam.a -+rsem-tbam2gbam : tbam2gbam.cpp sam/libbam.a - $(CC) -O3 -Wall tbam2gbam.cpp sam/libbam.a -lz -lpthread -o $@ - --rsem-bam2wig : utils.h my_assert.h wiggle.h wiggle.o sam/libbam.a bam2wig.cpp -+rsem-bam2wig : wiggle.o sam/libbam.a bam2wig.cpp - $(CC) -O3 -Wall bam2wig.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ - --rsem-bam2readdepth : utils.h my_assert.h wiggle.h wiggle.o sam/libbam.a bam2readdepth.cpp -+rsem-bam2readdepth : wiggle.o sam/libbam.a bam2readdepth.cpp - $(CC) -O3 -Wall bam2readdepth.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ - --wiggle.o: sam/bam.h sam/sam.h wiggle.cpp wiggle.h -+wiggle.o: wiggle.cpp - $(CC) $(COFLAGS) wiggle.cpp - - rsem-simulate-reads : simulation.o - $(CC) -o rsem-simulate-reads simulation.o - --simulation.o : utils.h Read.h SingleRead.h SingleReadQ.h PairedEndRead.h PairedEndReadQ.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h Refs.h RefSeq.h GroupInfo.h Transcript.h Transcripts.h Orientation.h LenDist.h RSPD.h QualDist.h QProfile.h NoiseQProfile.h Profile.h NoiseProfile.h simul.h boost/random.hpp WriteResults.h simulation.cpp -+simulation.o : simulation.cpp - $(CC) $(COFLAGS) simulation.cpp - - rsem-run-gibbs : Gibbs.o - $(CC) -o rsem-run-gibbs Gibbs.o -lpthread - --#some header files are omitted --Gibbs.o : utils.h my_assert.h boost/random.hpp sampling.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h RefSeq.h RefSeqPolicy.h PolyARules.h Refs.h GroupInfo.h WriteResults.h Gibbs.cpp -+Gibbs.o : Gibbs.cpp - $(CC) $(COFLAGS) Gibbs.cpp - --Buffer.h : my_assert.h -- - rsem-calculate-credibility-intervals : calcCI.o - $(CC) -o rsem-calculate-credibility-intervals calcCI.o -lpthread - --#some header files are omitted --calcCI.o : utils.h my_assert.h boost/random.hpp sampling.h Model.h SingleModel.h SingleQModel.h PairedEndModel.h PairedEndQModel.h RefSeq.h RefSeqPolicy.h PolyARules.h Refs.h GroupInfo.h WriteResults.h Buffer.h calcCI.cpp -+calcCI.o : calcCI.cpp - $(CC) $(COFLAGS) calcCI.cpp - --rsem-get-unique : sam/bam.h sam/sam.h getUnique.cpp sam/libbam.a -+rsem-get-unique : getUnique.cpp sam/libbam.a - $(CC) -O3 -Wall getUnique.cpp sam/libbam.a -lz -lpthread -o $@ - --rsem-sam-validator : sam/bam.h sam/sam.h my_assert.h samValidator.cpp sam/libbam.a -+rsem-sam-validator : samValidator.cpp sam/libbam.a - $(CC) -O3 -Wall samValidator.cpp sam/libbam.a -lz -lpthread -o $@ - --rsem-scan-for-paired-end-reads : sam/bam.h sam/sam.h my_assert.h scanForPairedEndReads.cpp sam/libbam.a -+rsem-scan-for-paired-end-reads : scanForPairedEndReads.cpp sam/libbam.a - $(CC) -O3 -Wall scanForPairedEndReads.cpp sam/libbam.a -lz -lpthread -o $@ - - ebseq : - -From ec136638a727632e20abfaeb65c22c46d15ca8c4 Mon Sep 17 00:00:00 2001 -From: Ricardo Wurmus -Date: Wed, 22 Apr 2015 15:06:41 +0200 -Subject: [PATCH 2/7] include current dir, ./sam and ./boost by default - ---- - Makefile | 48 ++++++++++++++++++++++++------------------------ - 1 file changed, 24 insertions(+), 24 deletions(-) - -diff --git a/Makefile b/Makefile -index 3a55ed8..1dd97ca 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - CC = g++ --CFLAGS = -Wall -c -I. --COFLAGS = -Wall -O3 -ffast-math -c -I. -+CFLAGS = -Wall -I. -I./sam -I./boost -+COFLAGS = -O3 -ffast-math -c - PROGRAMS = rsem-extract-reference-transcripts rsem-synthesis-reference-transcripts rsem-preref rsem-parse-alignments rsem-build-read-index rsem-run-em rsem-tbam2gbam rsem-run-gibbs rsem-calculate-credibility-intervals rsem-simulate-reads rsem-bam2wig rsem-get-unique rsem-bam2readdepth rsem-sam-validator rsem-scan-for-paired-end-reads - - .PHONY : all ebseq clean -@@ -11,70 +11,70 @@ sam/libbam.a : - cd sam ; ${MAKE} all - - rsem-extract-reference-transcripts : extractRef.cpp -- $(CC) -Wall -O3 extractRef.cpp -o rsem-extract-reference-transcripts -+ $(CC) $(CFLAGS) -O3 extractRef.cpp -o rsem-extract-reference-transcripts - - rsem-synthesis-reference-transcripts : synthesisRef.cpp -- $(CC) -Wall -O3 synthesisRef.cpp -o rsem-synthesis-reference-transcripts -+ $(CC) $(CFLAGS) -O3 synthesisRef.cpp -o rsem-synthesis-reference-transcripts - - rsem-preref : preRef.o -- $(CC) preRef.o -o rsem-preref -+ $(CC) $(CFLAGS) preRef.o -o rsem-preref - - preRef.o : preRef.cpp -- $(CC) $(COFLAGS) preRef.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) preRef.cpp - - rsem-parse-alignments : parseIt.o sam/libbam.a -- $(CC) -o rsem-parse-alignments parseIt.o sam/libbam.a -lz -lpthread -+ $(CC) $(CFLAGS) -o rsem-parse-alignments parseIt.o sam/libbam.a -lz -lpthread - - parseIt.o : parseIt.cpp -- $(CC) -Wall -O2 -c -I. parseIt.cpp -+ $(CC) $(CFLAGS) -O2 -c parseIt.cpp - - rsem-build-read-index : buildReadIndex.cpp -- $(CC) -O3 buildReadIndex.cpp -o rsem-build-read-index -+ $(CC) $(CFLAGS) -O3 buildReadIndex.cpp -o rsem-build-read-index - - rsem-run-em : EM.o sam/libbam.a -- $(CC) -o rsem-run-em EM.o sam/libbam.a -lz -lpthread -+ $(CC) $(CFLAGS) -o rsem-run-em EM.o sam/libbam.a -lz -lpthread - - EM.o : EM.cpp -- $(CC) $(COFLAGS) EM.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) EM.cpp - - rsem-tbam2gbam : tbam2gbam.cpp sam/libbam.a -- $(CC) -O3 -Wall tbam2gbam.cpp sam/libbam.a -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 tbam2gbam.cpp sam/libbam.a -lz -lpthread -o $@ - - rsem-bam2wig : wiggle.o sam/libbam.a bam2wig.cpp -- $(CC) -O3 -Wall bam2wig.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 bam2wig.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ - - rsem-bam2readdepth : wiggle.o sam/libbam.a bam2readdepth.cpp -- $(CC) -O3 -Wall bam2readdepth.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 bam2readdepth.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ - - wiggle.o: wiggle.cpp -- $(CC) $(COFLAGS) wiggle.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) wiggle.cpp - - rsem-simulate-reads : simulation.o -- $(CC) -o rsem-simulate-reads simulation.o -+ $(CC) $(CFLAGS) -o rsem-simulate-reads simulation.o - - simulation.o : simulation.cpp -- $(CC) $(COFLAGS) simulation.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) simulation.cpp - - rsem-run-gibbs : Gibbs.o -- $(CC) -o rsem-run-gibbs Gibbs.o -lpthread -+ $(CC) $(CFLAGS) -o rsem-run-gibbs Gibbs.o -lpthread - - Gibbs.o : Gibbs.cpp -- $(CC) $(COFLAGS) Gibbs.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) Gibbs.cpp - - rsem-calculate-credibility-intervals : calcCI.o -- $(CC) -o rsem-calculate-credibility-intervals calcCI.o -lpthread -+ $(CC) $(CFLAGS) -o rsem-calculate-credibility-intervals calcCI.o -lpthread - - calcCI.o : calcCI.cpp -- $(CC) $(COFLAGS) calcCI.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) calcCI.cpp - - rsem-get-unique : getUnique.cpp sam/libbam.a -- $(CC) -O3 -Wall getUnique.cpp sam/libbam.a -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 getUnique.cpp sam/libbam.a -lz -lpthread -o $@ - - rsem-sam-validator : samValidator.cpp sam/libbam.a -- $(CC) -O3 -Wall samValidator.cpp sam/libbam.a -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 samValidator.cpp sam/libbam.a -lz -lpthread -o $@ - - rsem-scan-for-paired-end-reads : scanForPairedEndReads.cpp sam/libbam.a -- $(CC) -O3 -Wall scanForPairedEndReads.cpp sam/libbam.a -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 scanForPairedEndReads.cpp sam/libbam.a -lz -lpthread -o $@ - - ebseq : - cd EBSeq ; ${MAKE} all - -From d366614ea50f79fdd93e3c76383ccb6fcdeaa8e0 Mon Sep 17 00:00:00 2001 -From: Ricardo Wurmus -Date: Wed, 22 Apr 2015 15:10:49 +0200 -Subject: [PATCH 3/7] separate object rules from rules for executables - ---- - Makefile | 50 ++++++++++++++++++++++++++------------------------ - 1 file changed, 26 insertions(+), 24 deletions(-) - -diff --git a/Makefile b/Makefile -index 1dd97ca..ae4de3b 100644 ---- a/Makefile -+++ b/Makefile -@@ -10,6 +10,32 @@ all : $(PROGRAMS) - sam/libbam.a : - cd sam ; ${MAKE} all - -+ebseq : -+ cd EBSeq ; ${MAKE} all -+ -+ -+calcCI.o : calcCI.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) calcCI.cpp -+ -+EM.o : EM.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) EM.cpp -+ -+Gibbs.o : Gibbs.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) Gibbs.cpp -+ -+preRef.o : preRef.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) preRef.cpp -+ -+parseIt.o : parseIt.cpp -+ $(CC) $(CFLAGS) -O2 -c parseIt.cpp -+ -+simulation.o : simulation.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) simulation.cpp -+ -+wiggle.o: wiggle.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) wiggle.cpp -+ -+ - rsem-extract-reference-transcripts : extractRef.cpp - $(CC) $(CFLAGS) -O3 extractRef.cpp -o rsem-extract-reference-transcripts - -@@ -19,24 +45,15 @@ rsem-synthesis-reference-transcripts : synthesisRef.cpp - rsem-preref : preRef.o - $(CC) $(CFLAGS) preRef.o -o rsem-preref - --preRef.o : preRef.cpp -- $(CC) $(CFLAGS) $(COFLAGS) preRef.cpp -- - rsem-parse-alignments : parseIt.o sam/libbam.a - $(CC) $(CFLAGS) -o rsem-parse-alignments parseIt.o sam/libbam.a -lz -lpthread - --parseIt.o : parseIt.cpp -- $(CC) $(CFLAGS) -O2 -c parseIt.cpp -- - rsem-build-read-index : buildReadIndex.cpp - $(CC) $(CFLAGS) -O3 buildReadIndex.cpp -o rsem-build-read-index - - rsem-run-em : EM.o sam/libbam.a - $(CC) $(CFLAGS) -o rsem-run-em EM.o sam/libbam.a -lz -lpthread - --EM.o : EM.cpp -- $(CC) $(CFLAGS) $(COFLAGS) EM.cpp -- - rsem-tbam2gbam : tbam2gbam.cpp sam/libbam.a - $(CC) $(CFLAGS) -O3 tbam2gbam.cpp sam/libbam.a -lz -lpthread -o $@ - -@@ -46,27 +63,15 @@ rsem-bam2wig : wiggle.o sam/libbam.a bam2wig.cpp - rsem-bam2readdepth : wiggle.o sam/libbam.a bam2readdepth.cpp - $(CC) $(CFLAGS) -O3 bam2readdepth.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ - --wiggle.o: wiggle.cpp -- $(CC) $(CFLAGS) $(COFLAGS) wiggle.cpp -- - rsem-simulate-reads : simulation.o - $(CC) $(CFLAGS) -o rsem-simulate-reads simulation.o - --simulation.o : simulation.cpp -- $(CC) $(CFLAGS) $(COFLAGS) simulation.cpp -- - rsem-run-gibbs : Gibbs.o - $(CC) $(CFLAGS) -o rsem-run-gibbs Gibbs.o -lpthread - --Gibbs.o : Gibbs.cpp -- $(CC) $(CFLAGS) $(COFLAGS) Gibbs.cpp -- - rsem-calculate-credibility-intervals : calcCI.o - $(CC) $(CFLAGS) -o rsem-calculate-credibility-intervals calcCI.o -lpthread - --calcCI.o : calcCI.cpp -- $(CC) $(CFLAGS) $(COFLAGS) calcCI.cpp -- - rsem-get-unique : getUnique.cpp sam/libbam.a - $(CC) $(CFLAGS) -O3 getUnique.cpp sam/libbam.a -lz -lpthread -o $@ - -@@ -76,9 +81,6 @@ rsem-sam-validator : samValidator.cpp sam/libbam.a - rsem-scan-for-paired-end-reads : scanForPairedEndReads.cpp sam/libbam.a - $(CC) $(CFLAGS) -O3 scanForPairedEndReads.cpp sam/libbam.a -lz -lpthread -o $@ - --ebseq : -- cd EBSeq ; ${MAKE} all -- - clean : - rm -f *.o *~ $(PROGRAMS) - cd sam ; ${MAKE} clean - -From 6ba1c33cccdf7c8e7df7a3189e7db204be3b1e8d Mon Sep 17 00:00:00 2001 -From: Ricardo Wurmus -Date: Wed, 22 Apr 2015 15:28:30 +0200 -Subject: [PATCH 4/7] add ./sam to library directories, link with -lbam - ---- - Makefile | 36 ++++++++++++++++++------------------ - 1 file changed, 18 insertions(+), 18 deletions(-) - -diff --git a/Makefile b/Makefile -index ae4de3b..a87cc4d 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,11 +1,11 @@ - CC = g++ --CFLAGS = -Wall -I. -I./sam -I./boost -+CFLAGS = -Wall -I. -I./sam -I./boost -L./sam - COFLAGS = -O3 -ffast-math -c - PROGRAMS = rsem-extract-reference-transcripts rsem-synthesis-reference-transcripts rsem-preref rsem-parse-alignments rsem-build-read-index rsem-run-em rsem-tbam2gbam rsem-run-gibbs rsem-calculate-credibility-intervals rsem-simulate-reads rsem-bam2wig rsem-get-unique rsem-bam2readdepth rsem-sam-validator rsem-scan-for-paired-end-reads - - .PHONY : all ebseq clean - --all : $(PROGRAMS) -+all : sam/libbam.a $(PROGRAMS) - - sam/libbam.a : - cd sam ; ${MAKE} all -@@ -45,23 +45,23 @@ rsem-synthesis-reference-transcripts : synthesisRef.cpp - rsem-preref : preRef.o - $(CC) $(CFLAGS) preRef.o -o rsem-preref - --rsem-parse-alignments : parseIt.o sam/libbam.a -- $(CC) $(CFLAGS) -o rsem-parse-alignments parseIt.o sam/libbam.a -lz -lpthread -+rsem-parse-alignments : parseIt.o -+ $(CC) $(CFLAGS) -o rsem-parse-alignments parseIt.o -lbam -lz -lpthread - - rsem-build-read-index : buildReadIndex.cpp - $(CC) $(CFLAGS) -O3 buildReadIndex.cpp -o rsem-build-read-index - --rsem-run-em : EM.o sam/libbam.a -- $(CC) $(CFLAGS) -o rsem-run-em EM.o sam/libbam.a -lz -lpthread -+rsem-run-em : EM.o -+ $(CC) $(CFLAGS) -o rsem-run-em EM.o -lbam -lz -lpthread - --rsem-tbam2gbam : tbam2gbam.cpp sam/libbam.a -- $(CC) $(CFLAGS) -O3 tbam2gbam.cpp sam/libbam.a -lz -lpthread -o $@ -+rsem-tbam2gbam : tbam2gbam.cpp -+ $(CC) $(CFLAGS) -O3 tbam2gbam.cpp -lbam -lz -lpthread -o $@ - --rsem-bam2wig : wiggle.o sam/libbam.a bam2wig.cpp -- $(CC) $(CFLAGS) -O3 bam2wig.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ -+rsem-bam2wig : wiggle.o bam2wig.cpp -+ $(CC) $(CFLAGS) -O3 bam2wig.cpp wiggle.o -lbam -lz -lpthread -o $@ - --rsem-bam2readdepth : wiggle.o sam/libbam.a bam2readdepth.cpp -- $(CC) $(CFLAGS) -O3 bam2readdepth.cpp wiggle.o sam/libbam.a -lz -lpthread -o $@ -+rsem-bam2readdepth : wiggle.o bam2readdepth.cpp -+ $(CC) $(CFLAGS) -O3 bam2readdepth.cpp wiggle.o -lbam -lz -lpthread -o $@ - - rsem-simulate-reads : simulation.o - $(CC) $(CFLAGS) -o rsem-simulate-reads simulation.o -@@ -72,14 +72,14 @@ rsem-run-gibbs : Gibbs.o - rsem-calculate-credibility-intervals : calcCI.o - $(CC) $(CFLAGS) -o rsem-calculate-credibility-intervals calcCI.o -lpthread - --rsem-get-unique : getUnique.cpp sam/libbam.a -- $(CC) $(CFLAGS) -O3 getUnique.cpp sam/libbam.a -lz -lpthread -o $@ -+rsem-get-unique : getUnique.cpp -+ $(CC) $(CFLAGS) -O3 getUnique.cpp -lbam -lz -lpthread -o $@ - --rsem-sam-validator : samValidator.cpp sam/libbam.a -- $(CC) $(CFLAGS) -O3 samValidator.cpp sam/libbam.a -lz -lpthread -o $@ -+rsem-sam-validator : samValidator.cpp -+ $(CC) $(CFLAGS) -O3 samValidator.cpp -lbam -lz -lpthread -o $@ - --rsem-scan-for-paired-end-reads : scanForPairedEndReads.cpp sam/libbam.a -- $(CC) $(CFLAGS) -O3 scanForPairedEndReads.cpp sam/libbam.a -lz -lpthread -o $@ -+rsem-scan-for-paired-end-reads : scanForPairedEndReads.cpp -+ $(CC) $(CFLAGS) -O3 scanForPairedEndReads.cpp -lbam -lz -lpthread -o $@ - - clean : - rm -f *.o *~ $(PROGRAMS) - -From 5402b88c269df79ee245c1c59e15f3c8282a0220 Mon Sep 17 00:00:00 2001 -From: Ricardo Wurmus -Date: Wed, 22 Apr 2015 15:33:02 +0200 -Subject: [PATCH 5/7] do not repeat target name, use $@ instead - ---- - Makefile | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/Makefile b/Makefile -index a87cc4d..7ec90a3 100644 ---- a/Makefile -+++ b/Makefile -@@ -37,22 +37,22 @@ wiggle.o: wiggle.cpp - - - rsem-extract-reference-transcripts : extractRef.cpp -- $(CC) $(CFLAGS) -O3 extractRef.cpp -o rsem-extract-reference-transcripts -+ $(CC) $(CFLAGS) -O3 extractRef.cpp -o $@ - - rsem-synthesis-reference-transcripts : synthesisRef.cpp -- $(CC) $(CFLAGS) -O3 synthesisRef.cpp -o rsem-synthesis-reference-transcripts -+ $(CC) $(CFLAGS) -O3 synthesisRef.cpp -o $@ - - rsem-preref : preRef.o -- $(CC) $(CFLAGS) preRef.o -o rsem-preref -+ $(CC) $(CFLAGS) preRef.o -o $@ - - rsem-parse-alignments : parseIt.o -- $(CC) $(CFLAGS) -o rsem-parse-alignments parseIt.o -lbam -lz -lpthread -+ $(CC) $(CFLAGS) -o $@ parseIt.o -lbam -lz -lpthread - - rsem-build-read-index : buildReadIndex.cpp -- $(CC) $(CFLAGS) -O3 buildReadIndex.cpp -o rsem-build-read-index -+ $(CC) $(CFLAGS) -O3 buildReadIndex.cpp -o $@ - - rsem-run-em : EM.o -- $(CC) $(CFLAGS) -o rsem-run-em EM.o -lbam -lz -lpthread -+ $(CC) $(CFLAGS) -o $@ EM.o -lbam -lz -lpthread - - rsem-tbam2gbam : tbam2gbam.cpp - $(CC) $(CFLAGS) -O3 tbam2gbam.cpp -lbam -lz -lpthread -o $@ -@@ -64,13 +64,13 @@ rsem-bam2readdepth : wiggle.o bam2readdepth.cpp - $(CC) $(CFLAGS) -O3 bam2readdepth.cpp wiggle.o -lbam -lz -lpthread -o $@ - - rsem-simulate-reads : simulation.o -- $(CC) $(CFLAGS) -o rsem-simulate-reads simulation.o -+ $(CC) $(CFLAGS) -o $@ simulation.o - - rsem-run-gibbs : Gibbs.o -- $(CC) $(CFLAGS) -o rsem-run-gibbs Gibbs.o -lpthread -+ $(CC) $(CFLAGS) -o $@ Gibbs.o -lpthread - - rsem-calculate-credibility-intervals : calcCI.o -- $(CC) $(CFLAGS) -o rsem-calculate-credibility-intervals calcCI.o -lpthread -+ $(CC) $(CFLAGS) -o $@ calcCI.o -lpthread - - rsem-get-unique : getUnique.cpp - $(CC) $(CFLAGS) -O3 getUnique.cpp -lbam -lz -lpthread -o $@ - -From f60784bc7aa303cc825bd87dd3f5d7d26c51bded Mon Sep 17 00:00:00 2001 -From: Ricardo Wurmus -Date: Wed, 22 Apr 2015 15:44:53 +0200 -Subject: [PATCH 6/7] use automatic variables to refer to prerequisites - ---- - Makefile | 44 ++++++++++++++++++++++---------------------- - 1 file changed, 22 insertions(+), 22 deletions(-) - -diff --git a/Makefile b/Makefile -index 7ec90a3..6540d81 100644 ---- a/Makefile -+++ b/Makefile -@@ -15,71 +15,71 @@ ebseq : - - - calcCI.o : calcCI.cpp -- $(CC) $(CFLAGS) $(COFLAGS) calcCI.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) $< - - EM.o : EM.cpp -- $(CC) $(CFLAGS) $(COFLAGS) EM.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) $< - - Gibbs.o : Gibbs.cpp -- $(CC) $(CFLAGS) $(COFLAGS) Gibbs.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) $< - - preRef.o : preRef.cpp -- $(CC) $(CFLAGS) $(COFLAGS) preRef.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) $< - - parseIt.o : parseIt.cpp -- $(CC) $(CFLAGS) -O2 -c parseIt.cpp -+ $(CC) $(CFLAGS) -O2 -c $< - - simulation.o : simulation.cpp -- $(CC) $(CFLAGS) $(COFLAGS) simulation.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) $< - - wiggle.o: wiggle.cpp -- $(CC) $(CFLAGS) $(COFLAGS) wiggle.cpp -+ $(CC) $(CFLAGS) $(COFLAGS) $< - - - rsem-extract-reference-transcripts : extractRef.cpp -- $(CC) $(CFLAGS) -O3 extractRef.cpp -o $@ -+ $(CC) $(CFLAGS) -O3 $< -o $@ - - rsem-synthesis-reference-transcripts : synthesisRef.cpp -- $(CC) $(CFLAGS) -O3 synthesisRef.cpp -o $@ -+ $(CC) $(CFLAGS) -O3 $< -o $@ - - rsem-preref : preRef.o -- $(CC) $(CFLAGS) preRef.o -o $@ -+ $(CC) $(CFLAGS) $< -o $@ - - rsem-parse-alignments : parseIt.o -- $(CC) $(CFLAGS) -o $@ parseIt.o -lbam -lz -lpthread -+ $(CC) $(CFLAGS) -o $@ $< -lbam -lz -lpthread - - rsem-build-read-index : buildReadIndex.cpp -- $(CC) $(CFLAGS) -O3 buildReadIndex.cpp -o $@ -+ $(CC) $(CFLAGS) -O3 $< -o $@ - - rsem-run-em : EM.o -- $(CC) $(CFLAGS) -o $@ EM.o -lbam -lz -lpthread -+ $(CC) $(CFLAGS) -o $@ $< -lbam -lz -lpthread - - rsem-tbam2gbam : tbam2gbam.cpp -- $(CC) $(CFLAGS) -O3 tbam2gbam.cpp -lbam -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 $< -lbam -lz -lpthread -o $@ - - rsem-bam2wig : wiggle.o bam2wig.cpp -- $(CC) $(CFLAGS) -O3 bam2wig.cpp wiggle.o -lbam -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 $^ -lbam -lz -lpthread -o $@ - - rsem-bam2readdepth : wiggle.o bam2readdepth.cpp -- $(CC) $(CFLAGS) -O3 bam2readdepth.cpp wiggle.o -lbam -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 $^ -lbam -lz -lpthread -o $@ - - rsem-simulate-reads : simulation.o -- $(CC) $(CFLAGS) -o $@ simulation.o -+ $(CC) $(CFLAGS) -o $@ $< - - rsem-run-gibbs : Gibbs.o -- $(CC) $(CFLAGS) -o $@ Gibbs.o -lpthread -+ $(CC) $(CFLAGS) -o $@ $< -lpthread - - rsem-calculate-credibility-intervals : calcCI.o -- $(CC) $(CFLAGS) -o $@ calcCI.o -lpthread -+ $(CC) $(CFLAGS) -o $@ $< -lpthread - - rsem-get-unique : getUnique.cpp -- $(CC) $(CFLAGS) -O3 getUnique.cpp -lbam -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 $< -lbam -lz -lpthread -o $@ - - rsem-sam-validator : samValidator.cpp -- $(CC) $(CFLAGS) -O3 samValidator.cpp -lbam -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 $< -lbam -lz -lpthread -o $@ - - rsem-scan-for-paired-end-reads : scanForPairedEndReads.cpp -- $(CC) $(CFLAGS) -O3 scanForPairedEndReads.cpp -lbam -lz -lpthread -o $@ -+ $(CC) $(CFLAGS) -O3 $< -lbam -lz -lpthread -o $@ - - clean : - rm -f *.o *~ $(PROGRAMS) - -From 0cf9721077f67fb4ca15fdc59cbfbf24a944debd Mon Sep 17 00:00:00 2001 -From: Ricardo Wurmus -Date: Wed, 22 Apr 2015 15:49:19 +0200 -Subject: [PATCH 7/7] split long line - ---- - Makefile | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 6540d81..0ab04a5 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,22 @@ - CC = g++ - CFLAGS = -Wall -I. -I./sam -I./boost -L./sam - COFLAGS = -O3 -ffast-math -c --PROGRAMS = rsem-extract-reference-transcripts rsem-synthesis-reference-transcripts rsem-preref rsem-parse-alignments rsem-build-read-index rsem-run-em rsem-tbam2gbam rsem-run-gibbs rsem-calculate-credibility-intervals rsem-simulate-reads rsem-bam2wig rsem-get-unique rsem-bam2readdepth rsem-sam-validator rsem-scan-for-paired-end-reads -+PROGRAMS = \ -+ rsem-extract-reference-transcripts \ -+ rsem-synthesis-reference-transcripts \ -+ rsem-preref \ -+ rsem-parse-alignments \ -+ rsem-build-read-index \ -+ rsem-run-em \ -+ rsem-tbam2gbam \ -+ rsem-run-gibbs \ -+ rsem-calculate-credibility-intervals \ -+ rsem-simulate-reads \ -+ rsem-bam2wig \ -+ rsem-get-unique \ -+ rsem-bam2readdepth \ -+ rsem-sam-validator \ -+ rsem-scan-for-paired-end-reads - - .PHONY : all ebseq clean - -- cgit v1.2.3 From f5c10a94eff314ed985089719e817cd036a746f1 Mon Sep 17 00:00:00 2001 From: fis trivial Date: Thu, 20 Sep 2018 13:37:26 +0000 Subject: gnu: gprolog: Update to 1.4.5. * gnu/packages/gprolog.scm (gprolog): Update to 1.4.5. [source]: Add an alternate source URL. Signed-off-by: Leo Famulari --- gnu/packages/gprolog.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gprolog.scm b/gnu/packages/gprolog.scm index b27b080ca7..166bf33294 100644 --- a/gnu/packages/gprolog.scm +++ b/gnu/packages/gprolog.scm @@ -27,15 +27,18 @@ (define-public gprolog (package (name "gprolog") - (version "1.4.4") + (version "1.4.5") (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gprolog/gprolog-" version - ".tar.gz")) - (sha256 - (base32 - "13miyas47bmijmadm68cbvb21n4s156gjafz7kfx9brk9djfkh0q")))) + (origin + (method url-fetch) + ;; Recent versions are not hosted on the GNU mirrors. + (uri (list (string-append "http://gprolog.org/gprolog-" version + ".tar.gz") + (string-append "mirror://gnu/gprolog/gprolog-" version + ".tar.gz"))) + (sha256 + (base32 + "0z4cc42n3k6i35b8mr816iwsvrpxshw6d7dgz6s2h1hy0l7g1p5z")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From ea2364621a57f4797a512caa53cbf0d4475c1c90 Mon Sep 17 00:00:00 2001 From: fis trivial Date: Thu, 20 Sep 2018 13:29:15 +0000 Subject: gnu: qbittorrent: Update to 4.1.3. * gnu/packages/bittorrent.scm (qbittorrent): Update to 4.1.3. [inputs]: Use python-wrapper instead of python. Signed-off-by: Leo Famulari --- gnu/packages/bittorrent.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 3937fac745..59fbd6906b 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -409,7 +409,7 @@ desktops.") (define-public qbittorrent (package (name "qbittorrent") - (version "4.0.4") + (version "4.1.3") (source (origin (method url-fetch) (uri (string-append @@ -418,7 +418,7 @@ desktops.") (file-name (string-append name "-release-" version ".tar.gz")) (sha256 (base32 - "145r4lv7rqdhrm5znn3ndxsfdf579n46zvj7c53c422am8ir5xhp")))) + "00zrpnwanq9f7maky2z4wnzw08xy902s77scm2gcvxxxankr4j92")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -434,7 +434,7 @@ desktops.") `(("boost" ,boost) ("libtorrent-rasterbar" ,libtorrent-rasterbar) ("openssl" ,openssl) - ("python" ,python) + ("python" ,python-wrapper) ("qtbase" ,qtbase) ("qtsvg" ,qtsvg) ("zlib" ,zlib))) -- cgit v1.2.3 From c6ede267e64ea6b5e3546274fafd2afc84f8b140 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 20 Sep 2018 17:58:31 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.157. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.157. --- 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 e34c67cb0f..1657ebc71a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.156" - "13j4jb4hifh3fah2ysy2425fakwqqdh2z23lf4i0frxa1xl974h2" + (make-linux-libre "4.4.157" + "00bnfqwkr0jfdabmwx5qk5bqxn5vwnnzwqbm5rfg7lggii74kk54" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 41d6afb266a7bf2f0df95915a0fefc714e191199 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 20 Sep 2018 17:59:10 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.128. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.128. --- 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 1657ebc71a..7034291d02 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.127" - "0q7h5gnl3ikic0pvwrxp78pz56yvijhz6s84gb92xywi1v3dd8mh" + (make-linux-libre "4.9.128" + "0lww23xcyyg0dwzrap5x9d700gy3lbxln55n6sqqkm7m89dkqwha" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From c57a2a12b17fb3595a1a2c85da7c796e2ee9815c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 20 Sep 2018 18:00:47 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.71. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.71. (%linux-libre-4.14-hash): 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 7034291d02..22cc7dff9b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.70") -(define %linux-libre-4.14-hash "138v51m6k57wnvlf9c22dad0w819mfb8f95i6w99mlg69qpwdvag") +(define %linux-libre-4.14-version "4.14.71") +(define %linux-libre-4.14-hash "1akvykaccy7ikl8v04grwxvgs4z2rrs7drf2s85ysqwq79mdh3gq") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 83e8b1d7946d07d1c26dd7bd6e11e6e9396024ac Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 20 Sep 2018 18:01:38 -0400 Subject: gnu: linux-libre: Update to 4.18.9. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.9. (%linux-libre-hash): 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 22cc7dff9b..170c77374d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.8") -(define %linux-libre-hash "163awpba1yd0x33xzj5dczimk4y96xc28syc4w2ad0qafgapng8l") +(define %linux-libre-version "4.18.9") +(define %linux-libre-hash "0wwmhnfvcsdlqhzwwwyz1x5a3ldjky6l0xir1pi6pysr0lak402x") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From 1bfaae25fab372c8ff86e34024adf20240699b55 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 20 Sep 2018 22:12:10 +0200 Subject: gnu: rust@1.20.0: Fix tests. * gnu/packages/rust.scm (rust-1.23)[arguments]<#:phases> [patch-cargo-tests, ignore-glibc-2.27-incompatible-test,fix-mtime-bug]: Move to... (rust-1.20): ... here. --- gnu/packages/rust.scm | 57 ++++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 74de6f3ae1..ec8b30d78f 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -514,6 +514,35 @@ safety and thread safety guarantees.") (substitute-keyword-arguments (package-arguments rust-1.19) ((#:phases phases) `(modify-phases ,phases + (add-after 'patch-tests 'patch-cargo-tests + (lambda _ + (substitute* "src/tools/cargo/tests/build.rs" + (("/usr/bin/env") (which "env")) + ;; Guix llvm is compiled without asmjs-unknown-emscripten. + (("fn wasm32_final_outputs") "#[ignore]\nfn wasm32_final_outputs")) + (substitute* "src/tools/cargo/tests/death.rs" + ;; This is stuck when built in container. + (("fn ctrl_c_kills_everyone") "#[ignore]\nfn ctrl_c_kills_everyone")) + ;; Prints test output in the wrong order when built on + ;; i686-linux. + (substitute* "src/tools/cargo/tests/test.rs" + (("fn cargo_test_env") "#[ignore]\nfn cargo_test_env")) + #t)) + (add-after 'patch-cargo-tests 'ignore-glibc-2.27-incompatible-test + ;; https://github.com/rust-lang/rust/issues/47863 + (lambda _ + (substitute* "src/test/run-pass/out-of-stack.rs" + (("// ignore-android") "// ignore-test\n// ignore-android")) + #t)) + (add-after 'ignore-glibc-2.27-incompatible-test 'fix-mtime-bug + (lambda* _ + (substitute* "src/build_helper/lib.rs" + ;; Bug in Rust code. + ;; Current implementation assume that if dst not exist then it's mtime + ;; is 0, but in same time "src" have 0 mtime in guix build! + (("let threshold = mtime\\(dst\\);") + "if !dst.exists() {\nreturn false\n}\n let threshold = mtime(dst);")) + #t)) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -651,34 +680,6 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ;; XXX: Revisit this when we use gcc 6. (substitute* "src/binaryen/CMakeLists.txt" (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") "")) - #t)) - (add-after 'patch-tests 'patch-cargo-tests - (lambda _ - (substitute* "src/tools/cargo/tests/build.rs" - (("/usr/bin/env") (which "env")) - ;; Guix llvm is compiled without asmjs-unknown-emscripten. - (("fn wasm32_final_outputs") "#[ignore]\nfn wasm32_final_outputs")) - (substitute* "src/tools/cargo/tests/death.rs" - ;; This is stuck when built in container. - (("fn ctrl_c_kills_everyone") "#[ignore]\nfn ctrl_c_kills_everyone")) - ;; Prints test output in the wrong order when built on - ;; i686-linux. - (substitute* "src/tools/cargo/tests/test.rs" - (("fn cargo_test_env") "#[ignore]\nfn cargo_test_env")) - #t)) - (add-after 'patch-cargo-tests 'ignore-glibc-2.27-incompatible-test - ;; https://github.com/rust-lang/rust/issues/47863 - (lambda _ - (substitute* "src/test/run-pass/out-of-stack.rs" - (("// ignore-android") "// ignore-test\n// ignore-android")))) - (add-after 'ignore-glibc-2.27-incompatible-test 'fix-mtime-bug - (lambda* _ - (substitute* "src/build_helper/lib.rs" - ;; Bug in Rust code. - ;; Current implementation assume that if dst not exist then it's mtime - ;; is 0, but in same time "src" have 0 mtime in guix build! - (("let threshold = mtime\\(dst\\);") - "if !dst.exists() {\nreturn false\n}\n let threshold = mtime(dst);")) #t)))))))) (define-public rust-1.24 -- cgit v1.2.3 From e0b07ccc1ab0b763f0e9da39f56f2a7aec6116d5 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 20 Sep 2018 22:16:45 +0200 Subject: gnu: rust: Work around mtime bug in rust build helpers. * gnu/packages/rust.scm (rust-1.20)[arguments]<#:phases>[fix-mtime-bug]: Delete. [reset-timestamps-after-changes]: Modify. (rust-1.24): Don't delete "fix-mtime-bug" since now it doesn't ever get created. --- gnu/packages/rust.scm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index ec8b30d78f..e8eca80aa6 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -534,15 +534,6 @@ safety and thread safety guarantees.") (substitute* "src/test/run-pass/out-of-stack.rs" (("// ignore-android") "// ignore-test\n// ignore-android")) #t)) - (add-after 'ignore-glibc-2.27-incompatible-test 'fix-mtime-bug - (lambda* _ - (substitute* "src/build_helper/lib.rs" - ;; Bug in Rust code. - ;; Current implementation assume that if dst not exist then it's mtime - ;; is 0, but in same time "src" have 0 mtime in guix build! - (("let threshold = mtime\\(dst\\);") - "if !dst.exists() {\nreturn false\n}\n let threshold = mtime(dst);")) - #t)) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -608,10 +599,11 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (delete 'patch-cargo-tomls) (add-before 'build 'reset-timestamps-after-changes (lambda* _ - (define ref (stat "README.md")) (for-each (lambda (filename) - (set-file-time filename ref)) + ;; Rust 1.20.0 treats timestamp 0 as "file doesn't exist". + ;; Therefore, use timestamp 1. + (utime filename 1 1 1 1)) (find-files "." #:directories? #t)) #t)) (replace 'build @@ -699,8 +691,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ;; This test is known to fail on aarch64 and powerpc64le: ;; https://github.com/rust-lang/rust/issues/45410 (("fn test_loading_cosine") "#[ignore]\nfn test_loading_cosine")) - #t)) - (delete 'fix-mtime-bug)))))))) + #t))))))))) (define-public rust-1.25 (let ((base-rust -- cgit v1.2.3 From eeecbe09cc497b1ed9a2000283a5767903ba2fb4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 08:07:25 +0200 Subject: gnu: perl-dbd-mysql: Update to 4.048. * gnu/packages/databases.scm (perl-dbd-mysql): Update to 4.048. --- gnu/packages/databases.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9db892a0b7..9e8c9d8f9e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1458,15 +1458,15 @@ columns, primary keys, unique constraints and relationships.") (define-public perl-dbd-mysql (package (name "perl-dbd-mysql") - (version "4.047") + (version "4.048") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/C/CA/CAPTTOFU/" + (uri (string-append "mirror://cpan/authors/id/M/MI/MICHIELB/" "DBD-mysql-" version ".tar.gz")) (sha256 (base32 - "0idizgr0hr7sj92fbdlb3gv6cva15jkpaq28wrdw4j4p7awx2mls")))) + "1zqmch6c9gq06z90mkmk1skajk2kaggriw19ym5w04l7wv5gydqp")))) (build-system perl-build-system) (arguments `(#:phases -- cgit v1.2.3 From 4aa64e3a819ca53629b1cbe58c079eefa7dd24b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 08:09:35 +0200 Subject: gnu: ubuntu-keyring: Update to 2018.09.18.1. * gnu/packages/debian.scm (ubuntu-keyring): Update to 2018.09.18.1. --- gnu/packages/debian.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 1974672fb6..185dacfe73 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -71,7 +71,7 @@ contains the archive keys used for that.") (define-public ubuntu-keyring (package (name "ubuntu-keyring") - (version "2018.02.28") + (version "2018.09.18.1") (source (origin (method url-fetch) @@ -79,7 +79,7 @@ contains the archive keys used for that.") "+files/" name "_" version ".tar.gz")) (sha256 (base32 - "1zj3012cz7rlx9pm39wnwa0lmi1h38n6bkgbz81vnmcsvqsc9a3a")))) + "0csx2n62rj9rxjv4y8qhby7l9rbybfwrb0406pc2cjr7f2yk91af")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 1779aaa09a576401e35bf4a0d1534ee546b5506e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 08:19:42 +0200 Subject: Add 'GNU Guix' comment to all (gnu packages) headers. * gnu/packages/debian.scm, gnu/packages/syndication.scm: Add comments. --- gnu/packages/debian.scm | 3 +++ gnu/packages/syndication.scm | 3 +++ 2 files changed, 6 insertions(+) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 185dacfe73..5ea263149e 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -1,6 +1,9 @@ +;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; +;;; 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 diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index f37c0eaac5..6247d1f3b6 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -1,6 +1,9 @@ +;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; +;;; 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 -- cgit v1.2.3 From 29ddbc5607c8ad7bb0622e10716e60396817a42d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 08:46:11 +0200 Subject: gnu: python-pydot: Update to 1.2.4. * gnu/packages/graphviz.scm (python-pydot): Update to 1.2.4. [arguments]: Run the test suite. [native-inputs]: Add python-chardet. --- gnu/packages/graphviz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 09f46fab84..569923d4e0 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -220,17 +220,18 @@ be used either as a standalone application, or as a python library.") (define-public python-pydot (package (name "python-pydot") - (version "1.2.3") + (version "1.2.4") (source (origin (method url-fetch) (uri (pypi-uri "pydot" version)) (sha256 (base32 - "00imlz0033dygb9gdag1xr0cybn33gk5jsdi9ffbszzr97rd7dgd")))) + "1dhy4jpp646jslh2yks6klwwbaxcs905byyny880gl1iap8y5llj")))) (build-system python-build-system) - ;; FIXME: No tests in PyPi release tarball. - (arguments '(#:tests? #f)) + (native-inputs + ;; For tests. + `(("python-chardet" ,python-chardet))) (propagated-inputs `(("python-pyparsing" ,python-pyparsing))) (home-page "https://github.com/erocarrera/pydot") -- cgit v1.2.3 From 3752b683dc16e172f57f8397a542e562f564fc30 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 09:13:45 +0200 Subject: gnu: openscenegraph: Update to 3.6.3. * gnu/packages/graphics.scm (openscenegraph): Update to 3.6.3. [source]: Use GIT-FILE-NAME. [inputs]: Remove unused pth and qtbase. --- gnu/packages/graphics.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9c2869c12b..58c742b825 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -406,7 +406,7 @@ visual effects work for film.") (define-public openscenegraph (package (name "openscenegraph") - (version "3.6.2") + (version "3.6.3") (source (origin (method git-fetch) @@ -415,8 +415,8 @@ visual effects work for film.") (commit (string-append "OpenSceneGraph-" version)))) (sha256 (base32 - "03jk6lclyd4biniaw04w7j0z1spkm69f1c19i37b8v9x3zv1p1id")) - (file-name (string-append name "-" version "-checkout")))) + "0h32z15sa8sbq276j0iib0n707m8bs4p5ji9z2ah411446paad9q")) + (file-name (git-file-name name version)))) (properties `((upstream-name . "OpenSceneGraph"))) (build-system cmake-build-system) @@ -437,8 +437,6 @@ visual effects work for film.") ("jasper" ,jasper) ("librsvg" ,librsvg) ("libxrandr" ,libxrandr) - ("pth" ,pth) - ("qtbase" ,qtbase) ("ffmpeg" ,ffmpeg) ("mesa" ,mesa))) (synopsis "High performance real-time graphics toolkit") -- cgit v1.2.3 From 1df40d3dbff82c2990271b406b32633fe216d143 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 21 Sep 2018 11:52:12 +0200 Subject: gnu: emacs-orgalist: Update to 1.9. * gnu/packages/emacs.scm (emacs-orgalist): Update to 1.9. --- 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 9b3a90bd33..fc019cf241 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5252,7 +5252,7 @@ distribution, primarily targeting Clojure users") (define-public emacs-orgalist (package (name "emacs-orgalist") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) @@ -5260,7 +5260,7 @@ distribution, primarily targeting Clojure users") "orgalist-" version ".el")) (sha256 (base32 - "1wqwnmn08i0qkxm8b2iclvf6cydcn68h1p3h7r1kig2bdn5b8948")))) + "1rmmcyiiqkq54hn74nhzxzl4nvd902hv6gq341jwhrm7yiagffi6")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/orgalist.html") (synopsis "Manage Org-like lists in non-Org buffers") -- cgit v1.2.3 From 174988fa05fbda4a9cdaab77d59fe4ea187b0e6b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 12:18:55 +0200 Subject: gnu: perl-xml-compile: Update to 1.60. * gnu/packages/xml.scm (perl-xml-compile): Update to 1.60. [propagated-inputs]: Add perl-carp, perl-scalar-list-utils, and perl-types-serialiser. --- gnu/packages/xml.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 9c8e3cef08..aa1395286f 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -665,20 +665,23 @@ This module provide functions which simplify writing tests for (define-public perl-xml-compile (package (name "perl-xml-compile") - (version "1.54") + (version "1.60") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/M/MA/MARKOV/" "XML-Compile-" version ".tar.gz")) (sha256 (base32 - "1hp41960bpqxvv1samv9hc0ghhmvs3i16r4rfl9yp54lp6jhsr2c")))) + "04vv7wy5v1l38xsfdbacvyd90qircvnrs2f3ysljm1nhq8mycmwm")))) (build-system perl-build-system) (propagated-inputs - `(("perl-log-report" ,perl-log-report) + `(("perl-carp" ,perl-carp) + ("perl-log-report" ,perl-log-report) ("perl-xml-compile-tester" ,perl-xml-compile-tester) ("perl-xml-libxml" ,perl-xml-libxml) - ("perl-test-deep" ,perl-test-deep))) + ("perl-scalar-list-utils" ,perl-scalar-list-utils) + ("perl-test-deep" ,perl-test-deep) + ("perl-types-serialiser" ,perl-types-serialiser))) (home-page "https://metacpan.org/release/XML-Compile") (synopsis "Compilation-based XML processing") (description -- cgit v1.2.3 From 6f05556ba77def387d862ee44d6658d8d647ad3c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 12:21:38 +0200 Subject: gnu: s6: Update to 2.7.2.1. * gnu/packages/skarnet.scm (s6): Update to 2.7.2.1. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 9a6733d8bc..6546d40597 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -105,7 +105,7 @@ complexity."))) (define-public s6 (package (name "s6") - (version "2.7.2.0") + (version "2.7.2.1") (source (origin (method url-fetch) @@ -113,7 +113,7 @@ complexity."))) version ".tar.gz")) (sha256 (base32 - "02canrzmhr66gi16ldyylk378jlmyfl73vn72ayr12h2wyxgqm5g")))) + "0vyl4wr2l4mp9ams0dyg224qxhl8ksxsv2shs6606lhhp9g1rb6b")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs) ("execline" ,execline))) -- cgit v1.2.3 From e36058634d1754ab6d69f01a448efd691c2a1637 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 12:47:38 +0200 Subject: gnu: python-hdf4: Use INVOKE. * gnu/packages/python.scm (python-hdf4)[arguments]: Substitute INVOKE for SYSTEM*. --- 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 6927924a68..b8521fa0e4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -767,8 +767,8 @@ and verifies that it matches the intended target hostname.") (setenv "PYTHONPATH" (string-append (getcwd) ":" (getenv "PYTHONPATH"))) - (and (zero? (system* "./runexamples.sh")) - (zero? (system* "nosetests" "-v")))))))) + (invoke "./runexamples.sh") + (invoke "nosetests" "-v")))))) (home-page "https://github.com/fhs/python-hdf4") (synopsis "Python interface to the NCSA HDF4 library") (description -- cgit v1.2.3 From a1d6610e84f4ff61913e1e861093b38c2beb9614 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 12:58:02 +0200 Subject: gnu: python-rencode: Update to 1.0.5. * gnu/packages/python.scm (python-rencode): Update to 1.0.5. [arguments]: Add a 'delete-bogus-test' phase. --- gnu/packages/python.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b8521fa0e4..64ee4e028e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12456,15 +12456,24 @@ library.") (define-public python-rencode (package (name "python-rencode") - (version "1.0.3") + (version "1.0.5") (source (origin (method url-fetch) (uri (pypi-uri "rencode" version)) (sha256 (base32 - "08if5yax1xn5yfp8p3765ccjmfcv9di7i4m5jckgnwvdsgznwkbj")))) + "0mzwdq1is7kyyr32i5k4iz6g5xxdvmiyc132jnc60p9m6lnwjrpv")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'delete-bogus-test + ;; This test requires /home/aresch/Downloads, which is not provided by + ;; the build environment. + (lambda _ + (delete-file "rencode/t.py") + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("python-cython" ,python-cython))) (home-page "https://github.com/aresch/rencode") -- cgit v1.2.3 From 101ad242be256d6a5953187be56d61f89e1317d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 13:13:45 +0200 Subject: gnu: python-paramiko: Use HTTPS home page. * gnu/packages/python-crypto.scm (python-paramiko)[home-page]: Use HTTPS. --- gnu/packages/python-crypto.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 63dc1a54df..5dce8ffdda 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -220,7 +220,7 @@ This package provides a Python interface for BLAKE2.") ("python-pyasn1" ,python-pyasn1) ("python-pynacl" ,python-pynacl) ("python-cryptography" ,python-cryptography))) - (home-page "http://www.paramiko.org/") + (home-page "https://www.paramiko.org/") (synopsis "SSHv2 protocol library") (description "Paramiko is a python implementation of the SSHv2 protocol, providing both client and server functionality. While it leverages a Python C -- cgit v1.2.3 From 6569549dfa0c35e0f80869a630cd216d01c84590 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 13:15:55 +0200 Subject: gnu: python-paramiko: Update to 2.4.2 [security fixes]. * gnu/packages/python-crypto.scm (python-paramiko): Update to 2.4.2. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 5dce8ffdda..bda547417c 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -203,14 +203,14 @@ This package provides a Python interface for BLAKE2.") (define-public python-paramiko (package (name "python-paramiko") - (version "2.4.1") + (version "2.4.2") (source (origin (method url-fetch) (uri (pypi-uri "paramiko" version)) (sha256 (base32 - "1wx4s95i2cdh8hhi1c3jb8lzk71jifa3z9wjfsx905y7lrsngqrk")))) + "1jqgj2gl1pz7bi2aab1r2xq0ml0gskmm9p235cg9y32nydymm5x8")))) (build-system python-build-system) (arguments `(;; FIXME: Tests require many unpackaged libraries, see dev-requirements.txt. -- cgit v1.2.3 From c5327efb97208df569b4682ef5bfe4ac825d1c4f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 21 Sep 2018 04:34:10 -0400 Subject: gnu: libvpx: Add upstream security fix. * gnu/packages/patches/libvpx-use-after-free-in-postproc.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/video.scm (libvpx)[source]: Add patch. --- gnu/local.mk | 1 + .../libvpx-use-after-free-in-postproc.patch | 34 ++++++++++++++++++++++ gnu/packages/video.scm | 3 +- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libvpx-use-after-free-in-postproc.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4bca986619..9c69fd4f35 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -916,6 +916,7 @@ dist_patch_DATA = \ %D%/packages/patches/libutils-remove-damaging-includes.patch \ %D%/packages/patches/libvdpau-va-gl-unbundle.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ + %D%/packages/patches/libvpx-use-after-free-in-postproc.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \ %D%/packages/patches/lierolibre-check-unaligned-access.patch \ diff --git a/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch b/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch new file mode 100644 index 0000000000..04f2a953b7 --- /dev/null +++ b/gnu/packages/patches/libvpx-use-after-free-in-postproc.patch @@ -0,0 +1,34 @@ +From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001 +From: Jerome Jiang +Date: Wed, 23 May 2018 15:43:00 -0700 +Subject: [PATCH] VP8: Fix use-after-free in postproc. + +The pointer in vp8 postproc refers to show_frame_mi which is only +updated on show frame. However, when there is a no-show frame which also +changes the size (thus new frame buffers allocated), show_frame_mi is +not updated with new frame buffer memory. + +Change the pointer in postproc to mi which is always updated. + +Bug: 842265 +Change-Id: I33874f2112b39f74562cba528432b5f239e6a7bd +--- + vp8/common/postproc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c +index d67ee8a57..8c292d616 100644 +--- a/vp8/common/postproc.c ++++ b/vp8/common/postproc.c +@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BUFFER_CONFIG *source, + double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; + int ppl = (int)(level + .5); + +- const MODE_INFO *mode_info_context = cm->show_frame_mi; ++ const MODE_INFO *mode_info_context = cm->mi; + int mbr, mbc; + + /* The pixel thresholds are adjusted according to if or not the macroblock +-- +2.19.0 + diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4882f0476a..448773e0d9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1242,7 +1242,8 @@ access to mpv's powerful playback capabilities.") (sha256 (base32 "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6")) - (patches (search-patches "libvpx-CVE-2016-2818.patch")))) + (patches (search-patches "libvpx-use-after-free-in-postproc.patch" + "libvpx-CVE-2016-2818.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-shared" -- cgit v1.2.3 From e67ad5532f76b53e955149da2f1e237696ff0893 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 21 Sep 2018 03:28:03 -0400 Subject: gnu: icecat: Update to 60.2.0-gnu1 (pre-release). * gnu/packages/gnuzilla.scm (icecat): Update to 60.2.0-gnu1. [source]: Download pre-release from alpha.gnu.org. Remove obsolete patches. Comment out the code to delete the bundled copies of libevent, cairo, harfbuzz, and graphite2. [inputs]: Use the latest ffmpeg. Comment out libevent, cairo, harfbuzz, and graphite2. [native-inputs]: Add rust and cargo. [arguments]: Remove --enable-gio and --disable-gnomeui. Add --disable-stylo. Comment out --with-system-{libevent,harfbuzz,graphite2}, --enable-system-cairo. Import %cargo-build-system-modules. Add 'patch-cargo-checksums' phase. * gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch, gnu/packages/patches/icecat-bug-1413868-pt1.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 2 - gnu/packages/gnuzilla.scm | 160 ++--- .../icecat-CVE-2018-5157-and-CVE-2018-5158.patch | 441 -------------- gnu/packages/patches/icecat-bug-1413868-pt1.patch | 663 --------------------- 4 files changed, 49 insertions(+), 1217 deletions(-) delete mode 100644 gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch delete mode 100644 gnu/packages/patches/icecat-bug-1413868-pt1.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9c69fd4f35..4097ad5fcd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -811,8 +811,6 @@ dist_patch_DATA = \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ - %D%/packages/patches/icecat-bug-1413868-pt1.patch \ - %D%/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch \ %D%/packages/patches/icecat-use-system-graphite2.patch \ %D%/packages/patches/icecat-use-system-harfbuzz.patch \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 77a74a0ec4..db8f85cfb1 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -35,6 +35,7 @@ #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system cargo) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages databases) @@ -58,6 +59,7 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages gl) #:use-module (gnu packages assembly) + #:use-module (gnu packages rust) #:use-module (gnu packages icu4c) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) @@ -478,112 +480,25 @@ security standards.") (define-public icecat (package (name "icecat") - (version "52.6.0-gnu1") + (version "60.2.0-gnu1") (source (origin (method url-fetch) + ;; Temporary URL pending official release: + (uri "https://alpha.gnu.org/gnu/gnuzilla/60.2.0/icecat-60.2.0-gnu1.tar.bz2") + #; (uri (string-append "mirror://gnu/gnuzilla/" (first (string-split version #\-)) "/" name "-" version ".tar.bz2")) (sha256 (base32 - "09fn54glqg1aa93hnz5zdcy07cps09dbni2b4200azh6nang630a")) + "0lqx7g79x15941rhjr3qsfwsny6vzc7d7abdmvjy6jjbqkqlc1zl")) (patches (list (search-patch "icecat-avoid-bundled-libraries.patch") - (search-patch "icecat-use-system-harfbuzz.patch") - (search-patch "icecat-use-system-graphite2.patch") - (mozilla-patch "icecat-bug-546387.patch" "d13e3fefb76e" "1b760r0bg2ydbl585wlmajljh1nlisrwxvjws5b28a3sgjy01i6k") - (mozilla-patch "icecat-bug-1350152.patch" "f822bda79c28" "1wf56169ca874shr6r7qx40s17h2gwj7ngmpyylrpmd1c6hipvsj") - (mozilla-patch "icecat-bug-1411708.patch" "34c968767eb7" "0l2jy201ikj3m3h66mvlsj4y0ki7cpm7x7nnfygbwnfxg42s1sip") - (mozilla-patch "icecat-bug-1375217.patch" "00fc630c9a46" "17pcprp452nslk6sac6sili0p74zh8w3g0v1wsdn0ikm9xmnphhv") - (mozilla-patch "icecat-CVE-2018-5145.patch" "f0ec180993d2" "0jiazxcwki83wr00fyh2g518ynsd33p7nk65zk4d1682gn22lc8v") - (mozilla-patch "icecat-CVE-2018-5130.patch" "a6a9e26688c1" "0cvizvilb4k422j2gzqcbakznvsffmk6n6xn1ayj5rgxfaizkkqk") - (mozilla-patch "icecat-CVE-2018-5125-pt1.patch" "198ad052621e" "1721zx8hifdlflrhvw6hmkdgjbvsmxl9n84iji5qywhlp2krdk9r") - (mozilla-patch "icecat-bug-1426087.patch" "391ea77ebfdb" "1fhkvd0z6mvdkj7m0d3jlj42rsdw5r4x122c1wb1i428228ifw6n") - (mozilla-patch "icecat-bug-1416307.patch" "54f2f7f93b30" "1ncjir16mqya37wgf6fy2rqki3vl433c4grjr3fypmlig6xfgg1l") - (mozilla-patch "icecat-CVE-2018-5127.patch" "2c4d7a59041b" "178c6gid89cvw52yqs43i6x6s5w0hslj0rfa2r8b4762ij3civ92") - (mozilla-patch "icecat-CVE-2018-5125-pt2.patch" "f87ef3774d5e" "0payf3az2w93nzl5qknqx290jbxk8v39rwhdgq7wyd5f245dywxk") - (mozilla-patch "icecat-CVE-2018-5125-pt3.patch" "ac743923f81d" "0msyr45xr1j5q4x6ah4r907pwjngyi0k6pp9y8ixk21cnwbzrdwx") - (mozilla-patch "icecat-CVE-2018-5129.patch" "456913d7e8b5" "0fx0s06kxxj7g4hllinaskgh41z3k48zml6yqqzxx485qk3hdh9x") - (mozilla-patch "icecat-bug-1334465-pt1.patch" "f95c5b881442" "0iaddhf65jd9cycj4bw0b207n2jiqkr4q84jifzyqn4ygs75wdqd") - (mozilla-patch "icecat-bug-1334465-pt2.patch" "8a4265c8fb41" "1d9zfdbrlw9wzr84b7pj7lxgy487lsx0kfd89287hjk0al8m6vrw") - (mozilla-patch "icecat-bug-1398021.patch" "28855df568d8" "1kmq836gniplxpjnvq8lhbcc1aqi56al628r1mzdy94b5yb0lis3") - (mozilla-patch "icecat-bug-1388020.patch" "e8ab2736499b" "0n28vcd65rxsyq3z22rfcfksryfndhm1i3g6ah3akg11jnagqf5v") - (mozilla-patch "icecat-CVE-2018-5125-pt4.patch" "014877bf17ea" "0hk90pnf7h7kvidji6ydvva1zpyraipn03pjhvprdqr7k2fqzmsz") - (mozilla-patch "icecat-CVE-2018-5125-pt5.patch" "5b3a5de48912" "1ifya05rcd34ryp9zawdacihhkkf2m0xn2q8m8c6v78bvxj0mgig") - (mozilla-patch "icecat-CVE-2018-5144.patch" "1df9b4404acd" "1sd59vsarfsbh3vlrzrqv6n1ni7vxdzm83j6s6g0fygl1h8kwijg") - (mozilla-patch "icecat-bug-1430173-pt1.patch" "9124c3972e2b" "13ns5yy39yzfx7lrkv4rgwdz6s6q0z4i09wkbxdvnkfsz17cd17i") - (mozilla-patch "icecat-bug-1430173-pt2.patch" "9f6dc031be51" "0bv2p98z5ahp3x9wxnhwxn87g21djvzzp7jy55ik90hqixsbhwdl") - (mozilla-patch "icecat-CVE-2018-5131.patch" "3102fbb97b32" "0kg0183v92gxjb9255xjwhxyd6gl77l9c0civx3040k975fybwlp") - (mozilla-patch "icecat-CVE-2018-5125-pt6.patch" "4904c0f4a645" "0lsq62ynksy1fbw0m87f1d741fyvrrp1vrznx5hx0l2p4g4frhv3") - (mozilla-patch "icecat-CVE-2018-5125-pt7.patch" "16b8073d5c30" "1dv94qqah1wjd3bxjvrkmjbb2f95d3d11zpm8mggdk52il575bwl") - (mozilla-patch "icecat-bug-1442127-pt1.patch" "f931f85b09da" "02s380w8a73g4w2wm810lbigh4z4rrlfy10ywwhv4lpkbk8xg7pr") - (mozilla-patch "icecat-bug-1442127-pt2.patch" "da5792b70f30" "116k9qja5ir9b3laazasp43f5jx59qq72nknmq5bn5v1ixya9r4l") - (mozilla-patch "icecat-CVE-2018-5125-pt8.patch" "62b831df8269" "109pn0hqn7s27580glv4z7qv1pmjzii9szvf3wkn97k5wybrzgkx") - (mozilla-patch "icecat-bug-1442504.patch" "8954ce68a364" "0bl65zw82bwqg0mmcri94pxqq6ibff7y5rclkzapb081p6yvf73q") - (mozilla-patch "icecat-CVE-2018-5125-pt9.patch" "8a16f439117c" "108iarql6z7h1r4rlzac6n6lrzs78x7kcdbfa0b5dbr5xc66jmgb") - (mozilla-patch "icecat-bug-1426603.patch" "ca0b92ecedee" "0dc3mdl4a3hrq4j384zjavf3splj6blv4masign710hk7svlgbhq") - (mozilla-patch "icecat-CVE-2018-5146.patch" "494e5d5278ba" "1yb4lxjw499ppwhk31vz0vzl0cfqvj9d4jwqag7ayj53ybwsqgjr") - (mozilla-patch "icecat-CVE-2018-5147.patch" "5cd5586a2f48" "10s774pwvj6xfk3kk6ivnhp2acc8x9sqq6na8z47nkhgwl2712i5") - (mozilla-patch "icecat-CVE-2018-5148.patch" "c3e447e07077" "0gmwy631f8ip4gr1mpbjk8bx1n1748wdls5zq4y8hpmpnq5g1wyx") - (mozilla-patch "icecat-CVE-2018-5178.patch" "17201199b18d" "1d0hcim1fwh0bklwpmnal1mv9d9kmyif1m15aj1nqkf1n3x4xc37") - (mozilla-patch "icecat-bug-1361699.patch" "a07d6c3ff262" "1z8mjg2487r8pxi0x951v6fwwr696q84f6hlzimc3r7bn5ds9r83") - (mozilla-patch "icecat-CVE-2018-5150-pt01.patch" "7127ccf8f88c" "0m4my7aflpp0wlqilr2m4axd7k2fyrs7jqdcz2rrz5pwivz1anvd") - (mozilla-patch "icecat-bug-1444231.patch" "57bd35fa8618" "0pl6x5amc5x6nhwl7qnmnff3jjjxmbs8r365bfzj58g7q5ihqwvf") - (mozilla-patch "icecat-CVE-2018-5150-pt02.patch" "2f3e1ccf1661" "0azl8g81kpc0w2xpjpgm1154ll12g0a8n6i7bl3s9nnrk2i26n74") - (mozilla-patch "icecat-CVE-2018-5159.patch" "8ff2c4d68e36" "0kz1rqhnz8ca4z20hnpcafidhsrwhnm0h2gmlgchni33h8pisr1f") - (mozilla-patch "icecat-CVE-2018-5154.patch" "b8c430253efd" "1arjcaps9axhxh5ff84n9bydhhzrihn7hbq7v69nvqwqrjp3lgg9") - (mozilla-patch "icecat-CVE-2018-5155.patch" "05cadfa3ac39" "0q0vh7vy7x0l8jp6376fn10qljfp4mnp4m9zfn90j4m19pfl86a0") - (mozilla-patch "icecat-CVE-2018-5168.patch" "48a678d7cb81" "1yfh7kxxxvqck2hpn98pwag4splyc6c9brc5haq28fp8x9r9qvlk") - (mozilla-patch "icecat-CVE-2018-5150-pt03.patch" "112032576872" "1x1hxyggbxlnlj0n9cbp03hjnfvm6cq8nqj0jizrd8cfyd5aig8p") - (mozilla-patch "icecat-CVE-2018-5150-pt04.patch" "ad9a885b0df4" "1hrk1q9mk59jww55g4lqmaflznk87x3vvjn2mxfgfbbjs8l1cyz4") - (mozilla-patch "icecat-bug-1452416.patch" "f89ab96a2532" "1dqchxdyznhgyxhfq0hm0vg1p597hjqflfzigc7j3s5vxf9rg2nv") - (mozilla-patch "icecat-CVE-2018-5150-pt05.patch" "af885a1bd293" "1wfpqhm2dp4fsx6zbrncngsqz7g2x09b625zcighixrbpvybyww3") - (mozilla-patch "icecat-CVE-2018-5150-pt06.patch" "666fc84ec72d" "0lml2wqd4yqidhi364x8r90f78397k2y0kq5z5bv8l8j4bhcnb9v") - (search-patch "icecat-CVE-2018-5157-and-CVE-2018-5158.patch") - (mozilla-patch "icecat-CVE-2018-5150-pt07.patch" "1ab40761a856" "1kgwypy7k5b33jwkni4025za4kcnv5m6klsx4wsswlixmljmkbc7") - (mozilla-patch "icecat-bug-1453339.patch" "0edb8dca7087" "0b30pipqryh311sc97rcmwnx9n8qdlbbz90b2hkybjnprmbhfxrm") - (mozilla-patch "icecat-CVE-2018-5150-pt08.patch" "134c728799c1" "16hbwx6fx1hrddsyjjbd3z954ql3pg348xs13h9riyblq8crzmam") - (mozilla-patch "icecat-CVE-2018-5150-pt09.patch" "14eab155eaa8" "0wr4xgblxzk4c2gvlnpl7ic1196mrhry1hgwdl1jivq0ji5cbvbd") - (mozilla-patch "icecat-bug-1452619.patch" "2b75d55ccf0e" "1g87aybw6ggv6hyk385bplv0lx63n020gwyq0d6d4pqld48hsm1i") - (mozilla-patch "icecat-CVE-2018-5156-pt1.patch" "89857f35df29" "0gzi47svrw5ajdlm3i12193psm702zx70x5h1rwp4gb7gxh4m4d9") - (mozilla-patch "icecat-CVE-2018-5150-pt10.patch" "3f2ec03c0405" "0w02952dlxd2gmwghck2nm4rjjmc5ylg62bw6m1rvi35kcr134lr") - (mozilla-patch "icecat-CVE-2018-5183.patch" "f729bf78fb3a" "0xkj6jwxwdqkvb5c7wi16b8cm8qrnlrd3s9jnd46jg03iykrx56f") - (mozilla-patch "icecat-CVE-2018-5188-pt01.patch" "eb896089db47" "10lppk4x2d3pim71a36ky1dmg08rs5ckfiljwvfnr1cw6934qxl4") - (mozilla-patch "icecat-CVE-2018-5188-pt02.patch" "2374dca97bde" "0y1g55wvj44nzb1qfkl271jcf8s1ik8lcl1785z0zim4qzn7qkpa") - (mozilla-patch "icecat-CVE-2018-5188-pt03.patch" "70b6298e0c9e" "0n5jfy6c421dkybk8m18vd61y95zz0r64g1p1zlya3fps5knfaqi") - (mozilla-patch "icecat-CVE-2018-12365-pt1.patch" "4ef79fe9b3b7" "1c32z1ki1i6xj1nbb0xlxwqnmz48ikmy8dmp37rkjz8ssn04wgfg") - (mozilla-patch "icecat-CVE-2018-12365-pt2.patch" "9ad16112044a" "0ayya67sx7avcb8bplfdxb92l9g4mjrb1s3hby283llhqv0ikg9b") - (mozilla-patch "icecat-CVE-2018-12359.patch" "11d8a87fb6d6" "1rkmdk18llw0x1jakix75hlhy0hpsmlminnflagbzrzjli81gwm1") - (mozilla-patch "icecat-CVE-2018-5188-pt04.patch" "407b10ad1273" "16qzsfirw045xag96f1qvpdlibm8lwdj9l1mlli4n1vz0db91v9q") - (mozilla-patch "icecat-CVE-2018-6126.patch" "e76e2e481b17" "0hnx13msjy28n3bpa2c24kpzalam4bdk5gnp0f9k671l48rs9yb3") - (mozilla-patch "icecat-CVE-2018-5188-pt05.patch" "2c75bfcd465c" "1pjinj8qypafqm2fk68s3hzcbzcijn09qzrpcxvzq6bl1yfc1xfd") - (mozilla-patch "icecat-CVE-2018-5188-pt06.patch" "042f80f3befd" "0av918kin4bkrq7gnjz0h9w8kkq8rk9l93250lfl5kqrinza1gsk") - (mozilla-patch "icecat-CVE-2018-5188-pt07+bugs-1455071+1433642+1456604+1458320.patch" - "bb0451c9c4a0" "1lhm1b2a7c6jwhzsg3c830hfhp17p8j9zbcmgchpb8c5jkc3vw0x") - (mozilla-patch "icecat-CVE-2018-5188-pt08.patch" "8189b262e3b9" "13rh86ddwmj1bhv3ibbil3sv5xbqq1c9v1czgbsna5hxxkzc1y3b") - (mozilla-patch "icecat-CVE-2018-5188-pt09.patch" "9f81ae3f6e1d" "05vfg8a8jrzd93n1wvncmvdmqgf9cgsl8ryxgjs3032gbbjkga7q") - (mozilla-patch "icecat-CVE-2018-12360.patch" "face7a3dd5d7" "0jclw30mf693w8lrmvn0iankggj21nh4j3zh51q5363rj5xncdzx") - (mozilla-patch "icecat-CVE-2018-5188-pt10.patch" "7afb58c046c8" "1r0569r76712x7x1sw6xr0x06ilv6iw3fncb0f8r8b9mp6wrpx34") - (mozilla-patch "icecat-CVE-2018-12362-pt1.patch" "f1a745f8c42d" "11q73pb7a8f09xjzil4rhg5nr49zrnz1vb0prni0kqvrnppf5s40") - (mozilla-patch "icecat-CVE-2018-12362-pt2.patch" "1f9a430881cc" "0f79rv7njliqxx33z07n60b50jg0a596d1km7ayz2hivbl2d0168") - (mozilla-patch "icecat-CVE-2018-5188-pt11.patch" "28f4fc0a5141" "1a8f9z6c80in8ccj82ysdrcr2lqypp29l4acs50kwncm0c0b01zl") - (mozilla-patch "icecat-CVE-2018-12363.patch" "ad5a53a1d2b1" "0rhl4r39ydb3lkfp5pkwvhhzqgfh33s9r7b7jccgkrx6f13xyq78") - (mozilla-patch "icecat-CVE-2018-5188-pt12.patch" "0ddfc03c0454" "1b0xw2kj9765lvpl8iwr3wwcz40bdfp3dp4y9f546a61qsi9q9d6") - (mozilla-patch "icecat-CVE-2018-5156-pt2.patch" "dbf36189a364" "1awbyhy0r79i03sns2p0m78f9hb6c7kp4hwia2khx4qszlsr4j95") - (mozilla-patch "icecat-CVE-2018-5188-pt13.patch" "32509dfde003" "0cc3c92dgf5qynk093prq610c9x815l2fa24ddrw9czdzbwblsdq") - (mozilla-patch "icecat-bug-1462912.patch" "f18535a212da" "0zkqz9il89f1s1yrp5c6hj6kysy2x02iy50vgwdj30lr56gkpzmk") - (mozilla-patch "icecat-CVE-2018-5188-pt14.patch" "e8e9e1ef79f2" "0dc8p6fsppq3bhbpmp41f8mjxbr31pvgpga0a73dqdaicq5ydgj4") - (search-patch "icecat-bug-1413868-pt1.patch") - (mozilla-patch "icecat-CVE-2018-5188-pt15.patch" "9d4d31b2630d" "1lcbmsyi09kp80h1jgxj5l45zl24xn22h1lq7drbyjxsn1kggq4g") - (mozilla-patch "icecat-CVE-2018-12366-pt1.patch" "edf2c7dff493" "06xmyk7nm54cm9m6qc59wz8cxxfa5r25mf2xzdzy74iq5hwa1ac8") - (mozilla-patch "icecat-CVE-2018-5188-pt16.patch" "05549a4d1b80" "10q68cllshmmhlrbirm9h4gyc3ffrcpsxihfpcbxh90nv2h16jci") - (mozilla-patch "icecat-CVE-2018-12364.patch" "67b2d8924841" "197riigbb6l30959pygr0zlv7vaims78dg1mh0pg33pa7cbna0ds") - (mozilla-patch "icecat-CVE-2018-12366-pt2.patch" "528d4d997bb3" "0f375i96a404dkn0fanmd9pgfj3wyrhjfc5dwslw2s44gwfjhljb") - (mozilla-patch "icecat-bug-1369771.patch" "fab16ad7f256" "0kd8qm04sjgfgfg8yw3ivcxazb1d7v430g86chw4n64qybsh9ka3") - (mozilla-patch "icecat-CVE-2018-5188-pt17.patch" "068e249d02b4" "1iy9by1mg5qhp8502h31m8zm99aq2hx0c5n3hadd5pk11lfnq6ll") - (mozilla-patch "icecat-bug-1413868-pt2.patch" "755067c14b06" "089dwqwzcdg1l6aimi0i65q4dgb2iny5h8yjx63h9zgv77n0700a"))) + ;; FIXME (search-patch "icecat-use-system-harfbuzz.patch") + ;; FIXME (search-patch "icecat-use-system-graphite2.patch") + )) (modules '((guix build utils))) (snippet '(begin @@ -613,13 +528,13 @@ security standards.") "modules/freetype2" "modules/zlib" "modules/libbz2" - "ipc/chromium/src/third_party/libevent" + ;; UNBUNDLE-ME "ipc/chromium/src/third_party/libevent" "media/libjpeg" "media/libvpx" "security/nss" - "gfx/cairo" - "gfx/harfbuzz" - "gfx/graphite2" + ;; UNBUNDLE-ME "gfx/cairo" + ;; UNBUNDLE-ME "gfx/harfbuzz" + ;; UNBUNDLE-ME "gfx/graphite2" "js/src/ctypes/libffi" "db/sqlite3")) ;; Delete .pyc files, typically present in icecat source tarballs @@ -633,29 +548,29 @@ security standards.") (inputs `(("alsa-lib" ,alsa-lib) ("bzip2" ,bzip2) - ("cairo" ,cairo) + ;; UNBUNDLE-ME ("cairo" ,cairo) ("cups" ,cups) ("dbus-glib" ,dbus-glib) ("gdk-pixbuf" ,gdk-pixbuf) ("glib" ,glib) ("gtk+" ,gtk+) ("gtk+-2" ,gtk+-2) - ("graphite2" ,graphite2) + ;; UNBUNDLE-ME ("graphite2" ,graphite2) ("pango" ,pango) ("freetype" ,freetype) - ("harfbuzz" ,harfbuzz) + ;; UNBUNDLE-ME ("harfbuzz" ,harfbuzz) ("hunspell" ,hunspell) ("libcanberra" ,libcanberra) ("libgnome" ,libgnome) ("libjpeg-turbo" ,libjpeg-turbo) ("libxft" ,libxft) - ("libevent" ,libevent-2.0) + ;; UNBUNDLE-ME ("libevent" ,libevent-2.0) ("libxinerama" ,libxinerama) ("libxscrnsaver" ,libxscrnsaver) ("libxcomposite" ,libxcomposite) ("libxt" ,libxt) ("libffi" ,libffi) - ("ffmpeg" ,ffmpeg-3.4) + ("ffmpeg" ,ffmpeg) ("libvpx" ,libvpx) ("icu4c" ,icu4c) ("pixman" ,pixman) @@ -670,7 +585,9 @@ security standards.") ("zip" ,zip) ("zlib" ,zlib))) (native-inputs - `(("perl" ,perl) + `(("rust" ,rust) + ("cargo" ,rust "cargo") + ("perl" ,perl) ("python" ,python-2) ; Python 3 not supported ("python2-pysqlite" ,python2-pysqlite) ("yasm" ,yasm) @@ -687,11 +604,12 @@ security standards.") ;; practice somehow. See . #:validate-runpath? #f + #:imported-modules ,%cargo-build-system-modules ;for `generate-checksums' + #:configure-flags '("--enable-default-toolkit=cairo-gtk3" "--with-distribution-id=org.gnu" - "--enable-gio" "--enable-startup-notification" "--enable-pulseaudio" @@ -701,7 +619,9 @@ security standards.") "--disable-maintenance-service" "--disable-eme" "--disable-gconf" - "--disable-gnomeui" + + ;; Stylo requires LLVM/clang. For now, disable it. + "--disable-stylo" ;; Building with debugging symbols takes ~5GiB, so ;; disable it. @@ -716,15 +636,15 @@ security standards.") "--with-system-zlib" "--with-system-bz2" "--with-system-jpeg" ; must be libjpeg-turbo - "--with-system-libevent" + ;; UNBUNDLE-ME "--with-system-libevent" "--with-system-libvpx" "--with-system-icu" "--with-system-nspr" "--with-system-nss" - "--with-system-harfbuzz" - "--with-system-graphite2" + ;; UNBUNDLE-ME "--with-system-harfbuzz" + ;; UNBUNDLE-ME "--with-system-graphite2" "--enable-system-pixman" - "--enable-system-cairo" + ;; UNBUNDLE-ME "--enable-system-cairo" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-sqlite" @@ -774,6 +694,24 @@ security standards.") 'avcodec', 'avutil', 'pulse' ]\n\n" all))) #t)) + (add-after 'patch-source-shebangs 'patch-cargo-checksums + (lambda* _ + (use-modules (guix build cargo-build-system)) + (let ((null-file "/dev/null") + (null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) + (substitute* '("Cargo.lock" "servo/Cargo.lock") + (("(\"checksum .* = )\".*\"" all name) + (string-append name "\"" null-hash "\""))) + (for-each + (lambda (filename) + (delete-file filename) + (let ((dir (dirname filename))) + (display (string-append + "patch-cargo-checksums: generate-checksums for " + dir "\n")) + (generate-checksums dir null-file))) + (find-files "third_party/rust" ".cargo-checksum.json"))) + #t)) (replace 'configure ;; configure does not work followed by both "SHELL=..." and diff --git a/gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch b/gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch deleted file mode 100644 index b776640133..0000000000 --- a/gnu/packages/patches/icecat-CVE-2018-5157-and-CVE-2018-5158.patch +++ /dev/null @@ -1,441 +0,0 @@ -Based on -Adapted to apply cleanly to GNU IceCat. - -# HG changeset patch -# User Ryan VanderMeulen -# Date 1523630807 14400 -# Node ID 608e76ec5ba25cec2271d2b400c7bce2d4c5ef79 -# Parent 10b7f43b536f93151201d44d304c991aa9af5d0c -Bug 1452075 - Backport some upstream pdf.js fixes to ESR52. r=bdahl, r=yury, a=RyanVM - -diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm ---- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm -+++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm -@@ -24,17 +24,18 @@ const Cc = Components.classes; - const Ci = Components.interfaces; - const Cr = Components.results; - const Cu = Components.utils; - // True only if this is the version of pdf.js that is included with icecat. - const MOZ_CENTRAL = JSON.parse('true'); - const PDFJS_EVENT_ID = 'pdf.js.message'; - const PDF_CONTENT_TYPE = 'application/pdf'; - const PREF_PREFIX = 'pdfjs'; --const PDF_VIEWER_WEB_PAGE = 'resource://pdf.js/web/viewer.html'; -+const PDF_VIEWER_ORIGIN = "resource://pdf.js"; -+const PDF_VIEWER_WEB_PAGE = "resource://pdf.js/web/viewer.html"; - const MAX_NUMBER_OF_PREFS = 50; - const MAX_STRING_PREF_LENGTH = 128; - - Cu.import('resource://gre/modules/XPCOMUtils.jsm'); - Cu.import('resource://gre/modules/Services.jsm'); - Cu.import('resource://gre/modules/NetUtil.jsm'); - - XPCOMUtils.defineLazyModuleGetter(this, 'NetworkManager', -@@ -105,21 +106,25 @@ function log(aMsg) { - if (!getBoolPref(PREF_PREFIX + '.pdfBugEnabled', false)) { - return; - } - var msg = 'PdfStreamConverter.js: ' + (aMsg.join ? aMsg.join('') : aMsg); - Services.console.logStringMessage(msg); - dump(msg + '\n'); - } - --function getDOMWindow(aChannel) { -+function getDOMWindow(aChannel, aPrincipal) { - var requestor = aChannel.notificationCallbacks ? - aChannel.notificationCallbacks : - aChannel.loadGroup.notificationCallbacks; - var win = requestor.getInterface(Components.interfaces.nsIDOMWindow); -+ // Ensure the window wasn't navigated to something that is not PDF.js. -+ if (!win.document.nodePrincipal.equals(aPrincipal)) { -+ return null; -+ } - return win; - } - - function getLocalizedStrings(path) { - var stringBundle = Cc['@mozilla.org/intl/stringbundle;1']. - getService(Ci.nsIStringBundleService). - createBundle('chrome://pdf.js/locale/' + path); - -@@ -627,31 +632,31 @@ var RangedChromeActions = (function Rang - data = this.dataListener.readData(); - - this.dataListener.onprogress = function (loaded, total) { - self.domWindow.postMessage({ - pdfjsLoadAction: 'progressiveRead', - loaded: loaded, - total: total, - chunk: self.dataListener.readData() -- }, '*'); -+ }, PDF_VIEWER_ORIGIN); - }; - this.dataListener.oncomplete = function () { - self.dataListener = null; - }; - } - - this.domWindow.postMessage({ - pdfjsLoadAction: 'supportsRangedLoading', - rangeEnabled: this.rangeEnabled, - streamingEnabled: this.streamingEnabled, - pdfUrl: this.pdfUrl, - length: this.contentLength, - data: data -- }, '*'); -+ }, PDF_VIEWER_ORIGIN); - - return true; - }; - - proto.requestDataRange = function RangedChromeActions_requestDataRange(args) { - if (!this.rangeEnabled) { - return; - } -@@ -663,23 +668,23 @@ var RangedChromeActions = (function Rang - // errors from chrome code for non-range requests, so this doesn't - // seem high-pri - this.networkManager.requestRange(begin, end, { - onDone: function RangedChromeActions_onDone(args) { - domWindow.postMessage({ - pdfjsLoadAction: 'range', - begin: args.begin, - chunk: args.chunk -- }, '*'); -+ }, PDF_VIEWER_ORIGIN); - }, - onProgress: function RangedChromeActions_onProgress(evt) { - domWindow.postMessage({ - pdfjsLoadAction: 'rangeProgress', - loaded: evt.loaded, -- }, '*'); -+ }, PDF_VIEWER_ORIGIN); - } - }); - }; - - proto.abortLoading = function RangedChromeActions_abortLoading() { - this.networkManager.abortAllRequests(); - if (this.originalRequest) { - this.originalRequest.cancel(Cr.NS_BINDING_ABORTED); -@@ -718,26 +723,26 @@ var StandardChromeActions = (function St - var self = this; - - this.dataListener.onprogress = function ChromeActions_dataListenerProgress( - loaded, total) { - self.domWindow.postMessage({ - pdfjsLoadAction: 'progress', - loaded: loaded, - total: total -- }, '*'); -+ }, PDF_VIEWER_ORIGIN); - }; - - this.dataListener.oncomplete = - function StandardChromeActions_dataListenerComplete(data, errorCode) { - self.domWindow.postMessage({ - pdfjsLoadAction: 'complete', - data: data, - errorCode: errorCode -- }, '*'); -+ }, PDF_VIEWER_ORIGIN); - - self.dataListener = null; - self.originalRequest = null; - }; - - return true; - }; - -@@ -972,31 +977,35 @@ PdfStreamConverter.prototype = { - var proxy = { - onStartRequest: function(request, context) { - listener.onStartRequest(aRequest, aContext); - }, - onDataAvailable: function(request, context, inputStream, offset, count) { - listener.onDataAvailable(aRequest, aContext, inputStream, - offset, count); - }, -- onStopRequest: function(request, context, statusCode) { -- // We get the DOM window here instead of before the request since it -- // may have changed during a redirect. -- var domWindow = getDOMWindow(channel); -+ onStopRequest(request, context, statusCode) { -+ var domWindow = getDOMWindow(channel, resourcePrincipal); -+ if (!Components.isSuccessCode(statusCode) || !domWindow) { -+ // The request may have been aborted and the document may have been -+ // replaced with something that is not PDF.js, abort attaching. -+ listener.onStopRequest(aRequest, context, statusCode); -+ return; -+ } - var actions; - if (rangeRequest || streamRequest) { - actions = new RangedChromeActions( - domWindow, contentDispositionFilename, aRequest, - rangeRequest, streamRequest, dataListener); - } else { - actions = new StandardChromeActions( - domWindow, contentDispositionFilename, aRequest, dataListener); - } - var requestListener = new RequestListener(actions); -- domWindow.addEventListener(PDFJS_EVENT_ID, function(event) { -+ domWindow.document.addEventListener(PDFJS_EVENT_ID, function(event) { - requestListener.receive(event); - }, false, true); - if (actions.supportsIntegratedFind()) { - var findEventManager = new FindEventManager(domWindow); - findEventManager.bind(); - } - listener.onStopRequest(aRequest, aContext, statusCode); - -diff --git a/browser/extensions/pdfjs/content/build/pdf.worker.js b/browser/extensions/pdfjs/content/build/pdf.worker.js ---- a/browser/extensions/pdfjs/content/build/pdf.worker.js -+++ b/browser/extensions/pdfjs/content/build/pdf.worker.js -@@ -41648,16 +41648,32 @@ - var error = sharedUtil.error; - var info = sharedUtil.info; - var isArray = sharedUtil.isArray; - var isBool = sharedUtil.isBool; - var isDict = corePrimitives.isDict; - var isStream = corePrimitives.isStream; - var PostScriptLexer = corePsParser.PostScriptLexer; - var PostScriptParser = corePsParser.PostScriptParser; -+ function toNumberArray(arr) { -+ if (!Array.isArray(arr)) { -+ return null; -+ } -+ var length = arr.length; -+ for (var i = 0; i < length; i++) { -+ if (typeof arr[i] !== 'number') { -+ var result = new Array(length); -+ for (var j = 0; j < length; j++) { -+ result[j] = +arr[j]; -+ } -+ return result; -+ } -+ } -+ return arr; -+ } - var PDFFunction = function PDFFunctionClosure() { - var CONSTRUCT_SAMPLED = 0; - var CONSTRUCT_INTERPOLATED = 2; - var CONSTRUCT_STICHED = 3; - var CONSTRUCT_POSTSCRIPT = 4; - return { - getSampleArray: function PDFFunction_getSampleArray(size, outputSize, bps, str) { - var i, ii; -@@ -41747,43 +41763,43 @@ - out[index] = [ - arr[i], - arr[i + 1] - ]; - ++index; - } - return out; - } -- var domain = dict.getArray('Domain'); -- var range = dict.getArray('Range'); -+ var domain = toNumberArray(dict.getArray('Domain')); -+ var range = toNumberArray(dict.getArray('Range')); - if (!domain || !range) { - error('No domain or range'); - } - var inputSize = domain.length / 2; - var outputSize = range.length / 2; - domain = toMultiArray(domain); - range = toMultiArray(range); -- var size = dict.get('Size'); -+ var size = toNumberArray(dict.get('Size')); - var bps = dict.get('BitsPerSample'); - var order = dict.get('Order') || 1; - if (order !== 1) { - // No description how cubic spline interpolation works in PDF32000:2008 - // As in poppler, ignoring order, linear interpolation may work as good - info('No support for cubic spline interpolation: ' + order); - } -- var encode = dict.getArray('Encode'); -+ var encode = toNumberArray(dict.getArray('Encode')); - if (!encode) { - encode = []; - for (var i = 0; i < inputSize; ++i) { -- encode.push(0); -- encode.push(size[i] - 1); -- } -- } -- encode = toMultiArray(encode); -- var decode = dict.getArray('Decode'); -+ encode.push([0, size[i] - 1]); -+ } -+ } else { -+ encode = toMultiArray(encode); -+ } -+ var decode = toNumberArray(dict.getArray('Decode')); - if (!decode) { - decode = range; - } else { - decode = toMultiArray(decode); - } - var samples = this.getSampleArray(size, outputSize, bps, str); - return [ - CONSTRUCT_SAMPLED, -@@ -41868,22 +41884,19 @@ - // Decode_2j, Decode_2j+1) - rj = interpolate(rj, 0, 1, decode[j][0], decode[j][1]); - // y_j = min(max(r_j, range_2j), range_2j+1) - dest[destOffset + j] = Math.min(Math.max(rj, range[j][0]), range[j][1]); - } - }; - }, - constructInterpolated: function PDFFunction_constructInterpolated(str, dict) { -- var c0 = dict.getArray('C0') || [0]; -- var c1 = dict.getArray('C1') || [1]; -+ var c0 = toNumberArray(dict.getArray('C0')) || [0]; -+ var c1 = toNumberArray(dict.getArray('C1')) || [1]; - var n = dict.get('N'); -- if (!isArray(c0) || !isArray(c1)) { -- error('Illegal dictionary for interpolated function'); -- } - var length = c0.length; - var diff = []; - for (var i = 0; i < length; ++i) { - diff.push(c1[i] - c0[i]); - } - return [ - CONSTRUCT_INTERPOLATED, - c0, -@@ -41899,49 +41912,45 @@ - return function constructInterpolatedFromIRResult(src, srcOffset, dest, destOffset) { - var x = n === 1 ? src[srcOffset] : Math.pow(src[srcOffset], n); - for (var j = 0; j < length; ++j) { - dest[destOffset + j] = c0[j] + x * diff[j]; - } - }; - }, - constructStiched: function PDFFunction_constructStiched(fn, dict, xref) { -- var domain = dict.getArray('Domain'); -+ var domain = toNumberArray(dict.getArray('Domain')); - if (!domain) { - error('No domain'); - } - var inputSize = domain.length / 2; - if (inputSize !== 1) { - error('Bad domain for stiched function'); - } - var fnRefs = dict.get('Functions'); - var fns = []; - for (var i = 0, ii = fnRefs.length; i < ii; ++i) { -- fns.push(PDFFunction.getIR(xref, xref.fetchIfRef(fnRefs[i]))); -- } -- var bounds = dict.getArray('Bounds'); -- var encode = dict.getArray('Encode'); -+ fns.push(PDFFunction.parse(xref, xref.fetchIfRef(fnRefs[i]))); -+ } -+ var bounds = toNumberArray(dict.getArray('Bounds')); -+ var encode = toNumberArray(dict.getArray('Encode')); - return [ - CONSTRUCT_STICHED, - domain, - bounds, - encode, - fns - ]; - }, - constructStichedFromIR: function PDFFunction_constructStichedFromIR(IR) { - var domain = IR[1]; - var bounds = IR[2]; - var encode = IR[3]; -- var fnsIR = IR[4]; -- var fns = []; -+ var fns = IR[4]; - var tmpBuf = new Float32Array(1); -- for (var i = 0, ii = fnsIR.length; i < ii; i++) { -- fns.push(PDFFunction.fromIR(fnsIR[i])); -- } - return function constructStichedFromIRResult(src, srcOffset, dest, destOffset) { - var clip = function constructStichedFromIRClip(v, min, max) { - if (v > max) { - v = max; - } else if (v < min) { - v = min; - } - return v; -@@ -41968,18 +41977,18 @@ - // Prevent the value from becoming NaN as a result - // of division by zero (fixes issue6113.pdf). - tmpBuf[0] = dmin === dmax ? rmin : rmin + (v - dmin) * (rmax - rmin) / (dmax - dmin); - // call the appropriate function - fns[i](tmpBuf, 0, dest, destOffset); - }; - }, - constructPostScript: function PDFFunction_constructPostScript(fn, dict, xref) { -- var domain = dict.getArray('Domain'); -- var range = dict.getArray('Range'); -+ var domain = toNumberArray(dict.getArray('Domain')); -+ var range = toNumberArray(dict.getArray('Range')); - if (!domain) { - error('No domain.'); - } - if (!range) { - error('No range.'); - } - var lexer = new PostScriptLexer(fn); - var parser = new PostScriptParser(lexer); -@@ -42928,18 +42937,18 @@ - case 'IndexedCS': - var baseIndexedCS = IR[1]; - var hiVal = IR[2]; - var lookup = IR[3]; - return new IndexedCS(ColorSpace.fromIR(baseIndexedCS), hiVal, lookup); - case 'AlternateCS': - var numComps = IR[1]; - var alt = IR[2]; -- var tintFnIR = IR[3]; -- return new AlternateCS(numComps, ColorSpace.fromIR(alt), PDFFunction.fromIR(tintFnIR)); -+ var tintFn = IR[3]; -+ return new AlternateCS(numComps, ColorSpace.fromIR(alt), tintFn); - case 'LabCS': - whitePoint = IR[1]; - blackPoint = IR[2]; - var range = IR[3]; - return new LabCS(whitePoint, blackPoint, range); - default: - error('Unknown name ' + name); - } -@@ -43067,22 +43076,22 @@ - var name = xref.fetchIfRef(cs[1]); - numComps = 1; - if (isName(name)) { - numComps = 1; - } else if (isArray(name)) { - numComps = name.length; - } - alt = ColorSpace.parseToIR(cs[2], xref, res); -- var tintFnIR = PDFFunction.getIR(xref, xref.fetchIfRef(cs[3])); -+ var tintFn = PDFFunction.parse(xref, xref.fetchIfRef(cs[3])); - return [ - 'AlternateCS', - numComps, - alt, -- tintFnIR -+ tintFn - ]; - case 'Lab': - params = xref.fetchIfRef(cs[1]); - whitePoint = params.getArray('WhitePoint'); - blackPoint = params.getArray('BlackPoint'); - var range = params.getArray('Range'); - return [ - 'LabCS', -@@ -52483,9 +52492,9 @@ - initializeWorker(); - } - exports.setPDFNetworkStreamClass = setPDFNetworkStreamClass; - exports.WorkerTask = WorkerTask; - exports.WorkerMessageHandler = WorkerMessageHandler; - })); - }.call(pdfjsLibs)); - exports.WorkerMessageHandler = pdfjsLibs.pdfjsCoreWorker.WorkerMessageHandler; --})); -\ No newline at end of file -+})); - diff --git a/gnu/packages/patches/icecat-bug-1413868-pt1.patch b/gnu/packages/patches/icecat-bug-1413868-pt1.patch deleted file mode 100644 index 18382dc33a..0000000000 --- a/gnu/packages/patches/icecat-bug-1413868-pt1.patch +++ /dev/null @@ -1,663 +0,0 @@ -Based on -Adapted to apply cleanly to GNU IceCat. - -# HG changeset patch -# User Honza Bambas -# Date 1528830658 14400 -# Node ID 431fa5dd4016bdab7e4bb0d3c4df85468fe337b0 -# Parent e8e9e1ef79f2a18c61ec1b87cfb214c8d4960f8e -Bug 1413868. r=valentin, a=RyanVM - -diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp ---- a/toolkit/xre/nsAppRunner.cpp -+++ b/toolkit/xre/nsAppRunner.cpp -@@ -4,16 +4,17 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - #include "mozilla/dom/ContentParent.h" - #include "mozilla/dom/ContentChild.h" - #include "mozilla/ipc/GeckoChildProcessHost.h" - - #include "mozilla/ArrayUtils.h" - #include "mozilla/Attributes.h" -+#include "mozilla/FilePreferences.h" - #include "mozilla/ChaosMode.h" - #include "mozilla/IOInterposer.h" - #include "mozilla/Likely.h" - #include "mozilla/MemoryChecking.h" - #include "mozilla/Poison.h" - #include "mozilla/Preferences.h" - #include "mozilla/ScopeExit.h" - #include "mozilla/Services.h" -@@ -4304,16 +4305,20 @@ XREMain::XRE_mainRun() - // Need to write out the fact that the profile has been removed and potentially - // that the selected/default profile changed. - mProfileSvc->Flush(); - } - } - - mDirProvider.DoStartup(); - -+ // As FilePreferences need the profile directory, we must initialize right here. -+ mozilla::FilePreferences::InitDirectoriesWhitelist(); -+ mozilla::FilePreferences::InitPrefs(); -+ - OverrideDefaultLocaleIfNeeded(); - - #ifdef MOZ_CRASHREPORTER - nsCString userAgentLocale; - // Try a localized string first. This pref is always a localized string in - // IceCatMobile, and might be elsewhere, too. - if (NS_SUCCEEDED(Preferences::GetLocalizedCString("general.useragent.locale", &userAgentLocale))) { - CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("useragent_locale"), userAgentLocale); -diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp ---- a/toolkit/xre/nsEmbedFunctions.cpp -+++ b/toolkit/xre/nsEmbedFunctions.cpp -@@ -46,16 +46,17 @@ - #include "nsX11ErrorHandler.h" - #include "nsGDKErrorHandler.h" - #include "base/at_exit.h" - #include "base/command_line.h" - #include "base/message_loop.h" - #include "base/process_util.h" - #include "chrome/common/child_process.h" - -+#include "mozilla/FilePreferences.h" - #include "mozilla/ipc/BrowserProcessSubThread.h" - #include "mozilla/ipc/GeckoChildProcessHost.h" - #include "mozilla/ipc/IOThreadChild.h" - #include "mozilla/ipc/ProcessChild.h" - #include "ScopedXREEmbed.h" - - #include "mozilla/plugins/PluginProcessChild.h" - #include "mozilla/dom/ContentProcess.h" -@@ -680,16 +681,18 @@ XRE_InitChildProcess(int aArgc, - ::SetProcessShutdownParameters(0x280 - 1, SHUTDOWN_NORETRY); - #endif - - #if defined(MOZ_SANDBOX) && defined(XP_WIN) - // We need to do this after the process has been initialised, as - // InitLoggingIfRequired may need access to prefs. - mozilla::sandboxing::InitLoggingIfRequired(aChildData->ProvideLogFunction); - #endif -+ mozilla::FilePreferences::InitDirectoriesWhitelist(); -+ mozilla::FilePreferences::InitPrefs(); - - OverrideDefaultLocaleIfNeeded(); - - #if defined(MOZ_CRASHREPORTER) - #if defined(MOZ_CONTENT_SANDBOX) && !defined(MOZ_WIDGET_GONK) - AddContentSandboxLevelAnnotation(); - #endif - #endif -diff --git a/xpcom/io/FilePreferences.cpp b/xpcom/io/FilePreferences.cpp -new file mode 100644 ---- /dev/null -+++ b/xpcom/io/FilePreferences.cpp -@@ -0,0 +1,271 @@ -+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+* License, v. 2.0. If a copy of the MPL was not distributed with this -+* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#include "FilePreferences.h" -+ -+#include "mozilla/Preferences.h" -+#include "nsAppDirectoryServiceDefs.h" -+#include "nsDirectoryServiceDefs.h" -+#include "nsDirectoryServiceUtils.h" -+ -+namespace mozilla { -+namespace FilePreferences { -+ -+static bool sBlockUNCPaths = false; -+typedef nsTArray Paths; -+ -+static Paths& PathArray() -+{ -+ static Paths sPaths; -+ return sPaths; -+} -+ -+static void AllowDirectory(char const* directory) -+{ -+ nsCOMPtr file; -+ NS_GetSpecialDirectory(directory, getter_AddRefs(file)); -+ if (!file) { -+ return; -+ } -+ -+ nsString path; -+ if (NS_FAILED(file->GetTarget(path))) { -+ return; -+ } -+ -+ // The whitelist makes sense only for UNC paths, because this code is used -+ // to block only UNC paths, hence, no need to add non-UNC directories here -+ // as those would never pass the check. -+ if (!StringBeginsWith(path, NS_LITERAL_STRING("\\\\"))) { -+ return; -+ } -+ -+ if (!PathArray().Contains(path)) { -+ PathArray().AppendElement(path); -+ } -+} -+ -+void InitPrefs() -+{ -+ sBlockUNCPaths = Preferences::GetBool("network.file.disable_unc_paths", false); -+} -+ -+void InitDirectoriesWhitelist() -+{ -+ // NS_GRE_DIR is the installation path where the binary resides. -+ AllowDirectory(NS_GRE_DIR); -+ // NS_APP_USER_PROFILE_50_DIR and NS_APP_USER_PROFILE_LOCAL_50_DIR are the two -+ // parts of the profile we store permanent and local-specific data. -+ AllowDirectory(NS_APP_USER_PROFILE_50_DIR); -+ AllowDirectory(NS_APP_USER_PROFILE_LOCAL_50_DIR); -+} -+ -+namespace { // anon -+ -+class Normalizer -+{ -+public: -+ Normalizer(const nsAString& aFilePath, const char16_t aSeparator); -+ bool Get(nsAString& aNormalizedFilePath); -+ -+private: -+ bool ConsumeItem(); -+ bool ConsumeSeparator(); -+ bool IsEOF() { return mFilePathCursor == mFilePathEnd; } -+ -+ bool ConsumeName(); -+ bool CheckParentDir(); -+ bool CheckCurrentDir(); -+ -+ nsString::const_char_iterator mFilePathCursor; -+ nsString::const_char_iterator mFilePathEnd; -+ -+ nsDependentSubstring mItem; -+ char16_t const mSeparator; -+ nsTArray mStack; -+}; -+ -+Normalizer::Normalizer(const nsAString& aFilePath, const char16_t aSeparator) -+ : mFilePathCursor(aFilePath.BeginReading()) -+ , mFilePathEnd(aFilePath.EndReading()) -+ , mSeparator(aSeparator) -+{ -+} -+ -+bool Normalizer::ConsumeItem() -+{ -+ if (IsEOF()) { -+ return false; -+ } -+ -+ nsString::const_char_iterator nameBegin = mFilePathCursor; -+ while (mFilePathCursor != mFilePathEnd) { -+ if (*mFilePathCursor == mSeparator) { -+ break; // don't include the separator -+ } -+ ++mFilePathCursor; -+ } -+ -+ mItem.Rebind(nameBegin, mFilePathCursor); -+ return true; -+} -+ -+bool Normalizer::ConsumeSeparator() -+{ -+ if (IsEOF()) { -+ return false; -+ } -+ -+ if (*mFilePathCursor != mSeparator) { -+ return false; -+ } -+ -+ ++mFilePathCursor; -+ return true; -+} -+ -+bool Normalizer::Get(nsAString& aNormalizedFilePath) -+{ -+ aNormalizedFilePath.Truncate(); -+ -+ if (IsEOF()) { -+ return true; -+ } -+ if (ConsumeSeparator()) { -+ aNormalizedFilePath.Append(mSeparator); -+ } -+ -+ if (IsEOF()) { -+ return true; -+ } -+ if (ConsumeSeparator()) { -+ aNormalizedFilePath.Append(mSeparator); -+ } -+ -+ while (!IsEOF()) { -+ if (!ConsumeName()) { -+ return false; -+ } -+ } -+ -+ for (auto const& name : mStack) { -+ aNormalizedFilePath.Append(name); -+ } -+ -+ return true; -+} -+ -+bool Normalizer::ConsumeName() -+{ -+ if (!ConsumeItem()) { -+ return true; -+ } -+ -+ if (CheckCurrentDir()) { -+ return true; -+ } -+ -+ if (CheckParentDir()) { -+ if (!mStack.Length()) { -+ // This means there are more \.. than valid names -+ return false; -+ } -+ -+ mStack.RemoveElementAt(mStack.Length() - 1); -+ return true; -+ } -+ -+ if (mItem.IsEmpty()) { -+ // this means an empty name (a lone slash), which is illegal -+ return false; -+ } -+ -+ if (ConsumeSeparator()) { -+ mItem.Rebind(mItem.BeginReading(), mFilePathCursor); -+ } -+ mStack.AppendElement(mItem); -+ -+ return true; -+} -+ -+bool Normalizer::CheckCurrentDir() -+{ -+ if (mItem == NS_LITERAL_STRING(".")) { -+ ConsumeSeparator(); -+ // EOF is acceptable -+ return true; -+ } -+ -+ return false; -+} -+ -+bool Normalizer::CheckParentDir() -+{ -+ if (mItem == NS_LITERAL_STRING("..")) { -+ ConsumeSeparator(); -+ // EOF is acceptable -+ return true; -+ } -+ -+ return false; -+} -+ -+} // anon -+ -+bool IsBlockedUNCPath(const nsAString& aFilePath) -+{ -+ if (!sBlockUNCPaths) { -+ return false; -+ } -+ -+ if (!StringBeginsWith(aFilePath, NS_LITERAL_STRING("\\\\"))) { -+ return false; -+ } -+ -+ nsAutoString normalized; -+ if (!Normalizer(aFilePath, L'\\').Get(normalized)) { -+ // Broken paths are considered invalid and thus inaccessible -+ return true; -+ } -+ -+ for (const auto& allowedPrefix : PathArray()) { -+ if (StringBeginsWith(normalized, allowedPrefix)) { -+ if (normalized.Length() == allowedPrefix.Length()) { -+ return false; -+ } -+ if (normalized[allowedPrefix.Length()] == L'\\') { -+ return false; -+ } -+ -+ // When we are here, the path has a form "\\path\prefixevil" -+ // while we have an allowed prefix of "\\path\prefix". -+ // Note that we don't want to add a slash to the end of a prefix -+ // so that opening the directory (no slash at the end) still works. -+ break; -+ } -+ } -+ -+ return true; -+} -+ -+void testing::SetBlockUNCPaths(bool aBlock) -+{ -+ sBlockUNCPaths = aBlock; -+} -+ -+void testing::AddDirectoryToWhitelist(nsAString const & aPath) -+{ -+ PathArray().AppendElement(aPath); -+} -+ -+bool testing::NormalizePath(nsAString const & aPath, nsAString & aNormalized) -+{ -+ Normalizer normalizer(aPath, L'\\'); -+ return normalizer.Get(aNormalized); -+} -+ -+} // ::FilePreferences -+} // ::mozilla -diff --git a/xpcom/io/FilePreferences.h b/xpcom/io/FilePreferences.h -new file mode 100644 ---- /dev/null -+++ b/xpcom/io/FilePreferences.h -@@ -0,0 +1,25 @@ -+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+* License, v. 2.0. If a copy of the MPL was not distributed with this -+* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#include "nsIObserver.h" -+ -+namespace mozilla { -+namespace FilePreferences { -+ -+void InitPrefs(); -+void InitDirectoriesWhitelist(); -+bool IsBlockedUNCPath(const nsAString& aFilePath); -+ -+namespace testing { -+ -+void SetBlockUNCPaths(bool aBlock); -+void AddDirectoryToWhitelist(nsAString const& aPath); -+bool NormalizePath(nsAString const & aPath, nsAString & aNormalized); -+ -+} -+ -+} // FilePreferences -+} // mozilla -diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build ---- a/xpcom/io/moz.build -+++ b/xpcom/io/moz.build -@@ -79,24 +79,26 @@ EXPORTS += [ - 'nsUnicharInputStream.h', - 'nsWildCard.h', - 'SlicedInputStream.h', - 'SpecialSystemDirectory.h', - ] - - EXPORTS.mozilla += [ - 'Base64.h', -+ 'FilePreferences.h', - 'SnappyCompressOutputStream.h', - 'SnappyFrameUtils.h', - 'SnappyUncompressInputStream.h', - ] - - UNIFIED_SOURCES += [ - 'Base64.cpp', - 'crc32c.c', -+ 'FilePreferences.cpp', - 'nsAnonymousTemporaryFile.cpp', - 'nsAppFileLocationProvider.cpp', - 'nsBinaryStream.cpp', - 'nsDirectoryService.cpp', - 'nsEscape.cpp', - 'nsInputStreamTee.cpp', - 'nsIOUtil.cpp', - 'nsLinebreakConverter.cpp', -diff --git a/xpcom/io/nsLocalFileWin.cpp b/xpcom/io/nsLocalFileWin.cpp ---- a/xpcom/io/nsLocalFileWin.cpp -+++ b/xpcom/io/nsLocalFileWin.cpp -@@ -41,16 +41,17 @@ - #include - #include - #include - - #include "nsXPIDLString.h" - #include "prproces.h" - #include "prlink.h" - -+#include "mozilla/FilePreferences.h" - #include "mozilla/Mutex.h" - #include "SpecialSystemDirectory.h" - - #include "nsTraceRefcnt.h" - #include "nsXPCOMCIDInternal.h" - #include "nsThreadUtils.h" - #include "nsXULAppAPI.h" - -@@ -1162,16 +1163,20 @@ nsLocalFile::InitWithPath(const nsAStrin - char16_t secondChar = *(++begin); - - // just do a sanity check. if it has any forward slashes, it is not a Native path - // on windows. Also, it must have a colon at after the first char. - if (FindCharInReadable(L'/', begin, end)) { - return NS_ERROR_FILE_UNRECOGNIZED_PATH; - } - -+ if (FilePreferences::IsBlockedUNCPath(aFilePath)) { -+ return NS_ERROR_FILE_ACCESS_DENIED; -+ } -+ - if (secondChar != L':' && (secondChar != L'\\' || firstChar != L'\\')) { - return NS_ERROR_FILE_UNRECOGNIZED_PATH; - } - - if (secondChar == L':') { - // Make sure we have a valid drive, later code assumes the drive letter - // is a single char a-z or A-Z. - if (PathGetDriveNumberW(aFilePath.Data()) == -1) { -@@ -1974,16 +1979,20 @@ nsLocalFile::CopySingleFile(nsIFile* aSo - bool path1Remote, path2Remote; - if (!IsRemoteFilePath(filePath.get(), path1Remote) || - !IsRemoteFilePath(destPath.get(), path2Remote) || - path1Remote || path2Remote) { - dwCopyFlags |= COPY_FILE_NO_BUFFERING; - } - } - -+ if (FilePreferences::IsBlockedUNCPath(destPath)) { -+ return NS_ERROR_FILE_ACCESS_DENIED; -+ } -+ - if (!move) { - copyOK = ::CopyFileExW(filePath.get(), destPath.get(), nullptr, - nullptr, nullptr, dwCopyFlags); - } else { - copyOK = ::MoveFileExW(filePath.get(), destPath.get(), - MOVEFILE_REPLACE_EXISTING); - - // Check if copying the source file to a different volume, -diff --git a/xpcom/tests/gtest/TestFilePreferencesWin.cpp b/xpcom/tests/gtest/TestFilePreferencesWin.cpp -new file mode 100644 ---- /dev/null -+++ b/xpcom/tests/gtest/TestFilePreferencesWin.cpp -@@ -0,0 +1,141 @@ -+#include "gtest/gtest.h" -+ -+#include "mozilla/FilePreferences.h" -+#include "nsIFile.h" -+#include "nsXPCOMCID.h" -+ -+TEST(FilePreferencesWin, Normalization) -+{ -+ nsAutoString normalized; -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("foo"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("foo")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\foo"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\foo")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("foo\\some"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("foo\\some")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\.\\foo"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\."), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\.\\"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\.\\."), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo\\bar")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo\\bar\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\."), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo\\bar\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\.\\"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo\\bar\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\..\\"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\.."), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\foo\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\..\\bar\\..\\"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\..\\bar"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\bar")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\..\\..\\"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\")); -+ -+ mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\.\\..\\.\\..\\"), normalized); -+ ASSERT_TRUE(normalized == NS_LITERAL_STRING("\\\\")); -+ -+ bool result; -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\.."), normalized); -+ ASSERT_FALSE(result); -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\..\\"), normalized); -+ ASSERT_FALSE(result); -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\.\\..\\"), normalized); -+ ASSERT_FALSE(result); -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\\\bar"), normalized); -+ ASSERT_FALSE(result); -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\foo\\bar\\..\\..\\..\\..\\"), normalized); -+ ASSERT_FALSE(result); -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\\\"), normalized); -+ ASSERT_FALSE(result); -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\.\\\\"), normalized); -+ ASSERT_FALSE(result); -+ -+ result = mozilla::FilePreferences::testing::NormalizePath( -+ NS_LITERAL_STRING("\\\\..\\\\"), normalized); -+ ASSERT_FALSE(result); -+} -+ -+TEST(FilePreferencesWin, AccessUNC) -+{ -+ nsCOMPtr lf = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID); -+ -+ nsresult rv; -+ -+ mozilla::FilePreferences::testing::SetBlockUNCPaths(false); -+ -+ rv = lf->InitWithPath(NS_LITERAL_STRING("\\\\nice\\..\\evil\\share")); -+ ASSERT_EQ(rv, NS_OK); -+ -+ mozilla::FilePreferences::testing::SetBlockUNCPaths(true); -+ -+ rv = lf->InitWithPath(NS_LITERAL_STRING("\\\\nice\\..\\evil\\share")); -+ ASSERT_EQ(rv, NS_ERROR_FILE_ACCESS_DENIED); -+ -+ mozilla::FilePreferences::testing::AddDirectoryToWhitelist(NS_LITERAL_STRING("\\\\nice")); -+ -+ rv = lf->InitWithPath(NS_LITERAL_STRING("\\\\nice\\share")); -+ ASSERT_EQ(rv, NS_OK); -+ -+ rv = lf->InitWithPath(NS_LITERAL_STRING("\\\\nice\\..\\evil\\share")); -+ ASSERT_EQ(rv, NS_ERROR_FILE_ACCESS_DENIED); -+} -diff --git a/xpcom/tests/gtest/moz.build b/xpcom/tests/gtest/moz.build ---- a/xpcom/tests/gtest/moz.build -+++ b/xpcom/tests/gtest/moz.build -@@ -51,16 +51,21 @@ UNIFIED_SOURCES += [ - if CONFIG['MOZ_DEBUG'] and CONFIG['OS_ARCH'] not in ('WINNT') and CONFIG['OS_TARGET'] != 'Android': - # FIXME bug 523392: TestDeadlockDetector doesn't like Windows - # Bug 1054249: Doesn't work on Android - UNIFIED_SOURCES += [ - 'TestDeadlockDetector.cpp', - 'TestDeadlockDetectorScalability.cpp', - ] - -+if CONFIG['OS_TARGET'] == 'WINNT': -+ UNIFIED_SOURCES += [ -+ 'TestFilePreferencesWin.cpp', -+ ] -+ - if CONFIG['WRAP_STL_INCLUDES'] and not CONFIG['CLANG_CL']: - UNIFIED_SOURCES += [ - 'TestSTLWrappers.cpp', - ] - - # Compile TestAllocReplacement separately so Windows headers don't pollute - # the global namespace for other files. - SOURCES += [ - -- cgit v1.2.3 From 2aa137e261984b9762de5221459835eefb165fe7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 13:29:38 +0200 Subject: gnu: crossguid: Use INVOKE. * gnu/packages/kodi.scm (crossguid)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/kodi.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 62a971a0a8..2df5735dd0 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017 Oleg Pykhalov +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,22 +93,22 @@ (arguments '(#:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script + (delete 'configure) ; no configure script ;; There's no build system here, so we have to do it ourselves. (replace 'build (lambda _ - (and (zero? (system* "g++" "-c" "guid.cpp" "-o" "guid.o" - "-std=c++11" "-DGUID_LIBUUID")) - (zero? (system* "ar" "rvs" "libcrossguid.a" "guid.o"))))) + (invoke "g++" "-c" "guid.cpp" "-o" "guid.o" + "-std=c++11" "-DGUID_LIBUUID") + (invoke "ar" "rvs" "libcrossguid.a" "guid.o"))) (replace 'check (lambda _ - (and (zero? (system* "g++" "-c" "test.cpp" "-o" "test.o" - "-std=c++11")) - (zero? (system* "g++" "-c" "testmain.cpp" "-o" "testmain.o" - "-std=c++11")) - (zero? (system* "g++" "test.o" "guid.o" "testmain.o" - "-o" "test" "-luuid")) - (zero? (system* (string-append (getcwd) "/test")))))) + (invoke "g++" "-c" "test.cpp" "-o" "test.o" + "-std=c++11") + (invoke "g++" "-c" "testmain.cpp" "-o" "testmain.o" + "-std=c++11") + (invoke "g++" "test.o" "guid.o" "testmain.o" + "-o" "test" "-luuid") + (invoke (string-append (getcwd) "/test")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From 93ab9a5d76b8b84afd6823e2cdd1f62c9e6284f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 13:29:54 +0200 Subject: gnu: kodi: Use INVOKE. * gnu/packages/kodi.scm (kodi)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/kodi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 2df5735dd0..86ce914d53 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -295,7 +295,7 @@ generator library for C++.") "lib/cpluff"))) (every (lambda (third-party) (with-directory-excursion third-party - (zero? (system* "autoreconf" "-vif")))) + (invoke "autoreconf" "-vif"))) dirs)))) (add-after 'bootstrap-bundled-software 'patch-stuff (lambda* (#:key inputs #:allow-other-keys) @@ -336,7 +336,7 @@ generator library for C++.") #t)) (add-before 'check 'build-kodi-test (lambda _ - (zero? (system* "make" "kodi-test"))))))) + (invoke "make" "kodi-test")))))) ;; TODO: Add dependencies for: ;; - nfs ;; - cec -- cgit v1.2.3 From eacb5dc4871aadac965024aeab06f48362abba47 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 13:54:32 +0200 Subject: gnu: emacs-mu4e-conversation: Fix typo in description. * gnu/packages/emacs.scm (emacs-mu4e-conversation)[description]: Fix 'correspondant' typo. --- 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 fc019cf241..977f0c99b8 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -11705,8 +11705,8 @@ file.") (synopsis "Show a complete thread in a single buffer") (description - "This package offers an alternate view to mu4e e-mail display. It -shows all e-mails of a thread in a single view, where each correspondant has + "This package offers an alternate view to mu4e's e-mail display. It +shows all e-mails of a thread in a single view, where each correspondent has their own face. Threads can be displayed linearly (in which case e-mails are displayed in chronological order) or as an Org document where the node tree maps the thread tree.") -- cgit v1.2.3 From 41e551b2d3ea24ffd96023d1b6c3648de3aac90d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 14:00:53 +0200 Subject: gnu: python-pyparsing: Update home page. * gnu/packages/python.scm (python-pyparsing)[home-page]: Update. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 64ee4e028e..a11c7e315e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3382,7 +3382,7 @@ library, libgit2 implements Git plumbing.") (list "docs" "htmldoc" "examples") (list doc html-doc examples)) #t)))))) - (home-page "http://pyparsing.wikispaces.com") + (home-page "https://github.com/pyparsing/pyparsing") (synopsis "Python parsing class library") (description "The pyparsing module is an alternative approach to creating and -- cgit v1.2.3 From 118a084531a546ccad0762b5ac7d564619183d6b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 14:55:20 +0200 Subject: gnu: libfilezilla: Update to 0.13.2. * gnu/packages/ftp.scm (libfilezilla): Update to 0.13.2. [source]: Use HTTPS. --- gnu/packages/ftp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index d3f3ef711c..335c975d12 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -170,15 +170,15 @@ as required.") (define-public libfilezilla (package (name "libfilezilla") - (version "0.13.1") + (version "0.13.2") (source (origin (method url-fetch) - (uri (string-append "http://download.filezilla-project.org/" + (uri (string-append "https://download.filezilla-project.org/" name "/" name "-" version ".tar.bz2")) (sha256 (base32 - "0347zkapp0wrhfm1yzw7wa1v3lww65ch176scifxn8f9068f1ixb")))) + "0z9cqscca4w94j9npgcknrrw8gfwn5ids903042fczlr977j0i19")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) -- cgit v1.2.3 From 10e066f410d1ffb9505f4fd0b5cc73e8af2154b0 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 21 Sep 2018 15:21:24 +0200 Subject: gnu: rust: Remove unused "localstatedir" setting. * gnu/packages/rust.scm (rust-1.20)[arguments]<#:phases>[configure]: Remove unused "localstatedir" setting. --- gnu/packages/rust.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e8eca80aa6..40633854ae 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -562,7 +562,6 @@ submodules = false prefix = \"" out "\" docdir = \"" doc "/share/doc/rust" "\" sysconfdir = \"etc\" -localstatedir = \"var/lib\" [rust] default-linker = \"" gcc "/bin/gcc" "\" channel = \"stable\" -- cgit v1.2.3 From b0d1e60fff023e405c92c45b3c78538c3cbb7e6b Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 20 Sep 2018 18:59:56 +0100 Subject: gnu: hdf5: Allow for absence of utility script. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (hdf5)[arguments]: Add condition to 'split' phase to check for existence of h5fc script. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 736bac163e..30f1610c1d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -814,8 +814,11 @@ incompatible with HDF5.") (mkdir-p flib) (mkdir-p finc) (mkdir-p fex) - (rename-file (string-append bin "/h5fc") - (string-append fbin "/h5fc")) + ;; Note: When built with --enable-parallel, the 'h5fc' file + ;; doesn't exist, hence this condition. + (when (file-exists? (string-append bin "/h5fc")) + (rename-file (string-append bin "/h5fc") + (string-append fbin "/h5fc"))) (for-each (lambda (file) (rename-file file (string-append flib "/" (basename file)))) -- cgit v1.2.3 From 45201bf245856954cb8368c328e54773a0a81156 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 20 Sep 2018 18:59:57 +0100 Subject: gnu: hdf5-parallel-openmpi: Really enable parallel build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fix ensures that the H5_HAVE_PARALLEL identifier is correctly set in the file H5pubconf.h. * gnu/packages/maths.scm (hdf5-parallel-openmpi)[arguments]: Add the "--enable-parallel" flag to the list of configure flags. Remove the incompatible "--enable-cxx" flag. Add 'mpi-setup' phase. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 30f1610c1d..636b485260 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1037,10 +1037,13 @@ Swath).") `(("mpi" ,openmpi) ,@(package-inputs hdf5))) (arguments - (substitute-keyword-arguments `(#:configure-flags '("--enable-parallel") - ,@(package-arguments hdf5)) + (substitute-keyword-arguments (package-arguments hdf5) + ((#:configure-flags flags) + ``("--enable-parallel" ,@(delete "--enable-cxx" ,flags))) ((#:phases phases) `(modify-phases ,phases + (add-after 'build 'mpi-setup + ,%openmpi-setup) (add-before 'check 'patch-tests (lambda _ ;; OpenMPI's mpirun will exit with non-zero status if it -- cgit v1.2.3 From 7e27393f82ff5e7237f870ded09652b89e457faa Mon Sep 17 00:00:00 2001 From: pimi Date: Tue, 11 Sep 2018 16:54:32 +0200 Subject: gnu: Add r-pore. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/bioinformatics.scm (r-pore): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/bioinformatics.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 10330cd8b2..9599e3096f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13736,3 +13736,32 @@ juicer) and single-resolution or multi-resolution @code{.cool} files (for cooler). Both @code{hic} and @code{cool} files describe Hi-C contact matrices.") (license license:expat))) + +(define-public r-pore + (package + (name "r-pore") + (version "0.24") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://sourceforge/rpore/" version + "/poRe_" version ".tar.gz")) + (sha256 + (base32 "0pih9nljbv8g4x8rkk29i7aqq681b782r5s5ynp4nw9yzqnmmksv")))) + (properties `((upstream-name . "poRe"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bit64" ,r-bit64) + ("r-data-table" ,r-data-table) + ("r-rhdf5" ,r-rhdf5) + ("r-shiny" ,r-shiny) + ("r-svdialogs" ,r-svdialogs))) + (home-page "https://sourceforge.net/projects/rpore/") + (synopsis "Visualize Nanopore sequencing data") + (description + "This package provides graphical user interfaces to organize and visualize Nanopore +sequencing data.") + ;; This is free software but the license variant is unclear: + ;; . + (license license:bsd-3))) -- cgit v1.2.3 From 9daf046c5dd9256e45073dfd4647e12de10dcb3e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 14 Sep 2018 17:30:06 +0200 Subject: inferior: Add 'inferior-package-derivation'. * guix/inferior.scm (read-inferior-response) (send-inferior-request): New procedures. (inferior-eval): Rewrite in terms of these. (proxy, inferior-package-derivation, inferior-package->derivation) (package-compiler): New procedures. * tests/inferior.scm ("inferior-package-derivation"): New test. --- guix/inferior.scm | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++--- tests/inferior.scm | 22 ++++++++++ 2 files changed, 141 insertions(+), 6 deletions(-) diff --git a/guix/inferior.scm b/guix/inferior.scm index af37233a03..5bef964887 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -19,9 +19,21 @@ (define-module (guix inferior) #:use-module (srfi srfi-9) #:use-module (srfi srfi-9 gnu) - #:use-module ((guix utils) #:select (source-properties->location)) + #:use-module ((guix utils) + #:select (%current-system + source-properties->location + call-with-temporary-directory)) + #:use-module ((guix store) + #:select (nix-server-socket + nix-server-major-version + nix-server-minor-version + store-lift)) + #:use-module ((guix derivations) + #:select (read-derivation-from-file)) + #:use-module (guix gexp) #:use-module (ice-9 match) #:use-module (ice-9 popen) + #:use-module (ice-9 binary-ports) #:export (inferior? open-inferior close-inferior @@ -36,7 +48,8 @@ inferior-package-synopsis inferior-package-description inferior-package-home-page - inferior-package-location)) + inferior-package-location + inferior-package-derivation)) ;;; Commentary: ;;; @@ -123,8 +136,7 @@ equivalent. Return #f if the inferior could not be launched." (set-record-type-printer! write-inferior-object) -(define (inferior-eval exp inferior) - "Evaluate EXP in INFERIOR." +(define (read-inferior-response inferior) (define sexp->object (match-lambda (('value value) @@ -132,14 +144,21 @@ equivalent. Return #f if the inferior could not be launched." (('non-self-quoting address string) (inferior-object address string)))) - (write exp (inferior-socket inferior)) - (newline (inferior-socket inferior)) (match (read (inferior-socket inferior)) (('values objects ...) (apply values (map sexp->object objects))) (('exception key objects ...) (apply throw key (map sexp->object objects))))) +(define (send-inferior-request exp inferior) + (write exp (inferior-socket inferior)) + (newline (inferior-socket inferior))) + +(define (inferior-eval exp inferior) + "Evaluate EXP in INFERIOR." + (send-inferior-request exp inferior) + (read-inferior-response inferior)) + ;;; ;;; Inferior packages. @@ -216,3 +235,97 @@ record." (location->source-properties loc))) package-location)))) + +(define (proxy client backend) ;adapted from (guix ssh) + "Proxy communication between CLIENT and BACKEND until CLIENT closes the +connection, at which point CLIENT is closed (both CLIENT and BACKEND must be +input/output ports.)" + (define (select* read write except) + ;; This is a workaround for in Guile < 2.2.4: + ;; since 'select' sometimes returns non-empty sets for no good reason, + ;; call 'select' a second time with a zero timeout to filter out incorrect + ;; replies. + (match (select read write except) + ((read write except) + (select read write except 0)))) + + ;; Use buffered ports so that 'get-bytevector-some' returns up to the + ;; whole buffer like read(2) would--see . + (setvbuf client _IOFBF 65536) + (setvbuf backend _IOFBF 65536) + + (let loop () + (match (select* (list client backend) '() '()) + ((reads () ()) + (when (memq client reads) + (match (get-bytevector-some client) + ((? eof-object?) + (close-port client)) + (bv + (put-bytevector backend bv) + (force-output backend)))) + (when (memq backend reads) + (match (get-bytevector-some backend) + (bv + (put-bytevector client bv) + (force-output client)))) + (unless (port-closed? client) + (loop)))))) + +(define* (inferior-package-derivation store package + #:optional + (system (%current-system)) + #:key target) + "Return the derivation for PACKAGE, an inferior package, built for SYSTEM +and cross-built for TARGET if TARGET is true. The inferior corresponding to +PACKAGE must be live." + ;; Create a named socket in /tmp and let the inferior of PACKAGE connect to + ;; it and use it as its store. This ensures the inferior uses the same + ;; store, with the same options, the same per-session GC roots, etc. + (call-with-temporary-directory + (lambda (directory) + (chmod directory #o700) + (let* ((name (string-append directory "/inferior")) + (socket (socket AF_UNIX SOCK_STREAM 0)) + (inferior (inferior-package-inferior package)) + (major (nix-server-major-version store)) + (minor (nix-server-minor-version store)) + (proto (logior major minor))) + (bind socket AF_UNIX name) + (listen socket 1024) + (send-inferior-request + `(let ((socket (socket AF_UNIX SOCK_STREAM 0))) + (connect socket AF_UNIX ,name) + + ;; 'port->connection' appeared in June 2018 and we can hardly + ;; emulate it on older versions. Thus fall back to + ;; 'open-connection', at the risk of talking to the wrong daemon or + ;; having our build result reclaimed (XXX). + (let* ((store (if (defined? 'port->connection) + (port->connection socket #:version ,proto) + (open-connection))) + (package (hashv-ref %package-table + ,(inferior-package-id package))) + (drv ,(if target + `(package-cross-derivation store package + ,target + ,system) + `(package-derivation store package + ,system)))) + (close-connection store) + (close-port socket) + (derivation-file-name drv))) + inferior) + (match (accept socket) + ((client . address) + (proxy client (nix-server-socket store)))) + (close-port socket) + (read-derivation-from-file (read-inferior-response inferior)))))) + +(define inferior-package->derivation + (store-lift inferior-package-derivation)) + +(define-gexp-compiler (package-compiler (package ) system + target) + ;; Compile PACKAGE for SYSTEM, optionally cross-building for TARGET. + (inferior-package->derivation package system #:target target)) diff --git a/tests/inferior.scm b/tests/inferior.scm index ff5cad4210..817fcb6c6b 100644 --- a/tests/inferior.scm +++ b/tests/inferior.scm @@ -17,9 +17,13 @@ ;;; along with GNU Guix. If not, see . (define-module (test-inferior) + #:use-module (guix tests) #:use-module (guix inferior) #:use-module (guix packages) + #:use-module (guix store) + #:use-module (guix derivations) #:use-module (gnu packages) + #:use-module (gnu packages bootstrap) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64)) @@ -29,6 +33,9 @@ (define %top-builddir (dirname (search-path %load-compiled-path "guix.go"))) +(define %store + (open-connection-for-tests)) + (test-begin "inferior") @@ -72,4 +79,19 @@ (close-inferior inferior) result)))) +(test-equal "inferior-package-derivation" + (map derivation-file-name + (list (package-derivation %store %bootstrap-guile "x86_64-linux") + (package-derivation %store %bootstrap-guile "armhf-linux"))) + (let* ((inferior (open-inferior %top-builddir + #:command "scripts/guix")) + (packages (inferior-packages inferior)) + (guile (find (lambda (package) + (string=? (package-name %bootstrap-guile) + (inferior-package-name package))) + packages))) + (map derivation-file-name + (list (inferior-package-derivation %store guile "x86_64-linux") + (inferior-package-derivation %store guile "armhf-linux"))))) + (test-end "inferior") -- cgit v1.2.3 From e1a4ffdab52f616f41de4ff783a712bcd50a5187 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 15 Sep 2018 14:50:14 +0200 Subject: inferior: Add 'lookup-inferior-packages'. * guix/inferior.scm ()[packages, table]: New fields. (open-inferior): Initialize these new fields. (inferior-packages): Rename to... (%inferior-packages): ... this. (inferior-packages): New procedure; force the promise. (%inferior-package-table, lookup-inferior-packages): New procedures. * tests/inferior.scm ("lookup-inferior-packages") ("lookup-inferior-packages and eq?-ness"): New tests. --- guix/inferior.scm | 47 +++++++++++++++++++++++++++++++++++++++++------ tests/inferior.scm | 29 +++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 6 deletions(-) diff --git a/guix/inferior.scm b/guix/inferior.scm index 5bef964887..81b71d0c77 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -22,7 +22,8 @@ #:use-module ((guix utils) #:select (%current-system source-properties->location - call-with-temporary-directory)) + call-with-temporary-directory + version>? version-prefix?)) #:use-module ((guix store) #:select (nix-server-socket nix-server-major-version @@ -31,8 +32,10 @@ #:use-module ((guix derivations) #:select (read-derivation-from-file)) #:use-module (guix gexp) + #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:use-module (ice-9 popen) + #:use-module (ice-9 vlist) #:use-module (ice-9 binary-ports) #:export (inferior? open-inferior @@ -45,6 +48,7 @@ inferior-package-version inferior-packages + lookup-inferior-packages inferior-package-synopsis inferior-package-description inferior-package-home-page @@ -61,11 +65,13 @@ ;; Inferior Guix process. (define-record-type - (inferior pid socket version) + (inferior pid socket version packages table) inferior? (pid inferior-pid) (socket inferior-socket) - (version inferior-version)) ;REPL protocol version + (version inferior-version) ;REPL protocol version + (packages inferior-package-promise) ;promise of inferior packages + (table inferior-package-table)) ;promise of vhash (define (inferior-pipe directory command) "Return an input/output pipe on the Guix instance in DIRECTORY. This runs @@ -109,7 +115,9 @@ equivalent. Return #f if the inferior could not be launched." (match (read pipe) (('repl-version 0 rest ...) - (let ((result (inferior 'pipe pipe (cons 0 rest)))) + (letrec ((result (inferior 'pipe pipe (cons 0 rest) + (delay (%inferior-packages result)) + (delay (%inferior-package-table result))))) (inferior-eval '(use-modules (guix)) result) (inferior-eval '(use-modules (gnu)) result) (inferior-eval '(define %package-table (make-hash-table)) @@ -181,8 +189,8 @@ equivalent. Return #f if the inferior could not be launched." (set-record-type-printer! write-inferior-package) -(define (inferior-packages inferior) - "Return the list of packages known to INFERIOR." +(define (%inferior-packages inferior) + "Compute the list of inferior packages from INFERIOR." (let ((result (inferior-eval '(fold-packages (lambda (package result) (let ((id (object-address package))) @@ -198,6 +206,33 @@ equivalent. Return #f if the inferior could not be launched." (inferior-package inferior name version id))) result))) +(define (inferior-packages inferior) + "Return the list of packages known to INFERIOR." + (force (inferior-package-promise inferior))) + +(define (%inferior-package-table inferior) + "Compute a package lookup table for INFERIOR." + (fold (lambda (package table) + (vhash-cons (inferior-package-name package) package + table)) + vlist-null + (inferior-packages inferior))) + +(define* (lookup-inferior-packages inferior name #:optional version) + "Return the sorted list of inferior packages matching NAME in INFERIOR, with +highest version numbers first. If VERSION is true, return only packages with +a version number prefixed by VERSION." + ;; This is the counterpart of 'find-packages-by-name'. + (sort (filter (lambda (package) + (or (not version) + (version-prefix? version + (inferior-package-version package)))) + (vhash-fold* cons '() name + (force (inferior-package-table inferior)))) + (lambda (p1 p2) + (version>? (inferior-package-version p1) + (inferior-package-version p2))))) + (define (inferior-package-field package getter) "Return the field of PACKAGE, an inferior package, accessed with GETTER." (let ((inferior (inferior-package-inferior package)) diff --git a/tests/inferior.scm b/tests/inferior.scm index 817fcb6c6b..791e30b179 100644 --- a/tests/inferior.scm +++ b/tests/inferior.scm @@ -79,6 +79,35 @@ (close-inferior inferior) result)))) +(test-equal "lookup-inferior-packages" + (let ((->list (lambda (package) + (list (package-name package) + (package-version package) + (package-location package))))) + (list (map ->list (find-packages-by-name "guile" #f)) + (map ->list (find-packages-by-name "guile" "2.2")))) + (let* ((inferior (open-inferior %top-builddir + #:command "scripts/guix")) + (->list (lambda (package) + (list (inferior-package-name package) + (inferior-package-version package) + (inferior-package-location package)))) + (lst1 (map ->list + (lookup-inferior-packages inferior "guile"))) + (lst2 (map ->list + (lookup-inferior-packages inferior + "guile" "2.2")))) + (close-inferior inferior) + (list lst1 lst2))) + +(test-assert "lookup-inferior-packages and eq?-ness" + (let* ((inferior (open-inferior %top-builddir + #:command "scripts/guix")) + (lst1 (lookup-inferior-packages inferior "guile")) + (lst2 (lookup-inferior-packages inferior "guile"))) + (close-inferior inferior) + (every eq? lst1 lst2))) + (test-equal "inferior-package-derivation" (map derivation-file-name (list (package-derivation %store %bootstrap-guile "x86_64-linux") -- cgit v1.2.3 From 6030396aec325b3c3287a472014bc2d530abb99d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 17 Sep 2018 09:55:31 +0200 Subject: inferior: Add 'inferior-package-inputs' & co. * guix/inferior.scm (open-inferior): Use (ice-9 match). (inferior-package-input-field, inferior-package-inputs): (inferior-package-native-inputs) (inferior-package-propagated-inputs) (inferior-package-transitive-propagated-inputs): New procedures. * tests/inferior.scm ("inferior-package-inputs"): New test. inputs fixlet --- guix/inferior.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/inferior.scm | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/guix/inferior.scm b/guix/inferior.scm index 81b71d0c77..ca819c6eff 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -33,6 +33,7 @@ #:select (read-derivation-from-file)) #:use-module (guix gexp) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (ice-9 match) #:use-module (ice-9 popen) #:use-module (ice-9 vlist) @@ -53,6 +54,10 @@ inferior-package-description inferior-package-home-page inferior-package-location + inferior-package-inputs + inferior-package-native-inputs + inferior-package-propagated-inputs + inferior-package-transitive-propagated-inputs inferior-package-derivation)) ;;; Commentary: @@ -120,6 +125,7 @@ equivalent. Return #f if the inferior could not be launched." (delay (%inferior-package-table result))))) (inferior-eval '(use-modules (guix)) result) (inferior-eval '(use-modules (gnu)) result) + (inferior-eval '(use-modules (ice-9 match)) result) (inferior-eval '(define %package-table (make-hash-table)) result) result)) @@ -271,6 +277,51 @@ record." loc))) package-location)))) +(define (inferior-package-input-field package field) + "Return the input field FIELD (e.g., 'native-inputs') of PACKAGE, an +inferior package." + (define field* + `(compose (lambda (inputs) + (map (match-lambda + ;; XXX: Origins are not handled. + ((label (? package? package) rest ...) + (let ((id (object-address package))) + (hashv-set! %package-table id package) + `(,label (package ,id + ,(package-name package) + ,(package-version package)) + ,@rest))) + (x + x)) + inputs)) + ,field)) + + (define inputs + (inferior-package-field package field*)) + + (define inferior + (inferior-package-inferior package)) + + (map (match-lambda + ((label ('package id name version) . rest) + ;; XXX: eq?-ness of inferior packages is not preserved here. + `(,label ,(inferior-package inferior name version id) + ,@rest)) + (x x)) + inputs)) + +(define inferior-package-inputs + (cut inferior-package-input-field <> 'package-inputs)) + +(define inferior-package-native-inputs + (cut inferior-package-input-field <> 'package-native-inputs)) + +(define inferior-package-propagated-inputs + (cut inferior-package-input-field <> 'package-propagated-inputs)) + +(define inferior-package-transitive-propagated-inputs + (cut inferior-package-input-field <> 'package-transitive-propagated-inputs)) + (define (proxy client backend) ;adapted from (guix ssh) "Proxy communication between CLIENT and BACKEND until CLIENT closes the connection, at which point CLIENT is closed (both CLIENT and BACKEND must be diff --git a/tests/inferior.scm b/tests/inferior.scm index 791e30b179..03170a19c9 100644 --- a/tests/inferior.scm +++ b/tests/inferior.scm @@ -24,8 +24,10 @@ #:use-module (guix derivations) #:use-module (gnu packages) #:use-module (gnu packages bootstrap) + #:use-module (gnu packages guile) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-64)) + #:use-module (srfi srfi-64) + #:use-module (ice-9 match)) (define %top-srcdir (dirname (search-path %load-path "guix.scm"))) @@ -108,6 +110,36 @@ (close-inferior inferior) (every eq? lst1 lst2))) +(test-equal "inferior-package-inputs" + (let ((->list (match-lambda + ((label (? package? package) . rest) + `(,label + (package ,(package-name package) + ,(package-version package) + ,(package-location package)) + ,@rest))))) + (list (map ->list (package-inputs guile-2.2)) + (map ->list (package-native-inputs guile-2.2)) + (map ->list (package-propagated-inputs guile-2.2)))) + (let* ((inferior (open-inferior %top-builddir + #:command "scripts/guix")) + (guile (first (lookup-inferior-packages inferior "guile"))) + (->list (match-lambda + ((label (? inferior-package? package) . rest) + `(,label + (package ,(inferior-package-name package) + ,(inferior-package-version package) + ,(inferior-package-location package)) + ,@rest)))) + (result (list (map ->list (inferior-package-inputs guile)) + (map ->list + (inferior-package-native-inputs guile)) + (map ->list + (inferior-package-propagated-inputs + guile))))) + (close-inferior inferior) + result)) + (test-equal "inferior-package-derivation" (map derivation-file-name (list (package-derivation %store %bootstrap-guile "x86_64-linux") -- cgit v1.2.3 From eee8b303f6d82c1400fd8fd3b097406358ed7875 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 17 Sep 2018 10:04:15 +0200 Subject: inferior: Add 'inferior-package-search-paths' & co. * guix/inferior.scm (%inferior-package-search-paths) (inferior-package-native-search-paths) (inferior-package-search-paths) (inferior-package-transitive-native-search-paths): New procedures. * tests/inferior.scm ("inferior-package-search-paths"): New test. --- guix/inferior.scm | 26 ++++++++++++++++++++++++++ tests/inferior.scm | 9 +++++++++ 2 files changed, 35 insertions(+) diff --git a/guix/inferior.scm b/guix/inferior.scm index ca819c6eff..3fa4930095 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -32,6 +32,7 @@ #:use-module ((guix derivations) #:select (read-derivation-from-file)) #:use-module (guix gexp) + #:use-module (guix search-paths) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match) @@ -58,6 +59,9 @@ inferior-package-native-inputs inferior-package-propagated-inputs inferior-package-transitive-propagated-inputs + inferior-package-native-search-paths + inferior-package-transitive-native-search-paths + inferior-package-search-paths inferior-package-derivation)) ;;; Commentary: @@ -322,6 +326,28 @@ inferior package." (define inferior-package-transitive-propagated-inputs (cut inferior-package-input-field <> 'package-transitive-propagated-inputs)) +(define (%inferior-package-search-paths package field) + "Return the list of search path specificiations of PACKAGE, an inferior +package." + (define paths + (inferior-package-field package + `(compose (lambda (paths) + (map (@ (guix search-paths) + search-path-specification->sexp) + paths)) + ,field))) + + (map sexp->search-path-specification paths)) + +(define inferior-package-native-search-paths + (cut %inferior-package-search-paths <> 'package-native-search-paths)) + +(define inferior-package-search-paths + (cut %inferior-package-search-paths <> 'package-search-paths)) + +(define inferior-package-transitive-native-search-paths + (cut %inferior-package-search-paths <> 'package-transitive-native-search-paths)) + (define (proxy client backend) ;adapted from (guix ssh) "Proxy communication between CLIENT and BACKEND until CLIENT closes the connection, at which point CLIENT is closed (both CLIENT and BACKEND must be diff --git a/tests/inferior.scm b/tests/inferior.scm index 03170a19c9..99d736bd40 100644 --- a/tests/inferior.scm +++ b/tests/inferior.scm @@ -140,6 +140,15 @@ (close-inferior inferior) result)) +(test-equal "inferior-package-search-paths" + (package-native-search-paths guile-2.2) + (let* ((inferior (open-inferior %top-builddir + #:command "scripts/guix")) + (guile (first (lookup-inferior-packages inferior "guile"))) + (result (inferior-package-native-search-paths guile))) + (close-inferior inferior) + result)) + (test-equal "inferior-package-derivation" (map derivation-file-name (list (package-derivation %store %bootstrap-guile "x86_64-linux") -- cgit v1.2.3 From 2e6d64e122ad2745154a38122785895d1b66c2ff Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Sep 2018 09:56:34 +0200 Subject: inferior: Add 'inferior-package->manifest-entry'. * guix/inferior.scm (inferior-package->manifest-entry): New procedure. * tests/inferior.scm (manifest-entry->list): New procedure. ("inferior-package->manifest-entry"): New test. --- guix/inferior.scm | 42 ++++++++++++++++++++++++++++++++++++++---- tests/inferior.scm | 18 ++++++++++++++++++ 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/guix/inferior.scm b/guix/inferior.scm index 3fa4930095..c86fdd3ec1 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -33,6 +33,7 @@ #:select (read-derivation-from-file)) #:use-module (guix gexp) #:use-module (guix search-paths) + #:use-module (guix profiles) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match) @@ -45,12 +46,12 @@ inferior-eval inferior-object? + inferior-packages + lookup-inferior-packages + inferior-package? inferior-package-name inferior-package-version - - inferior-packages - lookup-inferior-packages inferior-package-synopsis inferior-package-description inferior-package-home-page @@ -62,7 +63,9 @@ inferior-package-native-search-paths inferior-package-transitive-native-search-paths inferior-package-search-paths - inferior-package-derivation)) + inferior-package-derivation + + inferior-package->manifest-entry)) ;;; Commentary: ;;; @@ -441,3 +444,34 @@ PACKAGE must be live." target) ;; Compile PACKAGE for SYSTEM, optionally cross-building for TARGET. (inferior-package->derivation package system #:target target)) + + +;;; +;;; Manifest entries. +;;; + +(define* (inferior-package->manifest-entry package + #:optional (output "out") + #:key (parent (delay #f)) + (properties '())) + "Return a manifest entry for the OUTPUT of package PACKAGE." + ;; For each dependency, keep a promise pointing to its "parent" entry. + (letrec* ((deps (map (match-lambda + ((label package) + (inferior-package->manifest-entry package + #:parent (delay entry))) + ((label package output) + (inferior-package->manifest-entry package output + #:parent (delay entry)))) + (inferior-package-propagated-inputs package))) + (entry (manifest-entry + (name (inferior-package-name package)) + (version (inferior-package-version package)) + (output output) + (item package) + (dependencies (delete-duplicates deps)) + (search-paths + (inferior-package-transitive-native-search-paths package)) + (parent parent) + (properties properties)))) + entry)) diff --git a/tests/inferior.scm b/tests/inferior.scm index 99d736bd40..6f6abd28a1 100644 --- a/tests/inferior.scm +++ b/tests/inferior.scm @@ -21,6 +21,7 @@ #:use-module (guix inferior) #:use-module (guix packages) #:use-module (guix store) + #:use-module (guix profiles) #:use-module (guix derivations) #:use-module (gnu packages) #:use-module (gnu packages bootstrap) @@ -38,6 +39,13 @@ (define %store (open-connection-for-tests)) +(define (manifest-entry->list entry) + (list (manifest-entry-name entry) + (manifest-entry-version entry) + (manifest-entry-output entry) + (manifest-entry-search-paths entry) + (map manifest-entry->list (manifest-entry-dependencies entry)))) + (test-begin "inferior") @@ -164,4 +172,14 @@ (list (inferior-package-derivation %store guile "x86_64-linux") (inferior-package-derivation %store guile "armhf-linux"))))) +(test-equal "inferior-package->manifest-entry" + (manifest-entry->list (package->manifest-entry + (first (find-best-packages-by-name "guile" #f)))) + (let* ((inferior (open-inferior %top-builddir + #:command "scripts/guix")) + (guile (first (lookup-inferior-packages inferior "guile"))) + (entry (inferior-package->manifest-entry guile))) + (close-inferior inferior) + (manifest-entry->list entry))) + (test-end "inferior") -- cgit v1.2.3 From 811b21fb15d36b06fde994ca7ef5916a9a19f250 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Sep 2018 10:21:28 +0200 Subject: profiles: 'packages->manifest' now accepts inferior packages. * guix/profiles.scm (packages->manifest)[inferiors-loaded?]: New variable. [inferior->entry]: New procedure. Accept inferior packages when INFERIORS-LOADED? is true. * tests/guix-package.sh: Add test using a manifest with an inferior. * tests/inferior.scm ("packages->manifest"): New test. --- guix/profiles.scm | 27 +++++++++++++++++++++++---- tests/guix-package.sh | 15 +++++++++++++++ tests/inferior.scm | 11 +++++++++++ 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index 8acfcff8c1..669ebe04e5 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -314,12 +314,31 @@ file name." "Return a list of manifest entries, one for each item listed in PACKAGES. Elements of PACKAGES can be either package objects or package/string tuples denoting a specific output of a package." + (define inferiors-loaded? + ;; This hack allows us to provide seamless integration for inferior + ;; packages while not having a hard dependency on (guix inferior). + (resolve-module '(guix inferior) #f #f #:ensure #f)) + + (define (inferior->entry) + (module-ref (resolve-interface '(guix inferior)) + 'inferior-package->manifest-entry)) + (manifest (map (match-lambda - ((package output) - (package->manifest-entry package output)) - ((? package? package) - (package->manifest-entry package))) + ((package output) + (package->manifest-entry package output)) + ((? package? package) + (package->manifest-entry package)) + ((thing output) + (if inferiors-loaded? + ((inferior->entry) thing output) + (throw 'wrong-type-arg 'packages->manifest + "Wrong package object: ~S" (list thing) (list thing)))) + (thing + (if inferiors-loaded? + ((inferior->entry) thing) + (throw 'wrong-type-arg 'packages->manifest + "Wrong package object: ~S" (list thing) (list thing))))) packages))) (define (manifest->gexp manifest) diff --git a/tests/guix-package.sh b/tests/guix-package.sh index cef3b3452e..f7dfbfad00 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -358,6 +358,21 @@ EOF guix package --bootstrap -m "$module_dir/manifest.scm" guix package -I | grep guile test `guix package -I | wc -l` -eq 1 +guix package --rollback --bootstrap + +# Applying a manifest file with inferior packages. +cat > "$module_dir/manifest.scm"<manifest (list guile))) +EOF +guix package --bootstrap -m "$module_dir/manifest.scm" +guix package -I | grep guile +test `guix package -I | wc -l` -eq 1 # Error reporting. cat > "$module_dir/manifest.scm"<list entry))) +(test-equal "packages->manifest" + (map manifest-entry->list + (manifest-entries (packages->manifest + (find-best-packages-by-name "guile" #f)))) + (let* ((inferior (open-inferior %top-builddir + #:command "scripts/guix")) + (guile (first (lookup-inferior-packages inferior "guile"))) + (manifest (packages->manifest (list guile)))) + (close-inferior inferior) + (map manifest-entry->list (manifest-entries manifest)))) + (test-end "inferior") -- cgit v1.2.3 From c37f38bde69c072cfd0006ba89f30f0d0ad24448 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Sep 2018 12:08:05 +0200 Subject: channels: Add 'channel-instances->derivation'. * guix/channels.scm (channel-instances->derivation): New procedure. (latest-channel-derivation): Use it. (channel-instance-derivations): Make private. --- guix/channels.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/guix/channels.scm b/guix/channels.scm index 2e7bffae9f..82389eb583 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -47,9 +47,9 @@ channel-instance-checkout latest-channel-instances - channel-instance-derivations latest-channel-derivation - channel-instances->manifest)) + channel-instances->manifest + channel-instances->derivation)) ;;; Commentary: ;;; @@ -294,13 +294,17 @@ channel instances." (zip instances derivations)))) (return (manifest entries)))) +(define (channel-instances->derivation instances) + "Return the derivation of the profile containing INSTANCES, a list of +channel instances." + (mlet %store-monad ((manifest (channel-instances->manifest instances))) + (profile-derivation manifest))) + (define latest-channel-instances* (store-lift latest-channel-instances)) (define* (latest-channel-derivation #:optional (channels %default-channels)) "Return as a monadic value the derivation that builds the profile for the latest instances of CHANNELS." - (mlet* %store-monad ((instances ((store-lift latest-channel-instances) - channels)) - (manifest (channel-instances->manifest instances))) - (profile-derivation manifest))) + (mlet %store-monad ((instances (latest-channel-instances* channels))) + (channel-instances->derivation instances))) -- cgit v1.2.3 From 2dad0313753c4b506eb1f401136b6fcb4785a3b9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 18 Sep 2018 13:30:48 +0200 Subject: inferior: Add 'inferior-for-channels'. * guix/inferior.scm (%inferior-cache-directory): New variable. (inferior-for-channels): New procedure. --- guix/inferior.scm | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 2 deletions(-) diff --git a/guix/inferior.scm b/guix/inferior.scm index c86fdd3ec1..1dbb9e1699 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -23,7 +23,8 @@ #:select (%current-system source-properties->location call-with-temporary-directory - version>? version-prefix?)) + version>? version-prefix? + cache-directory)) #:use-module ((guix store) #:select (nix-server-socket nix-server-major-version @@ -34,12 +35,23 @@ #:use-module (guix gexp) #:use-module (guix search-paths) #:use-module (guix profiles) + #:use-module (guix channels) + #:use-module (guix monads) + #:use-module (guix store) + #:use-module (guix derivations) + #:use-module (guix base32) + #:use-module (gcrypt hash) + #:autoload (guix cache) (maybe-remove-expired-cache-entries) + #:autoload (guix ui) (show-what-to-build*) + #:autoload (guix build utils) (mkdir-p) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) + #:autoload (ice-9 ftw) (scandir) #:use-module (ice-9 match) #:use-module (ice-9 popen) #:use-module (ice-9 vlist) #:use-module (ice-9 binary-ports) + #:use-module ((rnrs bytevectors) #:select (string->utf8)) #:export (inferior? open-inferior close-inferior @@ -65,7 +77,10 @@ inferior-package-search-paths inferior-package-derivation - inferior-package->manifest-entry)) + inferior-package->manifest-entry + + %inferior-cache-directory + inferior-for-channels)) ;;; Commentary: ;;; @@ -475,3 +490,69 @@ PACKAGE must be live." (parent parent) (properties properties)))) entry)) + + +;;; +;;; Cached inferiors. +;;; + +(define %inferior-cache-directory + ;; Directory for cached inferiors (GC roots). + (make-parameter (string-append (cache-directory #:ensure? #f) + "/inferiors"))) + +(define* (inferior-for-channels channels + #:key + (cache-directory (%inferior-cache-directory)) + (ttl (* 3600 24 30))) + "Return an inferior for CHANNELS, a list of channels. Use the cache at +CACHE-DIRECTORY, where entries can be reclaimed after TTL seconds. This +procedure opens a new connection to the build daemon. + +This is a convenience procedure that people may use in manifests passed to +'guix package -m', for instance." + (with-store store + (let () + (define instances + (latest-channel-instances store channels)) + + (define key + (bytevector->base32-string + (sha256 + (string->utf8 + (string-concatenate (map channel-instance-commit instances)))))) + + (define cached + (string-append cache-directory "/" key)) + + (define (base32-encoded-sha256? str) + (= (string-length str) 52)) + + (define (cache-entries directory) + (map (lambda (file) + (string-append directory "/" file)) + (scandir directory base32-encoded-sha256?))) + + (define symlink* + (lift2 symlink %store-monad)) + + (define add-indirect-root* + (store-lift add-indirect-root)) + + (mkdir-p cache-directory) + (maybe-remove-expired-cache-entries cache-directory + cache-entries + #:entry-expiration + (file-expiration-time ttl)) + + (if (file-exists? cached) + (open-inferior cached) + (run-with-store store + (mlet %store-monad ((profile + (channel-instances->derivation instances))) + (mbegin %store-monad + (show-what-to-build* (list profile)) + (built-derivations (list profile)) + (symlink* (derivation->output-path profile) cached) + (add-indirect-root* cached) + (return (open-inferior cached))))))))) -- cgit v1.2.3 From 92a9f14b9d2ae08f5d8f30149963c1e326dd37a6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 21 Sep 2018 17:03:52 +0200 Subject: doc: Add section about inferiors. * doc/guix.texi (Inferiors): New node. (Channels): Add xref to "Inferiors". --- doc/guix.texi | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index b925485be5..76ec718b07 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -147,6 +147,7 @@ Package Management * Invoking guix gc:: Running the garbage collector. * Invoking guix pull:: Fetching the latest Guix and distribution. * Channels:: Customizing the package collection. +* Inferiors:: Interacting with another revision of Guix. * Invoking guix describe:: Display information about your Guix revision. * Invoking guix pack:: Creating software bundles. * Invoking guix archive:: Exporting and importing store files. @@ -1699,6 +1700,7 @@ guix package -i emacs-guix * Invoking guix gc:: Running the garbage collector. * Invoking guix pull:: Fetching the latest Guix and distribution. * Channels:: Customizing the package collection. +* Inferiors:: Interacting with another revision of Guix. * Invoking guix describe:: Display information about your Guix revision. * Invoking guix pack:: Creating software bundles. * Invoking guix archive:: Exporting and importing store files. @@ -3053,6 +3055,135 @@ package it defines. 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. + +@node Inferiors +@section Inferiors + +@c TODO: Remove this once we're more confident about API stability. +@quotation Note +The functionality described here is a ``technology preview'' as of version +@value{VERSION}. As such, the interface is subject to change. +@end quotation + +@cindex inferiors +@cindex composition of Guix revisions +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. + +@cindex inferior packages +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}. + +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: + +@lisp +(use-modules (guix inferior) (guix channels) + (srfi srfi-1)) ;for 'first' + +(define channels + ;; This is the old revision from which we want to + ;; extract guile-json. + (list (channel + (name 'guix) + (url "https://git.savannah.gnu.org/git/guix.git") + (commit + "65956ad3526ba09e1f7a40722c96c6ef7c0936fe")))) + +(define inferior + ;; An inferior representing the above revision. + (inferior-for-channels channels)) + +;; Now create a manifest with the current "guile" package +;; and the old "guile-json" package. +(packages->manifest + (list (first (lookup-inferior-packages inferior "guile-json")) + (specification->package "guile"))) +@end lisp + +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. + +The @code{(guix inferior)} module provides the following procedures to open an +inferior: + +@deffn {Scheme Procedure} inferior-for-channels @var{channels} @ + [#: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. + +As a side effect, this procedure may build or substitute binaries for +@var{channels}, which can take time. +@end deffn + +@deffn {Scheme Procedure} open-inferior @var{directory} @ + [#: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. +@end deffn + +@cindex inferior packages +The procedures listed below allow you to obtain and manipulate inferior +packages. + +@deffn {Scheme Procedure} inferior-packages @var{inferior} +Return the list of packages known to @var{inferior}. +@end deffn + +@deffn {Scheme Procedure} lookup-inferior-packages @var{inferior} @var{name} @ + [@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}. +@end deffn + +@deffn {Scheme Procedure} inferior-package? @var{obj} +Return true if @var{obj} is an inferior package. +@end deffn + +@deffn {Scheme Procedure} inferior-package-name @var{package} +@deffnx {Scheme Procedure} inferior-package-version @var{package} +@deffnx {Scheme Procedure} inferior-package-synopsis @var{package} +@deffnx {Scheme Procedure} inferior-package-description @var{package} +@deffnx {Scheme Procedure} inferior-package-home-page @var{package} +@deffnx {Scheme Procedure} inferior-package-location @var{package} +@deffnx {Scheme Procedure} inferior-package-inputs @var{package} +@deffnx {Scheme Procedure} inferior-package-native-inputs @var{package} +@deffnx {Scheme Procedure} inferior-package-propagated-inputs @var{package} +@deffnx {Scheme Procedure} inferior-package-transitive-propagated-inputs @var{package} +@deffnx {Scheme Procedure} inferior-package-native-search-paths @var{package} +@deffnx {Scheme Procedure} inferior-package-transitive-native-search-paths @var{package} +@deffnx {Scheme Procedure} inferior-package-search-paths @var{package} +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. +@end deffn + +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. @node Invoking guix describe @section Invoking @command{guix describe} -- cgit v1.2.3 From ec944a1de97c8a523d6e1089b8c4430424297f93 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 21 Sep 2018 15:42:56 +0200 Subject: gnu: rust: Remove unused "ar" setting. * gnu/packages/rust.scm (rust-1.20)[arguments]<#:phases>[configure]: Remove unused "ar" setting. --- gnu/packages/rust.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 40633854ae..cc33a0d3b9 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -574,7 +574,6 @@ rpath = true llvm-config = \"" llvm "/bin/llvm-config" "\" cc = \"" gcc "/bin/gcc" "\" cxx = \"" gcc "/bin/g++" "\" -ar = \"" binutils "/bin/ar" "\" jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" [dist] ") port))) -- cgit v1.2.3 From 199d72e32759b0b0a0514d1bb667f0f1f2a6cbb4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 14:26:30 +0200 Subject: gnu: python-pyparsing: Update to 2.2.1. * gnu/packages/python.scm (python-pyparsing): Update to 2.2.1. [source]: Use PYPI-URI. --- gnu/packages/python.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a11c7e315e..26829f050e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3350,16 +3350,13 @@ library, libgit2 implements Git plumbing.") (define-public python-pyparsing (package (name "python-pyparsing") - (version "2.2.0") + (version "2.2.1") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/pyparsing/pyparsing" - "/pyparsing-" version - "/pyparsing-" version ".tar.gz")) + (uri (pypi-uri "pyparsing" version)) (sha256 - (base32 - "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8")))) + (base32 "06dgd0iilvf8m0ssmfpcbh8l6jf0zkp8adbb84llksg17crfx4zl")))) (build-system python-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 9a32bdf8a9b56eec84310a809820eadd1a33f45f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 17:12:36 +0200 Subject: gnu: wxwidgets: Update to 3.0.4. * gnu/packages/wxwidgets.scm (wxwidgets): Update to 3.0.4. --- gnu/packages/wxwidgets.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index f1a61329e8..6cbfd76e10 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -49,7 +49,7 @@ (define-public wxwidgets (package (name "wxwidgets") - (version "3.0.3") + (version "3.0.4") (source (origin (method url-fetch) @@ -57,7 +57,7 @@ "releases/download/v" version "/wxWidgets-" version ".tar.bz2")) (sha256 - (base32 "0yrhp5cs2g33cpbdwdzicmm5m4mfnlvxwv031x9266zc90zh7j08")))) + (base32 "1w7pgfqjab7n84lc4aarydl3g55d1hdgl2ilwml766r6inc7y5cn")))) (build-system glib-or-gtk-build-system) (inputs `(("glu" ,glu) -- cgit v1.2.3 From 10fadd1e3d2e67ed8bc34a91a587d4862f6055e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 17:13:13 +0200 Subject: gnu: filezilla: Update to 3.37.1. * gnu/packages/ftp.scm (filezilla): Update to 3.37.1. --- gnu/packages/ftp.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 335c975d12..faf9f5dd10 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -207,16 +207,14 @@ output. (define-public filezilla (package (name "filezilla") - (version "3.31.0") + (version "3.37.1") (source (origin (method url-fetch) - (uri (string-append "https://sourceforge.net/projects/" name - "/files/FileZilla_Client/" version - "/FileZilla_" version "_src" ".tar.bz2")) + (uri (string-append "https://download.filezilla-project.org/client/" + "FileZilla_" version "_src.tar.bz2")) (sha256 - (base32 - "1rfysb8dil35a7bzj2kw0mzzkys39d7yn6ipsbk8l6rkwfvnii8l")))) + (base32 "1bbxlm8gc0r5jing8xmkdbhj5a1qfbjn8varhny3mrk1am4m7s7l")))) (build-system gnu-build-system) (arguments ;; Don't let filezilla phone home to check for updates. -- cgit v1.2.3 From 43726c522f4b3802ce66c0f17160314569b1d673 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 20:13:14 +0200 Subject: gnu: emacs-password-store: Update to 1.7.3. * gnu/packages/emacs.scm (emacs-password-store): Update to 1.7.3. --- 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 977f0c99b8..4662c11cff 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -8394,7 +8394,7 @@ close, copy, cut, paste, undo, redo.") (define-public emacs-password-store (package (name "emacs-password-store") - (version "1.7.2") + (version "1.7.3") (source (origin (method url-fetch) (uri @@ -8402,7 +8402,7 @@ close, copy, cut, paste, undo, redo.") "password-store-" version ".tar.xz")) (sha256 (base32 - "1sl0d7nc85c6c2bmmmyb8rpmn47vhkj831l153mjlkawjvhwas27")))) + "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 1302837f6b9ba4364ed06cdbe55fb54e8fe7de0f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 20:22:51 +0200 Subject: gnu: workrave: Update to 1.10.21. * gnu/packages/gnome.scm (workrave): Update to 1.10.21. [source]: Use GIT-FILE-NAME. --- 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 99f4c1271a..65716ce413 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7224,7 +7224,7 @@ mp3, Ogg Vorbis and FLAC") (license license:gpl2+))) (define-public workrave - (let ((commit "v1_10_20")) + (let ((commit "v1_10_21")) (package (name "workrave") (version (string-map (match-lambda @@ -7236,10 +7236,10 @@ mp3, Ogg Vorbis and FLAC") (uri (git-reference (url "https://github.com/rcaelers/workrave.git") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 - "099a87zkrkmsgfz9isrfm89dh545x52891jh6qxmn19h6wwsi941")))) + "150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases -- cgit v1.2.3 From a255142af3288ff76e37ac30b6b6f9acdcd2ca01 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 21 Sep 2018 21:55:28 +0200 Subject: gnu: emacs-org: Update to 9.1.14. * gnu/packages/emacs.scm (emacs-org): Update to 9.1.14. --- 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 4662c11cff..28d97f82c1 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5318,14 +5318,14 @@ passive voice.") (name "emacs-org") ;; emacs-org-contrib inherits from this package. Please update its sha256 ;; checksum as well. - (version "9.1.13") + (version "9.1.14") (source (origin (method url-fetch) (uri (string-append "http://elpa.gnu.org/packages/org-" version ".tar")) (sha256 (base32 - "1vx0n32gvrgy2bl2b4pvxf00cywxwm57gi46f2b2zlrnmd5n85pr")))) + "17vd9hig26rqv90l6y92hc2i0x29g44lsdsp0xd4m53s8r3zdikz")))) (build-system emacs-build-system) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") -- cgit v1.2.3 From 78b7b9dbe9098c9c47c7acba363223bb6c5bb1c8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 21 Sep 2018 22:22:09 +0200 Subject: gnu: snap: Update to 4.2.1.4. * gnu/packages/education.scm (snap): Update to 4.2.1.4. --- gnu/packages/education.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 52dde26f44..8b02adc182 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -243,7 +243,7 @@ easy.") (define-public snap (package (name "snap") - (version "4.2.1.3") + (version "4.2.1.4") (source (origin (method git-fetch) @@ -253,7 +253,7 @@ easy.") (file-name (git-file-name name version)) (sha256 (base32 - "0n32hg8rx6alk5j58l76gzmicrg1bp7jagz5mh1zrg7591aicjal")))) + "0yc0w0cdhvi0nwqqrann2v3y0n7shxh7irgixqvlavp4k49d7aqj")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit v1.2.3 From 05fb1e0017030f1c0cbc7e9a1adeccca57ef1d9d Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sat, 22 Sep 2018 08:19:09 +1000 Subject: gnu: hmmer: Update to 3.2.1. * gnu/packages/bioinformatics.scm (hmmer): Update to 3.2.1. [origin]: Remove patch. [license]: Change to BSD-3. [supported-systems]: New field. * gnu/packages/patches/hmmer-remove-cpu-specificity.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/bioinformatics.scm | 19 +++++++------------ .../patches/hmmer-remove-cpu-specificity.patch | 22 ---------------------- 3 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 gnu/packages/patches/hmmer-remove-cpu-specificity.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4097ad5fcd..daf96ea4b6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -805,7 +805,6 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ - %D%/packages/patches/hmmer-remove-cpu-specificity.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 \ diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9599e3096f..b619866ba3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2936,18 +2936,15 @@ indexing scheme is called a @dfn{Hierarchical Graph FM index} (HGFM).") (define-public hmmer (package (name "hmmer") - (version "3.1b2") + (version "3.2.1") (source (origin (method url-fetch) (uri (string-append - "http://eddylab.org/software/hmmer" - (version-major version) "/" - version "/hmmer-" version ".tar.gz")) + "http://eddylab.org/software/hmmer/hmmer-" version ".tar.gz")) (sha256 (base32 - "0djmgc0pfli0jilfx8hql1axhwhqxqb8rxg2r5rg07aw73sfs5nx")) - (patches (search-patches "hmmer-remove-cpu-specificity.patch")))) + "171bivy6xhgjsz5nv53n81pc3frnwz29ylblawk2bv46szwjjqd5")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) (home-page "http://hmmer.org/") @@ -2957,12 +2954,10 @@ indexing scheme is called a @dfn{Hierarchical Graph FM index} (HGFM).") sequences, and for making protein sequence alignments. It implements methods using probabilistic models called profile hidden Markov models (profile HMMs).") - (license (list license:gpl3+ - ;; The bundled library 'easel' is distributed - ;; under The Janelia Farm Software License. - (license:non-copyleft - "file://easel/LICENSE" - "See easel/LICENSE in the distribution."))))) + ;; hmmer uses non-portable SSE intrinsics so building fails on other + ;; platforms. + (supported-systems '("x86_64-linux" "i686-linux")) + (license license:bsd-3))) (define-public htseq (package diff --git a/gnu/packages/patches/hmmer-remove-cpu-specificity.patch b/gnu/packages/patches/hmmer-remove-cpu-specificity.patch deleted file mode 100644 index ba98db4d0e..0000000000 --- a/gnu/packages/patches/hmmer-remove-cpu-specificity.patch +++ /dev/null @@ -1,22 +0,0 @@ -This patch removes compilation flags which make the build for the machine -where compilation takes place, rendering the build not reproducible. - -diff --git a/configure b/configure -index 8b6aaef..49a6afc 100755 ---- a/configure -+++ b/configure -@@ -6125,14 +6125,6 @@ fi # guess arch - - if test "x$ax_gcc_arch" != x -a "x$ax_gcc_arch" != xno; then - for arch in $ax_gcc_arch; do -- if test "x$acx_maxopt_portable" = xyes; then # if we require portable code -- flags="-mtune=$arch" -- # -mcpu=$arch and m$arch generate nonportable code on every arch except -- # x86. And some other arches (e.g. Alpha) don't accept -mtune. Grrr. -- case $host_cpu in i*86|x86_64*) flags="$flags -mcpu=$arch -m$arch";; esac -- else -- flags="-march=$arch -mcpu=$arch -m$arch" -- fi - for flag in $flags; do - as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 -- cgit v1.2.3 From 91294b53619995712a6f8d497d650bfc02b4c952 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sat, 22 Sep 2018 10:07:50 +0200 Subject: Revert 'gnu: rust: Remove unused "ar" setting.'. Some versions of Rust do need it and others complain about it. For now, revert the removal entirely. This reverts commit ec944a1de97c8a523d6e1089b8c4430424297f93. --- gnu/packages/rust.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index cc33a0d3b9..40633854ae 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -574,6 +574,7 @@ rpath = true llvm-config = \"" llvm "/bin/llvm-config" "\" cc = \"" gcc "/bin/gcc" "\" cxx = \"" gcc "/bin/g++" "\" +ar = \"" binutils "/bin/ar" "\" jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" [dist] ") port))) -- cgit v1.2.3 From ae71cd8ac93245360ffe73d6ab260975ec0d742f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 22 Sep 2018 04:47:54 -0400 Subject: gnu: icecat: Add fixes from upstream mozilla-esr60 [security fixes]. Includes fixes for CVE-2018-12383 and CVE-2018-12385. * gnu/packages/patches/icecat-CVE-2018-12383.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/patches/icecat-avoid-bundled-libraries.patch: Adapt to apply cleanly to IceCat 60. * gnu/packages/gnuzilla.scm (mozilla-patch): Update to fetch from mozilla-esr60. (icecat): Add selected changesets from upstream mozilla-esr60. --- gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 8 +- gnu/packages/patches/icecat-CVE-2018-12383.patch | 103 +++++++++++++++++++++ .../patches/icecat-avoid-bundled-libraries.patch | 20 ++-- 4 files changed, 119 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/icecat-CVE-2018-12383.patch diff --git a/gnu/local.mk b/gnu/local.mk index daf96ea4b6..fe2b573dd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -810,6 +810,7 @@ dist_patch_DATA = \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ + %D%/packages/patches/icecat-CVE-2018-12383.patch \ %D%/packages/patches/icecat-use-system-graphite2.patch \ %D%/packages/patches/icecat-use-system-harfbuzz.patch \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index db8f85cfb1..653cee93d5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -469,10 +469,10 @@ security standards.") (license license:mpl2.0))) (define (mozilla-patch file-name changeset hash) - "Return an origin for CHANGESET from the mozilla-esr52 repository." + "Return an origin for CHANGESET from the mozilla-esr60 repository." (origin (method url-fetch) - (uri (string-append "https://hg.mozilla.org/releases/mozilla-esr52/raw-rev/" + (uri (string-append "https://hg.mozilla.org/releases/mozilla-esr60/raw-rev/" changeset)) (sha256 (base32 hash)) (file-name file-name))) @@ -498,7 +498,9 @@ security standards.") (search-patch "icecat-avoid-bundled-libraries.patch") ;; FIXME (search-patch "icecat-use-system-harfbuzz.patch") ;; FIXME (search-patch "icecat-use-system-graphite2.patch") - )) + (mozilla-patch "icecat-CVE-2018-12385.patch" "80a4a7ef2813" "1vgcbimpnfjqj934v0cryq1g13xac3wfmd4jyhcb5s60x8xyssf5") + (search-patch "icecat-CVE-2018-12383.patch") + (mozilla-patch "icecat-bug-1489744.patch" "6546ee839d30" "11mhvj77r789b428bfxqq5wdx8yr7lbrdjzr8qjj6fw197pldn51"))) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/icecat-CVE-2018-12383.patch b/gnu/packages/patches/icecat-CVE-2018-12383.patch new file mode 100644 index 0000000000..17ca0f3773 --- /dev/null +++ b/gnu/packages/patches/icecat-CVE-2018-12383.patch @@ -0,0 +1,103 @@ +Based on upstream changeset: + https://hg.mozilla.org/releases/mozilla-esr60/rev/300efdbc9fe1 +but with the git binary patch and related test changes omitted, +and adapted to apply cleanly to GNU IceCat. + +# HG changeset patch +# User David Keeler +# Date 1531860660 25200 +# Node ID 300efdbc9fe1f9165428c7934861033935b5abfa +# Parent 80a4a7ef281374dbb2afda8edac54665b14b9ef8 +Bug 1475775 - Clean up old NSS DB file after upgrade if necessary. r=franziskus, r=mattn, a=RyanVM + +Reviewers: franziskus, mattn + +Bug #: 1475775 + +Differential Revision: https://phabricator.services.mozilla.com/D2202 + +diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp +--- a/security/manager/ssl/nsNSSComponent.cpp ++++ b/security/manager/ssl/nsNSSComponent.cpp +@@ -1935,16 +1935,61 @@ AttemptToRenameBothPKCS11ModuleDBVersion + NS_NAMED_LITERAL_CSTRING(sqlModuleDBFilename, "pkcs11.txt"); + nsresult rv = AttemptToRenamePKCS11ModuleDB(profilePath, + legacyModuleDBFilename); + if (NS_FAILED(rv)) { + return rv; + } + return AttemptToRenamePKCS11ModuleDB(profilePath, sqlModuleDBFilename); + } ++ ++// When we changed from the old dbm database format to the newer sqlite ++// implementation, the upgrade process left behind the existing files. Suppose a ++// user had not set a password for the old key3.db (which is about 99% of ++// users). After upgrading, both the old database and the new database are ++// unprotected. If the user then sets a password for the new database, the old ++// one will not be protected. In this scenario, we should probably just remove ++// the old database (it would only be relevant if the user downgraded to a ++// version of IceCat before 58, but we have to trade this off against the ++// user's old private keys being unexpectedly unprotected after setting a ++// password). ++// This was never an issue on Android because we always used the new ++// implementation. ++static void ++MaybeCleanUpOldNSSFiles(const nsACString& profilePath) ++{ ++ UniquePK11SlotInfo slot(PK11_GetInternalKeySlot()); ++ if (!slot) { ++ return; ++ } ++ // Unfortunately we can't now tell the difference between "there already was a ++ // password when the upgrade happened" and "there was not a password but then ++ // the user added one after upgrading". ++ bool hasPassword = PK11_NeedLogin(slot.get()) && ++ !PK11_NeedUserInit(slot.get()); ++ if (!hasPassword) { ++ return; ++ } ++ nsCOMPtr dbFile = do_CreateInstance("@mozilla.org/file/local;1"); ++ if (!dbFile) { ++ return; ++ } ++ nsresult rv = dbFile->InitWithNativePath(profilePath); ++ if (NS_FAILED(rv)) { ++ return; ++ } ++ NS_NAMED_LITERAL_CSTRING(keyDBFilename, "key3.db"); ++ rv = dbFile->AppendNative(keyDBFilename); ++ if (NS_FAILED(rv)) { ++ return; ++ } ++ // Since this isn't a directory, the `recursive` argument to `Remove` is ++ // irrelevant. ++ Unused << dbFile->Remove(false); ++} + #endif // ifndef ANDROID + + // Given a profile directory, attempt to initialize NSS. If nocertdb is true, + // (or if we don't have a profile directory) simply initialize NSS in no DB mode + // and return. Otherwise, first attempt to initialize in read/write mode, and + // then read-only mode if that fails. If both attempts fail, we may be failing + // to initialize an NSS DB collection that has FIPS mode enabled. Attempt to + // ascertain if this is the case, and if so, rename the offending PKCS#11 module +@@ -1966,16 +2011,19 @@ InitializeNSSWithFallbacks(const nsACStr + + // Try read/write mode. If we're in safeMode, we won't load PKCS#11 modules. + #ifndef ANDROID + PRErrorCode savedPRErrorCode1; + #endif // ifndef ANDROID + SECStatus srv = ::mozilla::psm::InitializeNSS(profilePath, false, !safeMode); + if (srv == SECSuccess) { + MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("initialized NSS in r/w mode")); ++#ifndef ANDROID ++ MaybeCleanUpOldNSSFiles(profilePath); ++#endif // ifndef ANDROID + return NS_OK; + } + #ifndef ANDROID + savedPRErrorCode1 = PR_GetError(); + PRErrorCode savedPRErrorCode2; + #endif // ifndef ANDROID + // That failed. Try read-only mode. + srv = ::mozilla::psm::InitializeNSS(profilePath, true, !safeMode); diff --git a/gnu/packages/patches/icecat-avoid-bundled-libraries.patch b/gnu/packages/patches/icecat-avoid-bundled-libraries.patch index 114631517a..b5e9fb887e 100644 --- a/gnu/packages/patches/icecat-avoid-bundled-libraries.patch +++ b/gnu/packages/patches/icecat-avoid-bundled-libraries.patch @@ -1,8 +1,8 @@ Fixes needed when avoiding bundled libraries. ---- icecat-52.0.2/xpcom/build/moz.build.orig -+++ icecat-52.0.2/xpcom/build/moz.build -@@ -93,10 +93,5 @@ +--- icecat-60.2.0/xpcom/build/moz.build.orig 2018-09-13 17:46:49.000000000 -0400 ++++ icecat-60.2.0/xpcom/build/moz.build 2018-09-22 04:26:50.659564554 -0400 +@@ -99,10 +99,5 @@ '/docshell/base', ] @@ -13,9 +13,9 @@ Fixes needed when avoiding bundled libraries. - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': CXXFLAGS += CONFIG['TK_CFLAGS'] ---- icecat-52.0.2/storage/moz.build.orig -+++ icecat-52.0.2/storage/moz.build -@@ -114,7 +114,6 @@ +--- icecat-60.2.0/storage/moz.build.orig 2018-09-13 17:51:11.000000000 -0400 ++++ icecat-60.2.0/storage/moz.build 2018-09-22 04:26:50.659564554 -0400 +@@ -117,7 +117,6 @@ DEFINES['MOZ_MEMORY_TEMP_STORE_PRAGMA'] = True LOCAL_INCLUDES += [ @@ -23,13 +23,13 @@ Fixes needed when avoiding bundled libraries. '/dom/base', ] ---- icecat-52.0.2/dom/indexedDB/moz.build.orig -+++ icecat-52.0.2/dom/indexedDB/moz.build -@@ -101,7 +101,6 @@ +--- icecat-60.2.0/dom/indexedDB/moz.build.orig 2018-09-13 17:49:42.000000000 -0400 ++++ icecat-60.2.0/dom/indexedDB/moz.build 2018-09-22 04:26:50.663564574 -0400 +@@ -102,7 +102,6 @@ CXXFLAGS += ['-Wno-error=shadow'] LOCAL_INCLUDES += [ - '/db/sqlite3/src', '/dom/base', '/dom/storage', - '/dom/workers', + '/ipc/glue', -- cgit v1.2.3 From 21280a8cd805ace5f95cd2580b8a6ca1e25050d7 Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Tue, 18 Sep 2018 21:52:58 -0500 Subject: gnu: Add Go 1.11. * gnu/packages/golang.scm (go-1.11): New variable. Signed-off-by: Leo Famulari --- gnu/packages/golang.scm | 119 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index fd4c362d36..bba03e77f2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Pierre Neidhardt +;;; Copyright @ 2018 Katherine Cox-Buday ;;; ;;; This file is part of GNU Guix. ;;; @@ -499,6 +500,124 @@ in the style of communicating sequential processes (@dfn{CSP}).") (setenv "HOME" "/tmp") #t))))))))) +(define-public go-1.11 + (package + (inherit go-1.10) + (name "go") + (version "1.11") + (source + (origin + (method url-fetch) + (uri (string-append "https://storage.googleapis.com/golang/" + name version ".src.tar.gz")) + (sha256 + (base32 + "1ysj04jzds6xa8kdflkdsgyv3mg9fdn90zdf78g4g6p4bwpy3hdg")))) + (arguments + (substitute-keyword-arguments (package-arguments go-1.10) + ((#:phases phases) + `(modify-phases ,phases + (replace 'prebuild + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) + (ld (string-append (assoc-ref inputs "libc") "/lib")) + (loader (car (find-files ld "^ld-linux.+"))) + (net-base (assoc-ref inputs "net-base")) + (tzdata-path + (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) + (output (assoc-ref outputs "out"))) + + (for-each delete-file + ;; Removing net/ tests, which fail when attempting to access + ;; network resources not present in the build container. + '("net/listen_test.go" + "net/parse_test.go" + "net/cgo_unix_test.go" + ;; A side affect of these test scripts is testing + ;; cgo. Attempts at using cgo flags and + ;; directives with these scripts as specified + ;; here (https://golang.org/cmd/cgo/) have not + ;; worked. The tests continue to state that they + ;; can not find crt1.o despite being present. + "cmd/go/testdata/script/list_compiled_imports.txt" + "cmd/go/testdata/script/mod_case_cgo.txt" + ;; https://github.com/golang/go/issues/24884 + "os/user/user_test.go")) + + (substitute* "os/os_test.go" + (("/usr/bin") (getcwd)) + (("/bin/pwd") (which "pwd")) + (("/bin/sh") (which "sh"))) + + (substitute* "cmd/vendor/golang.org/x/sys/unix/syscall_unix_test.go" + (("/usr/bin") "/tmp")) + + ;; Add libgcc to runpath + (substitute* "cmd/link/internal/ld/lib.go" + (("!rpath.set") "true")) + (substitute* "cmd/go/internal/work/gccgo.go" + (("cgoldflags := \\[\\]string\\{\\}") + (string-append "cgoldflags := []string{" + "\"-rpath=" gcclib "\"" + "}")) + (("\"-lgcc_s\", ") + (string-append + "\"-Wl,-rpath=" gcclib "\", \"-lgcc_s\", "))) + (substitute* "cmd/go/internal/work/gc.go" + (("ldflags = setextld\\(ldflags, compiler\\)") + (string-append + "ldflags = setextld(ldflags, compiler)\n" + "ldflags = append(ldflags, \"-r\")\n" + "ldflags = append(ldflags, \"" gcclib "\")\n"))) + + ;; Disable failing tests: these tests attempt to access + ;; commands or network resources which are neither available + ;; nor necessary for the build to succeed. + (for-each + (match-lambda + ((file regex) + (substitute* file + ((regex all before test_name) + (string-append before "Disabled" test_name))))) + '(("net/net_test.go" "(.+)(TestShutdownUnix.+)") + ("net/dial_test.go" "(.+)(TestDialTimeout.+)") + ("os/os_test.go" "(.+)(TestHostname.+)") + ("time/format_test.go" "(.+)(TestParseInSydney.+)") + ("time/format_test.go" "(.+)(TestParseInLocation.+)") + ("os/exec/exec_test.go" "(.+)(TestEcho.+)") + ("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)") + ("os/exec/exec_test.go" "(.+)(TestCatStdin.+)") + ("os/exec/exec_test.go" "(.+)(TestCatGoodAndBadFile.+)") + ("os/exec/exec_test.go" "(.+)(TestExitStatus.+)") + ("os/exec/exec_test.go" "(.+)(TestPipes.+)") + ("os/exec/exec_test.go" "(.+)(TestStdinClose.+)") + ("os/exec/exec_test.go" "(.+)(TestIgnorePipeErrorOnSuccess.+)") + ("syscall/syscall_unix_test.go" "(.+)(TestPassFD\\(.+)") + ("os/exec/exec_test.go" "(.+)(TestExtraFiles/areturn.+)") + ("cmd/go/go_test.go" "(.+)(TestCoverageWithCgo.+)") + ("cmd/go/go_test.go" "(.+)(TestTwoPkgConfigs.+)") + ("os/exec/exec_test.go" "(.+)(TestOutputStderrCapture.+)") + ("os/exec/exec_test.go" "(.+)(TestExtraFiles.+)") + ("os/exec/exec_test.go" "(.+)(TestExtraFilesRace.+)") + ("net/lookup_test.go" "(.+)(TestLookupPort.+)") + ("syscall/exec_linux_test.go" + "(.+)(TestCloneNEWUSERAndRemapNoRootDisableSetgroups.+)"))) + + ;; fix shebang for testar script + ;; note the target script is generated at build time. + (substitute* "../misc/cgo/testcarchive/carchive_test.go" + (("#!/usr/bin/env") (string-append "#!" (which "env")))) + + (substitute* "net/lookup_unix.go" + (("/etc/protocols") (string-append net-base "/etc/protocols"))) + (substitute* "net/port_unix.go" + (("/etc/services") (string-append net-base "/etc/services"))) + (substitute* "time/zoneinfo_unix.go" + (("/usr/share/zoneinfo/") tzdata-path)) + (substitute* (find-files "cmd" "\\.go") + (("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader)) + #t))))))))) + (define-public go go-1.9) (define-public go-github-com-alsm-ioprogress -- cgit v1.2.3 From 844cc6f876b8dcadf210398e68b3f3f824cb7144 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 22 Sep 2018 19:17:29 -0400 Subject: gnu: webkitgtk: Add version 2.22.2. * gnu/packages/webkit.scm (webkitgtk-2.22): New variable. --- gnu/packages/webkit.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index b671e44d18..976411dbbc 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -24,6 +24,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (gnu packages) @@ -32,6 +33,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages enchant) #:use-module (gnu packages flex) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -149,3 +151,34 @@ HTML/CSS applications to full-fledged web browsers.") license:lgpl2.1+ license:bsd-2 license:bsd-3)))) + +;; This version of webkitgtk needs to be kept separate, because it requires a +;; newer version of GCC than our default compiler, and this causes problems +;; when linked with C++ libraries built using our default compiler. For now, +;; we use this newer webkitgtk only for selected packages, e.g. epiphany. +(define-public webkitgtk-2.22 + (package/inherit webkitgtk + (name "webkitgtk") + (version "2.22.2") + (source (origin + (method url-fetch) + (uri (string-append "https://www.webkitgtk.org/releases/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1flrbr8pzbrlwv09b4pmgh6vklw7jghd2lgrhcb72vl9s7a8fm1l")))) + (native-inputs + `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer + ,@(package-native-inputs webkitgtk))) + (arguments + (substitute-keyword-arguments (package-arguments webkitgtk) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'add-gst-plugins-base-include-path + 'work-around-gcc-7-include-path-issue + ;; FIXME: Work around a problem with gcc-7 includes (see + ;; ). + (lambda _ + (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPLUS_INCLUDE_PATH") + #t)))))))) -- cgit v1.2.3 From 480d39a600701621e4d5938c8753b8487baa2c7f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 22 Sep 2018 19:21:16 -0400 Subject: gnu: epiphany: Use webkitgtk-2.22. * gnu/packages/gnome.scm (epiphany)[native-inputs]: Add gcc-7. [inputs]: Replace webkitgtk with webkitgtk-2.22. --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 65716ce413..f9c9f1cf5c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4187,6 +4187,7 @@ a secret password store, an adblocker, and a modern UI.") `(("dconf" ,dconf))) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database + ("gcc" ,gcc-7) ; needed because webkitgtk-2.22 is compiled with gcc-7 ("glib:bin" ,glib "bin") ; for glib-mkenums ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("intltool" ,intltool) @@ -4207,7 +4208,7 @@ a secret password store, an adblocker, and a modern UI.") ("libxslt" ,libxslt) ("nettle" ,nettle) ; for hogweed ("sqlite" ,sqlite) - ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-2.22))) (home-page "https://wiki.gnome.org/Apps/Web") (synopsis "GNOME web browser") (description -- cgit v1.2.3 From 84b334362ebb7fb2e8bc0ec4df1d8b28aabe2413 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 22 Sep 2018 19:25:36 -0400 Subject: gnu: eolie: Use webkitgtk-2.22. * gnu/packages/gnome.scm (eolie)[native-inputs]: Add gcc-7:lib. [inputs]: Replace webkitgtk with webkitgtk-2.22. [arguments]: Add "gcc:lib" to the list of libraries to add to LD_LIBRARY_PATH. Use invoke. --- gnu/packages/gnome.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f9c9f1cf5c..9f5ede8b07 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4104,19 +4104,20 @@ work and the interface is well tested.") (delete 'configure) (replace 'build (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "meson" "build" - "--prefix" (assoc-ref outputs "out"))))) + (invoke "meson" "build" + "--prefix" (assoc-ref outputs "out")))) (replace 'check - (lambda _ (zero? (system* "ninja" "-C" "build" "test")))) + (lambda _ (invoke "ninja" "-C" "build" "test"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* "ninja" "-C" "build" "install")))) + (invoke "ninja" "-C" "build" "install"))) (add-after 'wrap 'wrap-more (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) ;; These libraries must be on LD_LIBRARY_PATH. (libs '("gtkspell3" "webkitgtk" "libsoup" "libsecret" "atk" "gtk+" "gsettings-desktop-schemas" + "gcc:lib" ; needed b/c webkitgtk is built with gcc-7 "gobject-introspection")) (path (string-join (map (lambda (lib) @@ -4129,7 +4130,8 @@ work and the interface is well tested.") `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))) #t))))) (native-inputs - `(("intltool" ,intltool) + `(("gcc:lib" ,gcc-7 "lib") ; needed because webkitgtk is built with gcc-7 + ("intltool" ,intltool) ("itstool" ,itstool) ("pkg-config" ,pkg-config) ("meson" ,meson-for-build) @@ -4149,7 +4151,7 @@ work and the interface is well tested.") ("libsecret" ,libsecret) ("gtkspell3" ,gtkspell3) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-2.22))) (home-page "https://wiki.gnome.org/Apps/Eolie") (synopsis "Web browser for GNOME") (description -- cgit v1.2.3 From 94676ded5f2a68b07b94d83d2cfb768038c9c6c1 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Sun, 23 Sep 2018 13:13:50 +0200 Subject: gnu: xpra: Update to 2.3.4. * gnu/packages/xorg.scm (xpra): Update to 2.3.4. --- 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 90f4bf4f59..7c80e70dac 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5936,7 +5936,7 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "2.3.3") + (version "2.3.4") (source (origin (method url-fetch) @@ -5944,7 +5944,7 @@ basic eye-candy effects.") version ".tar.xz")) (sha256 (base32 - "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01")))) + "0wa3kx54himy3i1b2801hlzfilh3cf4kjk40k1cjl0ds28m5hija")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg) ("flac" ,flac) -- cgit v1.2.3 From e10bf49668472dcfc17ad10a2b5704fce838570d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 23 Sep 2018 17:19:56 +0200 Subject: gnu: Add emacs-synosaurus. * gnu/packages/emacs.scm (emacs-synosaurus): New variable. --- gnu/packages/emacs.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 28d97f82c1..cff1898d72 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -118,6 +118,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages video) #:use-module (gnu packages haskell) + #:use-module (gnu packages wordnet) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -12197,3 +12198,41 @@ wrapper around all Imagemagick commands with descriptions, autocompletion (for some commands) and hints displayed in prompt using @command{eimp.el} to execute its commands and resize images.") (license license:gpl3+)))) + +(define-public emacs-synosaurus + (let ((commit "8bf95b935976ec0a1964cf175ed57cc5f6f93bdb")) + (package + (name "emacs-synosaurus") + (version (git-version "0.1.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hpdeifel/synosaurus") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15by9jccab6kyplxa6k0glzaivxkqdigl33gl2qi2cvy6f2q7gva")))) + (build-system emacs-build-system) + (propagated-inputs + `(("wordnet" ,wordnet))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((wn (assoc-ref inputs "wordnet"))) + ;; .el is read-only in git. + (chmod "synosaurus-wordnet.el" #o644) + ;; Specify the absolute file names of the various + ;; programs so that everything works out-of-the-box. + (emacs-substitute-variables + "synosaurus-wordnet.el" + ("wordnet-command" + (string-append wn "/bin/wn"))))))))) + (home-page "https://github.com/hpdeifel/synosaurus") + (synopsis "Extensible thesaurus mode for Emacs") + (description "Synosaurus is a thesaurus fontend for Emacs with pluggable +backends, including the @command{wordnet} offline backend.") + (license license:gpl3+)))) -- cgit v1.2.3 From 88600acc939365b4ffd45a8be74117a8cf8dc3dd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 23 Sep 2018 22:10:50 +0200 Subject: system: Mention '--skip-checks' in initrd diagnostics. * gnu/system/mapped-devices.scm (check-device-initrd-modules): Add note about '--skip-checks'. --- gnu/system/mapped-devices.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm index af73dc608c..a874666463 100644 --- a/gnu/system/mapped-devices.scm +++ b/gnu/system/mapped-devices.scm @@ -157,7 +157,10 @@ these lines: ;; @dots{} (initrd-modules (append (list~{ ~s~}) %base-initrd-modules))) -@end example\n") +@end example + +If you think this diagnostic is inaccurate, use the @option{--skip-checks} +option of @command{guix system}.\n") missing))) (&error-location (location (source-properties->location location))))))))) -- cgit v1.2.3 From c122a2e509df98c4391750a066fecba37465eab3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 23 Sep 2018 22:11:35 +0200 Subject: serialization: Remove redundancy in 'write-file'. * guix/serialization.scm (write-file): Remove redundant 'member' call. --- guix/serialization.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guix/serialization.scm b/guix/serialization.scm index 129374f541..87ad7eeec0 100644 --- a/guix/serialization.scm +++ b/guix/serialization.scm @@ -301,8 +301,7 @@ result of 'lstat'; exclude entries for which SELECT? does not return true." (filter-map (lambda (base) (let ((file (string-append directory "/" base))) - (and (not (member base '("." ".."))) - (select? file (lstat file)) + (and (select? file (lstat file)) base))) basenames)) -- cgit v1.2.3 From a387b0bebb151a766ca6a454a891f2370c96703c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 23 Sep 2018 22:24:07 +0200 Subject: store-copy: Display a progress bar when copying store items. * guix/build/store-copy.scm (populate-store): Add #:log-port parameter. Use 'progress-reporter/bar' to report progress. --- guix/build/store-copy.scm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/guix/build/store-copy.scm b/guix/build/store-copy.scm index 2d9590d16f..64ade7885c 100644 --- a/guix/build/store-copy.scm +++ b/guix/build/store-copy.scm @@ -19,6 +19,7 @@ (define-module (guix build store-copy) #:use-module (guix build utils) #:use-module (guix sets) + #:use-module (guix progress) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-26) @@ -167,7 +168,8 @@ REFERENCE-GRAPHS, a list of reference-graph files." (reduce + 0 (map file-size items))) -(define* (populate-store reference-graphs target) +(define* (populate-store reference-graphs target + #:key (log-port (current-error-port))) "Populate the store under directory TARGET with the items specified in REFERENCE-GRAPHS, a list of reference-graph files." (define store @@ -183,9 +185,20 @@ REFERENCE-GRAPHS, a list of reference-graph files." (mkdir-p store) (chmod store #o1775) - (for-each (lambda (thing) - (copy-recursively thing - (string-append target thing))) - (things-to-copy))) + + (let* ((things (things-to-copy)) + (len (length things)) + (progress (progress-reporter/bar len + (format #f "copying ~a store items" + len) + log-port))) + (call-with-progress-reporter progress + (lambda (report) + (for-each (lambda (thing) + (copy-recursively thing + (string-append target thing) + #:log (%make-void-port "w")) + (report)) + things))))) ;;; store-copy.scm ends here -- cgit v1.2.3 From f0addd6461658d13eadf5f6e3bdb89aa02a6e902 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 23 Sep 2018 22:51:51 +0200 Subject: database: 'register-items' shows a progress bar. * guix/store/database.scm (register-items): Add #:log-port. Use 'progress-reporter/bar' to show a progress report. (register-path): Pass #:log-port to 'register-items'. --- guix/store/database.scm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/guix/store/database.scm b/guix/store/database.scm index 0879a95d0b..5d094faaf3 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -23,6 +23,7 @@ #:use-module (guix serialization) #:use-module (guix store deduplication) #:use-module (guix base16) + #:use-module (guix progress) #:use-module (guix build syscalls) #:use-module ((guix build utils) #:select (mkdir-p executable-file?)) @@ -234,7 +235,8 @@ be used internally by the daemon's build hook." #:prefix prefix #:state-directory state-directory #:deduplicate? deduplicate? #:reset-timestamps? reset-timestamps? - #:schema schema)) + #:schema schema + #:log-port (%make-void-port "w"))) (define %epoch ;; When it all began. @@ -245,12 +247,14 @@ be used internally by the daemon's build hook." (deduplicate? #t) (reset-timestamps? #t) registration-time - (schema (sql-schema))) + (schema (sql-schema)) + (log-port (current-error-port))) "Register all of ITEMS, a list of records as returned by 'read-reference-graph', in the database under PREFIX/STATE-DIRECTORY. ITEMS must be in topological order (with leaves first.) If the database is initially empty, apply SCHEMA to initialize it. REGISTRATION-TIME must be the -registration time to be recorded in the database; #f means \"now\"." +registration time to be recorded in the database; #f means \"now\". +Write a progress report to LOG-PORT." ;; Priority for options: first what is given, then environment variables, ;; then defaults. %state-directory, %store-directory, and @@ -302,4 +306,12 @@ registration time to be recorded in the database; #f means \"now\"." (mkdir-p db-dir) (parameterize ((sql-schema schema)) (with-database (string-append db-dir "/db.sqlite") db - (for-each (cut register db <>) items)))) + (let* ((prefix (format #f "registering ~a items" (length items))) + (progress (progress-reporter/bar (length items) + prefix log-port))) + (call-with-progress-reporter progress + (lambda (report) + (for-each (lambda (item) + (register db item) + (report)) + items))))))) -- cgit v1.2.3 From bb3b6ccb05550fbfbeb459c68819a752327d6e1e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 23 Sep 2018 23:11:30 +0200 Subject: database: Register each store item only once. Fixes . Reported by Leo Famulari. * guix/store/database.scm (register-items): Check whether TO-REGISTER is in DB by calling 'path-id', and skip the reset-timestamps, registration, and deduplication phases when it is. --- guix/store/database.scm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/guix/store/database.scm b/guix/store/database.scm index 5d094faaf3..341276bc30 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -290,18 +290,22 @@ Write a progress report to LOG-PORT." (define real-file-name (string-append store-dir "/" (basename (store-info-item item)))) - (let-values (((hash nar-size) (nar-sha256 real-file-name))) + ;; When TO-REGISTER is already registered, skip it. This makes a + ;; significant differences when 'register-closures' is called + ;; consecutively for overlapping closures such as 'system' and 'bootcfg'. + (unless (path-id db to-register) (when reset-timestamps? (reset-timestamps real-file-name)) - (sqlite-register db #:path to-register - #:references (store-info-references item) - #:deriver (store-info-deriver item) - #:hash (string-append "sha256:" - (bytevector->base16-string hash)) - #:nar-size nar-size - #:time registration-time) - (when deduplicate? - (deduplicate real-file-name hash #:store store-dir)))) + (let-values (((hash nar-size) (nar-sha256 real-file-name))) + (sqlite-register db #:path to-register + #:references (store-info-references item) + #:deriver (store-info-deriver item) + #:hash (string-append "sha256:" + (bytevector->base16-string hash)) + #:nar-size nar-size + #:time registration-time) + (when deduplicate? + (deduplicate real-file-name hash #:store store-dir))))) (mkdir-p db-dir) (parameterize ((sql-schema schema)) -- cgit v1.2.3 From b5460d95e970608bee7a794590be1b051b57d3a3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 23 Sep 2018 23:29:31 +0200 Subject: vm: Disable deduplication for 'guix system vm-image'. * gnu/system/vm.scm (qemu-image): Pass #:deduplicate? #f to 'root-partition-initializer'. --- gnu/system/vm.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 91e117b9f3..435501d726 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -390,7 +390,12 @@ the image." #:closures graphs #:copy-closures? #$copy-inputs? #:register-closures? #$register-closures? - #:system-directory #$os-drv)) + #:system-directory #$os-drv + + ;; Disable deduplication to speed things up, + ;; and because it doesn't help much for a + ;; single system generation. + #:deduplicate? #f)) (root-size #$(if (eq? 'guess disk-image-size) #~(max ;; Minimum 20 MiB root size -- cgit v1.2.3 From fce225471128c4a5246342b3aa1b7e53a8066211 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 23 Sep 2018 23:31:52 +0200 Subject: vm: Use "cache=loose" for all 9p mounts. This significantly improves read throughput when running things like "guix hash -r ...". * gnu/system/vm.scm (%linux-vm-file-systems): Add 'flags' for "store". Add "cache=loose" to every file system. --- gnu/system/vm.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 435501d726..a1b595d45d 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -99,21 +99,28 @@ (device "store") (type "9p") (needed-for-boot? #t) - (options "trans=virtio") + (flags '(read-only)) + (options "trans=virtio,cache=loose") (check? #f)) + + ;; The 9p documentation says that cache=loose is "intended for + ;; exclusive, read-only mounts", without additional details. In + ;; practice it seems to work well for these, and it's much faster than + ;; the default cache=none, especially when copying and registering + ;; store items. (file-system (mount-point "/xchg") (device "xchg") (type "9p") (needed-for-boot? #t) - (options "trans=virtio") + (options "trans=virtio,cache=loose") (check? #f)) (file-system (mount-point "/tmp") (device "tmp") (type "9p") (needed-for-boot? #t) - (options "trans=virtio") + (options "trans=virtio,cache=loose") (check? #f)))) (define not-config? -- cgit v1.2.3 From 8fa361ce63235335e266cb5ff21bf9da73f4d8dd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 00:23:19 +0200 Subject: gnu: fping: Update to 4.1. * gnu/packages/networking.scm (fping): Update to 4.1. --- 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 abc616de3c..d1765cc46f 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -651,7 +651,7 @@ network frames.") (define-public fping (package (name "fping") - (version "4.0") + (version "4.1") (source (origin (method url-fetch) @@ -659,7 +659,7 @@ network frames.") version ".tar.gz")) (sha256 (base32 - "1kp81wchi79l8z8rrj602fpjrd8bi84y3i7fsaclzlwap5943sv7")))) + "0wxbvm480vij8dy4v1pi8f0c7010rx6bidg3qhsvkdf2ijhy4cr7")))) (build-system gnu-build-system) (home-page "http://fping.org/") (synopsis "Send ICMP ECHO_REQUEST packets to network hosts") -- cgit v1.2.3 From 25706b8fc9aa36085ecec085f08d5ad1808d4a96 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 00:23:58 +0200 Subject: gnu: fping: Use HTTPS home page. * gnu/packages/networking.scm (fping)[home-page]: Use HTTPS. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index d1765cc46f..84224374c6 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -661,7 +661,7 @@ network frames.") (base32 "0wxbvm480vij8dy4v1pi8f0c7010rx6bidg3qhsvkdf2ijhy4cr7")))) (build-system gnu-build-system) - (home-page "http://fping.org/") + (home-page "https://fping.org/") (synopsis "Send ICMP ECHO_REQUEST packets to network hosts") (description "fping is a ping like program which uses the Internet Control Message -- cgit v1.2.3 From 0604d3cfceea13fad33c6188fa54f5fd16c74406 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 00:29:46 +0200 Subject: gnu: nano: Update to 3.1. * gnu/packages/nano.scm (nano): Update to 3.1. --- gnu/packages/nano.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 9396588fc8..8f96b605a6 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -30,7 +30,7 @@ (define-public nano (package (name "nano") - (version "3.0") + (version "3.1") (source (origin (method url-fetch) @@ -38,7 +38,7 @@ version ".tar.xz")) (sha256 (base32 - "1868hg9s584fwjrh0fzdrixmxc2qhw520z4q5iv68kjiajivr9g0")))) + "17kinzyv6vwgyx2d0ym1kp65qbf7kxzwpyg21ic1rijv1aj2rh0l")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 899e1974a6f4a4ff041c035ff3494bd10a8069ac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 21:31:52 +0200 Subject: gnu: python-gitdb: Update to 2.0.4. * gnu/packages/version-control.scm (python-gitdb): Update to 2.0.4. [arguments]: Replace AND with equivalent but more 'accurate' BEGIN. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 58c870df5a..204ec403f6 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -712,13 +712,13 @@ default) of the repository.") (define-public python-gitdb (package (name "python-gitdb") - (version "2.0.3") + (version "2.0.4") (source (origin (method url-fetch) (uri (pypi-uri "gitdb2" version)) (sha256 (base32 - "02azg62mr99b7cllyjrly77np3vw32y8nrxpa2xjapiyaga2j3mn")))) + "0i608q9c47rdsmyac1cn6s0hzwwj7cb957y8fc9wacc5lnw8ak5v")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -733,7 +733,7 @@ default) of the repository.") "file" (number->string filecount)) (lambda (port) (format port "~a" filecount)))) - (and + (begin (invoke "git" "init") (invoke "git" "config" "user.name" "Total Git") (invoke "git" "config" "user.email" "git@localhost") -- cgit v1.2.3 From 2f7ad2a788fa190dbe97038020322ce1c772feec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 21 Sep 2018 20:24:51 +0200 Subject: gnu: workrave: Use Guix's built-in bootstrap phase. * gnu/packages/gnome.scm (workrave)[arguments]: Remove 'autoconf' phase. --- gnu/packages/gnome.scm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9f5ede8b07..ac898fb294 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7244,13 +7244,6 @@ mp3, Ogg Vorbis and FLAC") (base32 "150qca8c552fakjlzkgarsxgp87l1xcwn19svqsa9d0cygqxjgia")))) (build-system glib-or-gtk-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - (invoke "sh" "autogen.sh") - #t))))) (propagated-inputs `(("glib" ,glib) ("gtk+" ,gtk+) ("gdk-pixbuf" ,gdk-pixbuf) -- cgit v1.2.3 From 2c36baa56ffeaf451f42e5f5ff3b60705e17a30b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Sep 2018 14:58:06 +0200 Subject: gnu: parallel: Update to 20180922. * gnu/packages/parallel.scm (parallel): Update to 20180922. --- gnu/packages/parallel.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index ec1fae6470..3dba2b8c00 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -48,7 +48,7 @@ (define-public parallel (package (name "parallel") - (version "20180822") + (version "20180922") (source (origin (method url-fetch) @@ -56,7 +56,7 @@ version ".tar.bz2")) (sha256 (base32 - "0jjs7fpvdjjb5v0j39a6k7hq9h5ap3db1j7vg1r2dq4swk23h9bm")))) + "07q7lzway2qf8mx6fb4q45jmirsc8pw6rgv03ifrp32jw3q8w1za")))) (build-system gnu-build-system) (arguments `(#:phases @@ -66,7 +66,7 @@ (for-each (lambda (file) (substitute* file - ;; Patch hard coded '/bin/sh' in the lin ending in: + ;; Patch hard coded '/bin/sh' in the line ending in: ;; $Global::shell = $ENV{'PARALLEL_SHELL'} || ;; parent_shell($$) || $ENV{'SHELL'} || "/bin/sh"; (("/bin/sh\\\";\n$") (string-append (which "sh") "\";\n")))) -- cgit v1.2.3 From c30fd002c8fe568d7a22ec2939825e68c88f8e31 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Sep 2018 15:06:12 +0200 Subject: gnu: virtualgl: Update to 2.6. * gnu/packages/gl.scm (virtualgl): Update to 2.6. [inputs]: Add libxtst. --- gnu/packages/gl.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 28e283640d..b88fab4929 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -725,7 +725,7 @@ mixed vector/bitmap output.") (define-public virtualgl (package (name "virtualgl") - (version "2.5.2") + (version "2.6") (source (origin (method url-fetch) @@ -734,16 +734,17 @@ mixed vector/bitmap output.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0rnid3hwrry9d5d4m7sygq00xxx976rgk00a3557m9r5kxbmy476")))) + "1ck1d0w19cgyqvrb9mdlj6l5db90xf18yln71kdninlqxvpgj6h7")))) (arguments - `(#:tests? #f ;; no tests are available + `(#:tests? #f ; no tests are available #:configure-flags (list - (string-append "-DCMAKE_INSTALL_LIBDIR=" - (assoc-ref %outputs "out") "/lib") - "-DVGL_USESSL=1"))) ;; use OpenSSL + (string-append "-DCMAKE_INSTALL_LIBDIR=" + (assoc-ref %outputs "out") "/lib") + "-DVGL_USESSL=1"))) ; use OpenSSL (build-system cmake-build-system) (inputs `(("glu" ,glu) ("libjpeg-turbo" ,libjpeg-turbo) + ("libxtst" ,libxtst) ("mesa" ,mesa) ("openssl" ,openssl))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From a42b68480b3e73b8486ce808f6451ca880860574 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Sep 2018 15:41:01 +0200 Subject: gnu: libiptcdata: Update to 1.0.5. * gnu/packages/image.scm (libiptcdata): Update to 1.0.5. [home-page]: Follow Debian's maintained upstream. --- gnu/packages/image.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index c3eb48ad0d..b367e0799c 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1368,16 +1368,18 @@ medical image data, e.g. magnetic resonance image (MRI) and functional MRI (define-public libiptcdata (package (name "libiptcdata") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" name "/" - version "/" name "-" version ".tar.gz")) + (uri (string-append "https://github.com/ianw/libiptcdata" + "/releases/download/release_" + (string-join (string-split version #\.) "_") + "/" name "-" version ".tar.gz")) (sha256 (base32 - "03pfvkmmx762iydq0q207x2028d275pbdysfsgpmrr0ywy63pxkr")))) + "17m2bscc76r1bymjgb44fbbfrdsjfqyb2ivg9wchyllm8pgx1560")))) (build-system gnu-build-system) - (home-page "http://libiptcdata.sourceforge.net/") + (home-page "https://github.com/ianw/libiptcdata") (synopsis "IPTC metadata manipulation library") (description "Libiptcdata is a C library for manipulating the International Press -- cgit v1.2.3 From 3715e79ec8a310a0a957105b57d58b178f2f9d1a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Sep 2018 20:10:13 +0200 Subject: gnu: python-marshmallow: Update to 3.0.0b14. * gnu/packages/python.scm (python-marshmallow): Update to 3.0.0b14. --- 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 26829f050e..30bde632fb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12179,14 +12179,14 @@ address is valid and really exists.") (define-public python-marshmallow (package (name "python-marshmallow") - (version "3.0.0b3") + (version "3.0.0b14") (source (origin (method url-fetch) (uri (pypi-uri "marshmallow" version)) (sha256 (base32 - "07mcrij1yvk85lvgx44wwr9pc80xryghvlgayb057g1cazcypysd")))) + "1digk3f5cfk7wmlka65mc7bzsd96pbsgcsvp6pimd5b4ff9zb5p3")))) (build-system python-build-system) (propagated-inputs `(("python-dateutil" ,python-dateutil) -- cgit v1.2.3 From 68cbec027e8e48f1047b7cb1bfdd9b0dd65937ac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Sep 2018 23:58:51 +0200 Subject: gnu: python-decorator: Update to 4.3.0. * gnu/packages/python.scm (python-decorator): Update to 4.3.0. [arguments]: Run the test suite. --- gnu/packages/python.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 30bde632fb..0bd8086473 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4340,15 +4340,14 @@ PNG, PostScript, PDF, and SVG file output.") (define-public python-decorator (package (name "python-decorator") - (version "4.2.1") + (version "4.3.0") (source (origin (method url-fetch) (uri (pypi-uri "decorator" version)) (sha256 - (base32 "03iaf116rm3w8b4agb8hzf6z9331mrvi4khfxq35zkx17sgxsikx")))) + (base32 "0308djallnh00v112y5b7nadl657ysmkp6vc8xn51d6yzc9zm7n3")))) (build-system python-build-system) - (arguments '(#:tests? #f)) ; no test target (home-page "https://pypi.python.org/pypi/decorator/") (synopsis "Python module to simplify usage of decorators") (description -- cgit v1.2.3 From dd29bd4ebcbfcdcb4c62e2c6c5cf4fd54c74af3b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 00:12:59 +0200 Subject: gnu: python-networkx: Update to 2.2. * gnu/packages/python.scm (python-networkx): Update to 2.2. --- gnu/packages/python.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0bd8086473..69d87c6e17 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5194,15 +5194,15 @@ interfaces in an easy and portable manner.") (define-public python-networkx (package (name "python-networkx") - (version "2.1") + (version "2.2") (source (origin (method url-fetch) (uri (pypi-uri "networkx" version ".zip")) (sha256 - (base32 "1ccb8mfz4m821k9y0cigkbq42q2sbb4dj5fbjshp0awp32j2q9v4")))) + (base32 "12swxb15299v9vqjsq4z8rgh5sdhvpx497xwnhpnb0gynrx6zra5")))) (build-system python-build-system) - ;; python-decorator is needed at runtime + ;; python-decorator is needed at runtime. (propagated-inputs `(("python-decorator" ,python-decorator))) (native-inputs -- cgit v1.2.3 From cd8aa06093f6491edc17b65608d1f528742f11a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 00:15:18 +0200 Subject: gnu: python-networkx: Use HTTPS home page. * gnu/packages/python.scm (python-networkx)[home-page]: Use HTTPS. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 69d87c6e17..ea641b8213 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5208,7 +5208,7 @@ interfaces in an easy and portable manner.") (native-inputs `(("python-nose" ,python-nose) ("unzip" ,unzip))) - (home-page "http://networkx.github.io/") + (home-page "https://networkx.github.io/") (synopsis "Python module for creating and manipulating graphs and networks") (description "NetworkX is a Python package for the creation, manipulation, and study -- cgit v1.2.3 From 5c8031ff7382ec9079040d08ae5a05b4dd2352b7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 17 Sep 2018 18:31:33 +0200 Subject: gnu: Prefix all Emacs packages with "emacs-". * gnu/packages/emacs.scm: Prefix all Emacs packages with "emacs-". This is to enforce consistency and so that `emacs-packages?' can reliably detect Emacs packages based on the "emacs-" prefix. --- gnu/packages/emacs.scm | 119 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 79 insertions(+), 40 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index cff1898d72..fbedd2f48d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -335,9 +335,9 @@ editor (without an X toolkit)" ) ;;; Emacs hacking. ;;; -(define-public geiser +(define-public emacs-geiser (package - (name "geiser") + (name "emacs-geiser") (version "0.10") (source (origin (method url-fetch) @@ -370,7 +370,10 @@ implementation, Emacs and, ultimately, the schemer, giving them access to live metadata.") (license license:bsd-3))) -(define-public paredit +(define-public geiser + (deprecated-package "geiser" emacs-geiser)) + +(define-public emacs-paredit (package (name "emacs-paredit") (version "24") @@ -395,6 +398,9 @@ for those who may want transient periods of unbalanced parentheses, such as when typing parentheses directly or commenting out code line by line.") (license license:gpl3+))) +(define-public paredit + (deprecated-package "paredit" emacs-paredit)) + (define-public git-modes (package (name "emacs-git-modes") @@ -444,9 +450,9 @@ For remote processes a substitute is provided, which communicates with Emacs on stdout instead of using a socket as the Emacsclient does.") (license license:gpl3+))) -(define-public magit +(define-public emacs-magit (package - (name "magit") + (name "emacs-magit") (version "2.13.0") (source (origin (method url-fetch) @@ -512,9 +518,12 @@ cherry picking, reverting, merging, rebasing, and other common Git operations.") (license license:gpl3+))) -(define-public magit-svn +(define-public magit + (deprecated-package "magit" emacs-magit)) + +(define-public emacs-magit-svn (package - (name "magit-svn") + (name "emacs-magit-svn") (version "2.2.0") (source (origin (method url-fetch) @@ -531,7 +540,7 @@ operations.") ("gzip" ,gzip))) (propagated-inputs `(("dash" ,emacs-dash) ("with-editor" ,emacs-with-editor) - ("magit" ,magit))) + ("magit" ,emacs-magit))) (arguments `(#:modules ((guix build utils) (guix build emacs-utils)) @@ -577,6 +586,9 @@ operations.") support for Git-SVN.") (license license:gpl3+))) +(define-public magit-svn + (deprecated-package "magit-svn" emacs-magit-svn)) + (define-public emacs-magit-popup (package (name "emacs-magit-popup") @@ -641,9 +653,9 @@ Gitlab APIs from Emacs packages. It abstracts access to API resources using only a handful of functions that are not resource-specific.") (license license:gpl3+))) -(define-public haskell-mode +(define-public emacs-haskell-mode (package - (name "haskell-mode") + (name "emacs-haskell-mode") (version "16.1") (source (origin (method url-fetch) @@ -731,7 +743,10 @@ only a handful of functions that are not resource-specific.") programs.") (license license:gpl3+))) -(define-public flycheck +(define-public haskell-mode + (deprecated-package "haskell-mode" emacs-haskell-mode)) + +(define-public emacs-flycheck (package (name "emacs-flycheck") (version "31") @@ -767,6 +782,9 @@ different tools. It highlights errors and warnings inline in the buffer, and provides an optional IDE-like error list.") (license license:gpl3+))) ;+GFDLv1.3+ for the manual +(define-public flycheck + (deprecated-package "flycheck" emacs-flycheck)) + ;;; ;;; Web browsing. @@ -910,7 +928,7 @@ provides an optional IDE-like error list.") ;;; Multimedia. ;;; -(define-public emms +(define-public emacs-emms (package (name "emacs-emms") (version "5.0") @@ -1048,9 +1066,12 @@ light user interface.") (home-page "https://www.gnu.org/software/emms/") (license license:gpl3+))) +(define-public emms + (deprecated-package "emacs-emms" emacs-emms)) + (define-public emacs-emms-player-mpv ;; A new mpv backend is included in Emms from 5.0. - (deprecated-package "emacs-emms-player-mpv" emms)) + (deprecated-package "emacs-emms-player-mpv" emacs-emms)) (define-public emacs-emms-mode-line-cycle (package @@ -1080,9 +1101,9 @@ within a specified width. It is useful for displaying long track titles.") ;;; Miscellaneous. ;;; -(define-public bbdb +(define-public emacs-bbdb (package - (name "bbdb") + (name "emacs-bbdb") (version "3.1.2") (source (origin (method url-fetch) @@ -1121,6 +1142,9 @@ like. It can be linked with various Emacs mail clients (Message and Mail mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.") (license license:gpl3+))) +(define-public bbdb + (deprecated-package "bbdb" emacs-bbdb)) + (define-public emacs-aggressive-indent (package (name "emacs-aggressive-indent") @@ -1721,7 +1745,7 @@ type, for example: packages, buffers, files, etc.") `(("guile" ,guile-2.2) ("guix" ,guix))) (propagated-inputs - `(("geiser" ,geiser) + `(("geiser" ,emacs-geiser) ("guile-gcrypt" ,guile-gcrypt) ("dash" ,emacs-dash) ("bui" ,emacs-bui) @@ -2377,7 +2401,7 @@ in Lisp modes.") "1k0sm552iawi49v4zis6dbb81d1rzgky9v0dpv7nj31gnb7bmy7k")))) (build-system emacs-build-system) (native-inputs - `(("ert-runner" ,ert-runner))) + `(("ert-runner" ,emacs-ert-runner))) (arguments `(#:tests? #t #:test-command '("ert-runner"))) @@ -2663,7 +2687,7 @@ framework for Emacs Lisp to be used with @code{ert}.") (native-inputs `(("emacs-ert-expectations" ,emacs-ert-expectations) ("emacs-undercover" ,emacs-undercover) - ("ert-runner" ,ert-runner))) + ("ert-runner" ,emacs-ert-runner))) (synopsis "Simple asynchronous functions for Emacs Lisp") (description "The @code{deferred.el} library provides support for asynchronous tasks. @@ -2672,7 +2696,7 @@ The API is almost the same as that of for asynchronous tasks.") (license license:gpl3+))) -(define-public butler +(define-public emacs-butler (package (name "emacs-butler") (version "0.2.4") @@ -2698,6 +2722,9 @@ view the build status of those servers' build jobs, and possibly to trigger build jobs.") (license license:gpl3+))) +(define-public butler + (deprecated-package "emacs-butler" emacs-butler)) + (define-public emacs-company (package (name "emacs-company") @@ -2823,7 +2850,7 @@ completion candidate when using the Company text completion framework.") simultaneous cursors.") (license license:gpl3+))) -(define-public typo +(define-public emacs-typo (package (name "emacs-typo") (version "1.1") @@ -2847,6 +2874,9 @@ automatically inserts a Unicode opening or closing quotation mark, depending on context.") (license license:gpl3+))) +(define-public typo + (deprecated-package "emacs-typo" emacs-typo)) + (define-public emacs-scheme-complete (let ((commit "9b5cf224bf2a5994bc6d5b152ff487517f1a9bb5")) (package @@ -3982,7 +4012,7 @@ state and will work even without lispy being enabled.") (native-inputs `(("emacs-dash" ,emacs-dash) ("emacs-s" ,emacs-s) - ("ert-runner" ,ert-runner))) + ("ert-runner" ,emacs-ert-runner))) (arguments `(#:tests? #t #:test-command '("ert-runner"))) @@ -4354,7 +4384,7 @@ indentation and filling of comments and C preprocessor fontification.") (propagated-inputs `(("emacs-dash" ,emacs-dash) ("emacs-s" ,emacs-s) - ("emacs-flycheck" ,flycheck) + ("emacs-flycheck" ,emacs-flycheck) ("emacs-typescript-mode" ,emacs-typescript-mode))) (home-page "https://github.com/ananthakumaran/tide") (synopsis "Typescript IDE for Emacs") @@ -4519,7 +4549,7 @@ provide the historic behavior of @code{flet}, as well as `(#:tests? #t #:test-command '("ert-runner"))) (native-inputs - `(("ert-runner" ,ert-runner))) + `(("ert-runner" ,emacs-ert-runner))) (propagated-inputs `(("emacs-el-x" ,emacs-el-x))) (home-page "https://github.com/sigma/mocker.el") @@ -4585,7 +4615,7 @@ functions to assist in reviewing changes on files.") #:tests? #t #:test-command '("ert-runner"))) (native-inputs - `(("ert-runner" ,ert-runner) + `(("ert-runner" ,emacs-ert-runner) ("emacs-mocker" ,emacs-mocker))) (home-page "https://github.com/jorgenschaefer/pyvenv") (synopsis "Virtualenv minor mode for Emacs") @@ -4670,7 +4700,7 @@ indentation (space indentation only). ("pyvenv" ,emacs-pyvenv) ("s" ,emacs-s))) (native-inputs - `(("ert-runner" ,ert-runner) + `(("ert-runner" ,emacs-ert-runner) ("emacs-f" ,emacs-f) ("python" ,python-wrapper) ("python-autopep8" ,python-autopep8) @@ -6932,9 +6962,9 @@ Emacs.") ;; Tests for ert-runner have a circular dependency with ecukes, and therefore ;; cannot be run -(define-public ert-runner +(define-public emacs-ert-runner (package - (name "ert-runner") + (name "emacs-ert-runner") (version "0.7.0") (source (origin @@ -6977,6 +7007,9 @@ using ERT. It assumes a certain test structure setup and can therefore make running tests easier.") (license license:gpl3+))) +(define-public ert-runner + (deprecated-package "ert-runner" emacs-ert-runner)) + (define-public emacs-disable-mouse (package (name "emacs-disable-mouse") @@ -7020,7 +7053,7 @@ running a customisable handler command (@code{ignore} by default). ") (native-inputs `(("emacs-dash" ,emacs-dash) ("emacs-shut-up" ,emacs-shut-up) - ("ert-runner" ,ert-runner))) + ("ert-runner" ,emacs-ert-runner))) (arguments `(#:tests? #t #:test-command '("ert-runner"))) @@ -7251,7 +7284,7 @@ settings).") "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb")))) (build-system emacs-build-system) (native-inputs - `(("ert-runner" ,ert-runner))) + `(("ert-runner" ,emacs-ert-runner))) (arguments `(#:tests? #t #:test-command '("ert-runner" "tests"))) @@ -7507,7 +7540,7 @@ Idris.") `(("emacs-f" ,emacs-f) ("emacs-s" ,emacs-s))) (native-inputs - `(("ert-runner" ,ert-runner))) + `(("ert-runner" ,emacs-ert-runner))) (arguments `(#:tests? #t #:test-command '("ert-runner"))) @@ -7977,9 +8010,9 @@ supports multiple backends such as @code{vlc}, @code{mpg123}, @code{afplay}.") (license license:gpl2+))) -(define-public groovy-emacs-modes +(define-public emacs-groovy-modes (package - (name "groovy-emacs-modes") + (name "emacs-groovy-modes") (version "2.0") (source (origin (method url-fetch) @@ -8001,7 +8034,10 @@ Groovy source files, REPL integration with run-groovy and Grails project navigation with the grails mode.") (license license:gpl3+))) -(define-public org-tree-slide +(define-public groovy-emacs-modes + (deprecated-package "groovy-emacs-modes" emacs-groovy-modes)) + +(define-public emacs-org-tree-slide (let ((commit "dff8f1a4a64c8dd0a1fde0b0131e2fe186747134") (revision "0")) (package @@ -8023,6 +8059,9 @@ navigation with the grails mode.") @kbd{C-<} to jump to the next and previous slide.") (license license:gpl3+)))) +(define-public org-tree-slide + (deprecated-package "emacs-org-tree-slide" emacs-org-tree-slide)) + (define-public emacs-scratch-el (let ((commit "2cdf2b841ce7a0987093f65b0cc431947549f897") (revision "1")) @@ -10095,7 +10134,7 @@ time is being spent during Emacs startup in order to optimize startup time.") (define-public emacs-emms-player-simple-mpv ;; A new mpv backend is included in Emms from 5.0. - (deprecated-package "emacs-emms-player-simple-mpv" emms)) + (deprecated-package "emacs-emms-player-simple-mpv" emacs-emms)) (define-public emacs-magit-org-todos-el (let ((commit "df206287737b9671f2e36ae7b1474ebbe9940d2a")) @@ -10113,7 +10152,7 @@ time is being spent during Emacs startup in order to optimize startup time.") (base32 "0kdp7k7jnnrkhsg0xh1c3h7iz0vgi120gf5xwl1hxy61avivnxrn")))) (propagated-inputs - `(("magit" ,magit))) + `(("magit" ,emacs-magit))) (build-system emacs-build-system) (home-page "https://github.com/danielma/magit-org-todos.el") (synopsis "Get todo.org into Emacs Magit status") @@ -10952,7 +10991,7 @@ through the symbol: @command{this-fn}.") `(("emacs-el-mock" ,emacs-el-mock) ("emacs-noflet" ,emacs-noflet) ("emacs-undercover" ,emacs-undercover) - ("ert-runner" ,ert-runner))) + ("ert-runner" ,emacs-ert-runner))) (propagated-inputs `(("emacs-f" ,emacs-f) ("emacs-popup" ,emacs-popup))) @@ -11139,7 +11178,7 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.") (build-system emacs-build-system) (propagated-inputs `(("emacs-evil" ,emacs-evil) - ("magit" ,magit))) + ("magit" ,emacs-magit))) (home-page "https://github.com/emacs-evil/evil-magit") (synopsis "Evil-based key bindings for Magit") @@ -11412,7 +11451,7 @@ you searched for and execute it, or view its documentation.") (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) - ("emacs-emms" ,emms))) + ("emacs-emms" ,emacs-emms))) (home-page "https://github.com/emacs-helm/helm-emms") (synopsis "Emms for Helm") @@ -11467,7 +11506,7 @@ See @code{helm-exwm-switch-browser} for an example.") (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) - ("emacs-flycheck" ,flycheck) + ("emacs-flycheck" ,emacs-flycheck) ("emacs-helm" ,emacs-helm))) (home-page "https://github.com/yasuyk/helm-flycheck") (synopsis "Show Flycheck errors with Helm") @@ -12029,7 +12068,7 @@ buffers – other modes on the TODO list). ("emacs-dash" ,emacs-dash) ("emacs-f" ,emacs-f) ("emacs-hl-todo" ,emacs-hl-todo) - ("magit" ,magit) + ("magit" ,emacs-magit) ("emacs-pcre2el" ,emacs-pcre2el) ("emacs-s" ,emacs-s))) (home-page "https://github.com/alphapapa/magit-todos") -- cgit v1.2.3 From a434730f2ebc39fcda7a8d0709c7f5adffa69299 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 13:23:32 +0200 Subject: gnu: Add r-xbioc. * gnu/packages/bioinformatics.scm (r-xbioc): New variable. --- gnu/packages/bioinformatics.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b619866ba3..d92fbd7de9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13760,3 +13760,36 @@ sequencing data.") ;; This is free software but the license variant is unclear: ;; . (license license:bsd-3))) + +(define-public r-xbioc + (let ((revision "1") + (commit "f798c187e376fd1ba27abd559f47bbae7e3e466b")) + (package + (name "r-xbioc") + (version (git-version "0.1.15" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/renozao/xbioc.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03hffh2f6z71y6l6dqpa5cql3hdaw7zigdi8sm2dzgx379k9rgrr")))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotationdbi" ,r-annotationdbi) + ("r-assertthat" ,r-assertthat) + ("r-biobase" ,r-biobase) + ("r-biocinstaller" ,r-biocinstaller) + ("r-digest" ,r-digest) + ("r-pkgmaker" ,r-pkgmaker) + ("r-plyr" ,r-plyr) + ("r-reshape2" ,r-reshape2) + ("r-stringr" ,r-stringr))) + (home-page "https://github.com/renozao/xbioc/") + (synopsis "Extra base functions for Bioconductor") + (description "This package provides extra utility functions to perform +common tasks in the analysis of omics data, leveraging and enhancing features +provided by Bioconductor packages.") + (license license:gpl3+)))) -- cgit v1.2.3 From 28829c040f92399c0705f968f232543e97e5f5f9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 13:23:44 +0200 Subject: gnu: Add r-cssam. * gnu/packages/bioinformatics.scm (r-cssam): New variable. --- gnu/packages/bioinformatics.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d92fbd7de9..2366843d87 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13793,3 +13793,34 @@ sequencing data.") common tasks in the analysis of omics data, leveraging and enhancing features provided by Bioconductor packages.") (license license:gpl3+)))) + +(define-public r-cssam + (let ((revision "1") + (commit "9ec58c982fa551af0d80b1a266890d92954833f2")) + (package + (name "r-cssam") + (version (git-version "1.4" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shenorrLab/csSAM.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "128syf9v39gk0z3ip000qpsjbg6l1siyq6c8b0hz41dzg5achyb3")))) + (build-system r-build-system) + (propagated-inputs + `(("r-formula" ,r-formula) + ("r-ggplot2" ,r-ggplot2) + ("r-pkgmaker" ,r-pkgmaker) + ("r-plyr" ,r-plyr) + ("r-rngtools" ,r-rngtools) + ("r-scales" ,r-scales))) + (home-page "https://github.com/shenorrLab/csSAM/") + (synopsis "Cell type-specific statistical analysis of microarray") + (description "This package implements the method csSAM that computes +cell-specific differential expression from measured cell proportions using +SAM.") + ;; Any version + (license license:lgpl2.1+)))) -- cgit v1.2.3 From e72702475da2379e10ca09e724e10a9bceceef1b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 13:24:13 +0200 Subject: gnu: Add r-bseqsc. * gnu/packages/bioinformatics.scm (r-bseqsc): New variable. --- gnu/packages/bioinformatics.scm | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2366843d87..e74abf005f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13824,3 +13824,48 @@ cell-specific differential expression from measured cell proportions using SAM.") ;; Any version (license license:lgpl2.1+)))) + +(define-public r-bseqsc + (let ((revision "1") + (commit "fef3f3e38dcf3df37103348b5780937982b43b98")) + (package + (name "r-bseqsc") + (version (git-version "1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shenorrLab/bseqsc.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1prw13wa20f7wlc3gkkls66n1kxz8d28qrb8icfqdwdnnv8w5qg8")))) + (build-system r-build-system) + (propagated-inputs + `(("r-abind" ,r-abind) + ("r-annotationdbi" ,r-annotationdbi) + ("r-biobase" ,r-biobase) + ("r-cssam" ,r-cssam) + ("r-dplyr" ,r-dplyr) + ("r-e1071" ,r-e1071) + ("r-edger" ,r-edger) + ("r-ggplot2" ,r-ggplot2) + ("r-nmf" ,r-nmf) + ("r-openxlsx" ,r-openxlsx) + ("r-pkgmaker" ,r-pkgmaker) + ("r-plyr" ,r-plyr) + ("r-preprocesscore" ,r-preprocesscore) + ("r-rngtools" ,r-rngtools) + ("r-scales" ,r-scales) + ("r-stringr" ,r-stringr) + ("r-xbioc" ,r-xbioc))) + (home-page "https://github.com/shenorrLab/bseqsc") + (synopsis "Deconvolution of bulk sequencing experiments using single cell data") + (description "BSeq-sc is a bioinformatics analysis pipeline that +leverages single-cell sequencing data to estimate cell type proportion and +cell type-specific gene expression differences from RNA-seq data from bulk +tissue samples. This is a companion package to the publication \"A +single-cell transcriptomic map of the human and mouse pancreas reveals inter- +and intra-cell population structure.\" Baron et al. Cell Systems (2016) +@url{https://www.ncbi.nlm.nih.gov/pubmed/27667365}.") + (license license:gpl2+)))) -- cgit v1.2.3 From 94282358fd5ca5be85dbf3ccadc7693259f7a72f Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 24 Sep 2018 17:46:18 +0530 Subject: gnu: m17n-db: Update to 1.8.0. * gnu/packages/emacs.scm (m17n-db): Update to 1.8.0. --- gnu/packages/emacs.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index fbedd2f48d..cc2560dffa 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5538,14 +5538,15 @@ extensibility.") (define-public m17n-db (package (name "m17n-db") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/m17n/m17n-db-" version ".tar.gz")) (sha256 - (base32 "1w08hnsbknrcjlzp42c99bgwc9hzsnf5m4apdv0dacql2s09zfm2")))) + (base32 + "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal))) -- cgit v1.2.3 From 53c64d7c9303d52cbacdaca5d182175d472c53db Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 24 Sep 2018 17:46:47 +0530 Subject: gnu: m17n-lib: Update to 1.8.0. * gnu/packages/emacs.scm (m17n-lib): Update to 1.8.0. --- gnu/packages/emacs.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index cc2560dffa..f29040c372 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -5573,14 +5573,15 @@ This package contains the library database.") (define-public m17n-lib (package (name "m17n-lib") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/m17n/m17n-lib-" version ".tar.gz")) (sha256 - (base32 "10yv730i25g1rpzv6q49m6xn4p8fjm7jdwvik2h70sn8w3hm7f4f")))) + (base32 + "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq")))) (build-system gnu-build-system) (inputs `(("fribidi" ,fribidi) -- cgit v1.2.3 From d08b3258435254cc6ade95b84a6c53e59cc191e6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 16:20:19 +0200 Subject: gnu: Add python-grequests. * gnu/packages/python-web.scm (python-grequests): New variable. --- gnu/packages/python-web.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 226b9b631b..6ded2f75ab 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge ;;; Copyright © 2016, 2017 Marius Bakke -;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2016, 2017 Julien Lepiller ;;; Copyright © 2016, 2017 Nils Gillmann @@ -1592,6 +1592,29 @@ library.") (define-public python2-responses (package-with-python2 python-responses)) +(define-public python-grequests + (package + (name "python-grequests") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "grequests" version)) + (sha256 + (base32 + "1j9icncllbkv7x5719b20mx670c6q1jrdx1sakskkarvx3pc8h8g")))) + (build-system python-build-system) + (propagated-inputs + `(("python-gevent" ,python-gevent) + ("python-requests" ,python-requests))) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/kennethreitz/grequests") + (synopsis "Python library for asynchronous HTTP requests") + (description "GRequests is a Python library that allows you to use +@code{Requests} with @code{Gevent} to make asynchronous HTTP Requests easily") + (license license:bsd-2))) + (define-public python-geventhttpclient (package (name "python-geventhttpclient") -- cgit v1.2.3 From 0750f344eceb10e8ddd81ed146ae2e1aa897f2d4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 16:20:32 +0200 Subject: gnu: Add python-hawkauthlib. * gnu/packages/python-web.scm (python-hawkauthlib): New variable. --- gnu/packages/python-web.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6ded2f75ab..c38ccea216 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2649,3 +2649,25 @@ for URL parsing and changing.") (define-public python2-google-api-client (package-with-python2 python-google-api-client)) + +(define-public python-hawkauthlib + (package + (name "python-hawkauthlib") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "hawkauthlib" version)) + (sha256 + (base32 + "03ai47s4h8nfnrf25shbfvkm1b9n1ccd4nmmj280sg1fayi69zgg")))) + (build-system python-build-system) + (propagated-inputs + `(("python-requests" ,python-requests) + ("python-webob" ,python-webob))) + (home-page "https://github.com/mozilla-services/hawkauthlib") + (synopsis "Hawk Access Authentication protocol") + (description + "This is a low-level Python library for implementing Hawk Access Authentication, +a simple HTTP request-signing scheme.") + (license license:mpl2.0))) -- cgit v1.2.3 From 084e14cc37d893703b526d8f8f9220f7ee3aa0b3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 16:20:42 +0200 Subject: gnu: Add python-pybrowserid. * gnu/packages/python-web.scm (python-pybrowserid): 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 c38ccea216..68a0d78db5 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2671,3 +2671,26 @@ for URL parsing and changing.") "This is a low-level Python library for implementing Hawk Access Authentication, a simple HTTP request-signing scheme.") (license license:mpl2.0))) + +(define-public python-pybrowserid + (package + (name "python-pybrowserid") + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyBrowserID" version)) + (sha256 + (base32 + "1qvi79kfb8x9kxkm5lw2mp42hm82cpps1xknmsb5ghkwx1lpc8kc")))) + (build-system python-build-system) + (propagated-inputs + `(("python-requests" ,python-requests))) + (native-inputs + `(("python-mock" ,python-mock))) + (home-page "https://github.com/mozilla/PyBrowserID") + (synopsis "Python library for the BrowserID protocol") + (description + "This is a Python client library for the BrowserID protocol that +underlies Mozilla Persona.") + (license license:mpl2.0))) -- cgit v1.2.3 From f45bb3cc0fc4e687f966a8f2fabce73e0c6f31f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 16:20:51 +0200 Subject: gnu: Add python-pyfxa. * gnu/packages/python-web.scm (python-pyfxa): 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 68a0d78db5..6df33fe41d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2694,3 +2694,34 @@ a simple HTTP request-signing scheme.") "This is a Python client library for the BrowserID protocol that underlies Mozilla Persona.") (license license:mpl2.0))) + +(define-public python-pyfxa + (package + (name "python-pyfxa") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyFxA" version)) + (sha256 + (base32 + "0axl16fyrz2r88gnw4b12mk7dpkqscv8c4wsc1y5hicl7bsbc4fm")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; 17 tests require network access + (propagated-inputs + `(("python-cryptography" ,python-cryptography) + ("python-hawkauthlib" ,python-hawkauthlib) + ("python-pybrowserid" ,python-pybrowserid) + ("python-requests" ,python-requests) + ("python-six" ,python-six))) + (native-inputs + `(("python-grequests" ,python-grequests) + ("python-mock" ,python-mock) + ("python-responses" ,python-responses) + ("python-unittest2" ,python-unittest2))) + (home-page "https://github.com/mozilla/PyFxA") + (synopsis "Firefox Accounts client library for Python") + (description + "This is a Python library for interacting with the Firefox Accounts +ecosystem.") + (license license:mpl2.0))) -- cgit v1.2.3 From 000147811b15465cd0f67d2635ba7d807d865afd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 24 Sep 2018 16:21:11 +0200 Subject: gnu: eolie: Update to 0.9.37. * gnu/packages/gnome.scm (eolie): Update to 0.9.37. [source]: Fetch from gitlab. [build-system]: Use meson-build-system. [arguments]: Remove custom phases; set #:glib-or-gtk?. [native-inputs]: Remove meson-for-build and ninja; add glib:bin. [inputs]: Add python-pyfxa and python-pycrypto. --- gnu/packages/gnome.scm | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ac898fb294..1ca354a432 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -115,6 +115,8 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-web) #:use-module (gnu packages rdesktop) #:use-module (gnu packages scanner) #:use-module (gnu packages selinux) @@ -4088,29 +4090,20 @@ work and the interface is well tested.") (define-public eolie (package (name "eolie") - (version "0.9.15") + (version "0.9.37") (source (origin (method url-fetch) - (uri (string-append "https://github.com/gnumdk/eolie/" - "releases/download/" version - "/eolie-" version ".tar.xz")) + (uri (string-append "https://gitlab.gnome.org/World/eolie/" + "uploads/4341cb428b7a45670308ee3fb3fa07dd/" + "eolie-" version ".tar.xz")) (sha256 (base32 - "0glydxp1xh85gfidk1l9miqn6qxdbvvk5s3iy0pjlv8nrs3263jd")))) - (build-system glib-or-gtk-build-system) + "126m0nwwy3lqv7z8aj9hiwangih03b1nlkg3xja9p7wbf7zcvp2n")))) + (build-system meson-build-system) (arguments - `(#:phases + `(#:glib-or-gtk? #t + #:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (invoke "meson" "build" - "--prefix" (assoc-ref outputs "out")))) - (replace 'check - (lambda _ (invoke "ninja" "-C" "build" "test"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "ninja" "-C" "build" "install"))) (add-after 'wrap 'wrap-more (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -4134,9 +4127,8 @@ work and the interface is well tested.") ("intltool" ,intltool) ("itstool" ,itstool) ("pkg-config" ,pkg-config) - ("meson" ,meson-for-build) - ("ninja" ,ninja) ("python" ,python) + ("glib:bin" ,glib "bin") ("gtk+" ,gtk+ "bin"))) (inputs `(("gobject-introspection" ,gobject-introspection) @@ -4146,8 +4138,10 @@ work and the interface is well tested.") ("atk" ,atk) ; propagated by gtk+, but we need it in LD_LIBRARY_PATH ("python" ,python-wrapper) ("python-dateutil" ,python-dateutil) + ("python-pyfxa" ,python-pyfxa) ("python-pygobject" ,python-pygobject) ("python-pycairo" ,python-pycairo) + ("python-pycrypto" ,python-pycrypto) ("libsecret" ,libsecret) ("gtkspell3" ,gtkspell3) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) -- cgit v1.2.3 From 8ae540a2c024f9b1b8bce65dbe1dfbf4e926bc77 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 00:54:39 +0200 Subject: gnu: ocaml-ssl: Don't use unstable tarball. * gnu/packages/ocaml.scm (ocaml-ssl)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/ocaml.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7859696406..0756aecd6d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -65,6 +65,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system ocaml) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix svn-download) @@ -1650,12 +1651,13 @@ lets the client choose the concrete timeline.") (version "0.5.5") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/savonet/ocaml-ssl/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/savonet/ocaml-ssl.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "15p7652cvzdrlqxc1af11mg07wasxr1fsaj44gcmmh6bmav7wfzq")))) + "0fviq8xhp3qk7pmkl7knchywsipxgb7p0z489hj8qnf2sx8xzdmy")))) (build-system ocaml-build-system) (arguments `(#:tests? #f #:make-flags (list "OCAMLFIND_LDCONF=ignore") -- cgit v1.2.3 From c60d5a25280d77ae22061ac08677e07db38e8fbd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 01:08:09 +0200 Subject: gnu: libmesode: Don't use unstable tarball. * gnu/packages/messaging.scm (libmesode)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/messaging.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 42a0847b7a..3174b4ef4e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1474,13 +1474,14 @@ is also scriptable and extensible via Guile.") (name "libmesode") (version "0.9.1") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/boothj5/libmesode/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/boothj5/libmesode.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0iaj56fkd5bjvqpvq3324ni895rmbj1akbfqipjydnghfwaym4z6")))) + "1zb1x422zkpnxrz9d2b7pmi8ms60lbw49yh78mydqfypsmj2iyfh")))) (build-system gnu-build-system) (inputs `(("expat" ,expat) -- cgit v1.2.3 From b44a18c8f26e66c2cbfff4740bff29949a9eb684 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 01:12:00 +0200 Subject: gnu: libmesode: Update to 0.9.2. * gnu/packages/messaging.scm (libmesode): Update to 0.9.2. --- 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 3174b4ef4e..33e9d2ffe3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1472,7 +1472,7 @@ is also scriptable and extensible via Guile.") (define-public libmesode (package (name "libmesode") - (version "0.9.1") + (version "0.9.2") (source (origin (method git-fetch) (uri (git-reference @@ -1481,7 +1481,7 @@ is also scriptable and extensible via Guile.") (file-name (git-file-name name version)) (sha256 (base32 - "1zb1x422zkpnxrz9d2b7pmi8ms60lbw49yh78mydqfypsmj2iyfh")))) + "06f5nfaypvxrbsinxa1k2vrxrs7kqmg38g4wwwk5d63hpn1pj8ak")))) (build-system gnu-build-system) (inputs `(("expat" ,expat) -- cgit v1.2.3 From 25ab91c85c8901e6e9b36042fa126e24ceb57263 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 01:35:17 +0200 Subject: gnu: gloox: Update to 1.0.21. * gnu/packages/messaging.scm (gloox): Update to 1.0.21. --- 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 33e9d2ffe3..9b1aea788c 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1135,7 +1135,7 @@ with several different talk daemons at the same time.") (define-public gloox (package (name "gloox") - (version "1.0.17") + (version "1.0.21") (source (origin (method url-fetch) @@ -1143,7 +1143,7 @@ with several different talk daemons at the same time.") version ".tar.bz2")) (sha256 (base32 - "09c01jr5nrm7f1ly42wg0pqqscmp48pv8y2fjx1vwbavjxdq59ri")))) + "1k57qgif1yii515m6jaqaibkdysfab6394bpawd2l67321f1a4rw")))) (build-system gnu-build-system) (inputs `(("libidn" ,libidn) -- cgit v1.2.3 From 4cb4af797a08047b5ca894fcb7930519dd2ef466 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 01:37:35 +0200 Subject: gnu: lxterminal: Update to 0.3.2. * gnu/packages/lxde.scm (lxterminal): Update to 0.3.2. --- gnu/packages/lxde.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 19938fa93c..c45beb8bbb 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -164,7 +164,7 @@ toolkit. It allows users to monitor and control of running processes.") (define-public lxterminal (package (name "lxterminal") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/lxde/LXTerminal" @@ -172,7 +172,7 @@ toolkit. It allows users to monitor and control of running processes.") version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0jrc3m0hbxcmcgahwjlm46s2350gh80ggb6a90xy0h6xqa3z73fd")))) + "1124pghrhnx6q4391ri8nvi6bsmvbj1dx81an08mird8jf2b2rii")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2) ("vte" ,vte/gtk+-2))) -- cgit v1.2.3 From e6dcf9ca5f386c98fc03093032d65559c03164e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 13:11:24 +0200 Subject: gnu: rename: Update to 1.00. * gnu/packages/admin.scm (rename): Update to 1.00. [arguments]: Wrap executable to find its own library. --- gnu/packages/admin.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e7e34ab97f..8f504cafef 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -869,7 +869,7 @@ over ssh connections.") (define-public rename (package (name "rename") - (version "0.35") + (version "1.00") (source (origin (method url-fetch) (uri (string-append @@ -877,8 +877,24 @@ over ssh connections.") version ".tar.gz")) (sha256 (base32 - "052iqmn7ya3w1nadpiyavmr3rx566r0lbflx94y8b5wx9q5c16rq")))) + "03yhf8nmqsb0zyliv501fdvwlp589jqfn44yqkrflmpzrbik3zxl")))) (build-system perl-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'find-itself + ;; Fix run-time 'Can't locate File/Rename.pm in @INC' failure. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (with-directory-excursion bin + (for-each + (lambda (program) + (wrap-program program + `("PERL5LIB" ":" prefix + (,(string-append out "/lib/perl5/site_perl"))))) + (find-files "." ".*"))) + #t)))))) (native-inputs `(("perl-module-build" ,perl-module-build) ("perl-test-pod" ,perl-test-pod) -- cgit v1.2.3 From a68b45142373dd75bc96f9c4f8151bcd4e972888 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Sep 2018 22:23:59 +0200 Subject: gnu: Add gandi.cli. * gnu/packages/networking.scm (gandi.cli): New public variable. --- gnu/packages/networking.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 84224374c6..4800c2496b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -87,6 +87,7 @@ #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-web) #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages ssh) @@ -673,6 +674,55 @@ send out a ping packet and move on to the next target in a round-robin fashion.") (license license:expat))) +(define-public gandi.cli + (package + (name "gandi.cli") + (version "1.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri name version)) + (sha256 + (base32 "0vfzkw1avybjkf6fwqpf5m4kjz4c0qkkmj62f3jd0zx00vh5ly1d")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'embed-store-file-names + (lambda _ + (substitute* (list "gandi/cli/modules/cert.py" + "gandi/cli/tests/commands/test_certificate.py") + (("openssl") (which "openssl"))) + #t)) + (add-after 'install 'install-documentation + ;; The included man page may be outdated but we install it anyway, + ;; since it's mentioned in 'gandi --help' and better than nothing. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man1 (string-append out "/share/man/man1"))) + (mkdir-p man1) + (with-output-to-file (string-append man1 "/gandi.1") + (lambda _ + (invoke "rst2man.py" "gandicli.man.rst"))) + #t)))))) + (native-inputs + `(("python-docutils" ,python-docutils) ; for rst2man.py + ("python-pytest-cov" ,python-pytest-cov) + ("python-tox" ,python-tox))) + (inputs + `(("openssl" ,openssl) + ("python-click" ,python-click) + ("python-ipy" ,python-ipy) + ("python-pyyaml" ,python-pyyaml) + ("python-requests" ,python-requests))) + (home-page "https://cli.gandi.net") + (synopsis "Command-line interface to the Gandi.net Web API") + (description + "This package provides a command-line client (@command{gandi}) to buy, +manage, and delete Internet resources from Gandi.net such as domain names, +virtual machines, and certificates.") + (license license:gpl3+))) + (define-public httping (package (name "httping") -- cgit v1.2.3 From 116af86f14f7789831d79815d5b4532afa82058c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 16 Sep 2018 22:17:06 -0400 Subject: gnu: octave: Add a search path for CURLOPT_CAPATH. * gnu/packages/maths.scm (octave)[native-search-paths]: New field. --- gnu/packages/maths.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 636b485260..b7d669ccea 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1402,6 +1402,13 @@ can solve two kinds of problems: ("less" ,less) ("ghostscript" ,ghostscript) ("gnuplot" ,gnuplot))) + ;; Octave code uses this variable to detect directories holding multiple CA + ;; certificates to verify peers with. This is required for the networking + ;; functions that require encryption to work properly. + (native-search-paths + (list (search-path-specification + (variable "CURLOPT_CAPATH") + (files '("etc/ssl/certs"))))) (arguments `(#:configure-flags (list (string-append "--with-shell=" -- cgit v1.2.3 From f1ea0759f414084a62e29a0740f48d508f3dee73 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 25 Sep 2018 08:18:03 +0200 Subject: gnu: qjackctl: Update to 0.5.4. * gnu/packages/audio.scm (qjackctl): Update to 0.5.4. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 8bce6fa2c2..4465872732 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2013,14 +2013,14 @@ and ALSA.") (define-public qjackctl (package (name "qjackctl") - (version "0.5.3") + (version "0.5.4") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/" version "/qjackctl-" version ".tar.gz")) (sha256 (base32 - "0x08af8m5l8qy9av3dlldsg58ny9nc69h1s4i6hqkvj24jwy6fw1")))) + "0qr71nb93gkz5q53nfcl5g168z173wc6s8w1yjs3rfn3m4hg0bcq")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no check target -- cgit v1.2.3 From 932839ff124ff3b0dd3070914fb1c5beec69bf32 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 25 Sep 2018 11:20:32 +0200 Subject: gnu: ibus: Update to 1.5.19. * gnu/packages/ibus.scm (ibus): Update to 1.5.19. [arguments]: Add configure flags to disable Python 2 support while building Python 3 bindings; adjust make flags; add phase prepare-ucd-dir. [inputs]: Replace python2-pygobject with python-pygobject; replace python-2 with python. [native-inputs]: Add unicode files. --- gnu/packages/ibus.scm | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 9f7e1f88b4..08fce5f6fb 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -44,7 +44,7 @@ (define-public ibus (package (name "ibus") - (version "1.5.17") + (version "1.5.19") (source (origin (method url-fetch) (uri (string-append "https://github.com/ibus/ibus/" @@ -52,22 +52,29 @@ version "/ibus-" version ".tar.gz")) (sha256 (base32 - "06fj7lawww5d5w73pk249191lvmpz7shlxfxia74bjkpb42shiq3")))) + "0a94bnpm24581317hdnihwr4cniriml10p4ffgxg14xhvaccfrjb")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; tests fail because there's no connection to dbus - #:configure-flags '("--disable-emoji-dict" ; cannot find emoji.json path + #:configure-flags `("--disable-emoji-dict" ; cannot find emoji.json path + "--disable-python2" + "--enable-python-library" + ,(string-append "--with-ucd-dir=" + (getcwd) "/ucd") "--enable-wayland") #:make-flags (list "CC=gcc" (string-append "pyoverridesdir=" (assoc-ref %outputs "out") - "/lib/python2.7/site-packages/gi/overrides/") - (string-append "py2overridesdir=" - (assoc-ref %outputs "out") - "/lib/python2.7/site-packages/gi/overrides/")) + "/lib/python3.6/site-packages/gi/overrides/")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'prepare-ucd-dir + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "../ucd") + (symlink (assoc-ref inputs "unicode-blocks") "../ucd/Blocks.txt") + (symlink (assoc-ref inputs "unicode-nameslist") "../ucd/NamesList.txt") + #t)) (add-before 'configure 'disable-dconf-update (lambda _ (substitute* "data/dconf/Makefile.in" @@ -117,11 +124,23 @@ ("wayland" ,wayland) ("xmodmap" ,xmodmap) ("iso-codes" ,iso-codes) - ("pygobject2" ,python2-pygobject) - ("python2" ,python-2))) + ("pygobject2" ,python-pygobject) + ("python" ,python))) (native-inputs `(("glib" ,glib "bin") ; for glib-genmarshal ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler + ("unicode-nameslist" + ,(origin + (method url-fetch) + (uri "https://www.unicode.org/Public/UNIDATA/NamesList.txt") + (sha256 + (base32 "0yr2h0nfqhirfi3bxl33z6cc94qqshlpgi06c25xh9754irqsgv8")))) + ("unicode-blocks" + ,(origin + (method url-fetch) + (uri "https://www.unicode.org/Public/UNIDATA/Blocks.txt") + (sha256 + (base32 "0lnh9iazikpr548bd7nkaq9r3vfljfvz0rg2462prac8qxk7ni8b")))) ("vala" ,vala) ("pkg-config" ,pkg-config))) (native-search-paths -- cgit v1.2.3 From 79374801d08c8b3e0df264340fd7212a3dac10ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 03:44:19 +0200 Subject: gnu: python-flask-login: Don't use unstable tarball. * gnu/packages/python-web.scm (python-flask-login)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/python-web.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6df33fe41d..e3de0a0824 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2056,13 +2056,13 @@ It comes with safe defaults and easily configurable options.") (version "0.4.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/maxcountryman/flask-login/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/maxcountryman/flask-login.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1pdqp7a2gyb7k06xda004x0fi2w66s6kn2i0ndkqndmg12d83f9w")))) + (base32 "0sjbmk8m4mmd9g99n6c6lx9nv2jwwqp6qsqhl945w2m0f1sknwdh")))) (arguments ;; Tests fail PEP8 compliance. See: ;; https://github.com/maxcountryman/flask-login/issues/340 -- cgit v1.2.3 From bbc69023d86f5bd4ffec994453e5bdfbf5c429f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:13:01 +0200 Subject: gnu: Add python-semantic-version. * gnu/packages/python.scm (python-semantic-version) (python2-semantic-version): New public variables. --- gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ea641b8213..86ce70254d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -907,6 +907,34 @@ API for locking files.") (define-public python2-lockfile (package-with-python2 python-lockfile)) +(define-public python-semantic-version + (package + (name "python-semantic-version") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "semantic_version" version)) + (sha256 + (base32 + "1h2l9xyg1zzsda6kjcmfcgycbvrafwci283vcr1v5sbk01l2hhra")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; PyPI tarball lacks tests + (home-page "https://github.com/rbarrois/python-semanticversion") + (synopsis "Semantic versioning module for Python") + (description + "The @code{semantic_version} class is a small library for handling +@uref{https://semver.org/, semantic versioning} (@dfn{SemVer}) in Python. + +It can compare versions, generate a new version that represents a bump in one of +the version levels, and check whether any given string is a proper semantic +version identifier.") + (license license:bsd-3))) + +(define-public python2-semantic-version + (package-with-python2 python-semantic-version)) + (define-public python-setuptools (package (name "python-setuptools") -- cgit v1.2.3 From d6ab1d0ac3047931a4e4daf0d48f23d2468a7341 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:19:13 +0200 Subject: gnu: python-flask-login: Update to 0.4.1. * gnu/packages/python-web.scm (python-flask-login): Update to 0.4.1. [arguments]: Run the test suite. [propagated-inputs]: Add python-flask. [native-inputs]: Add test dependencies. --- gnu/packages/python-web.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e3de0a0824..456134c1ce 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2053,7 +2053,7 @@ It comes with safe defaults and easily configurable options.") (define-public python-flask-login (package (name "python-flask-login") - (version "0.4.0") + (version "0.4.1") (source (origin (method git-fetch) @@ -2062,12 +2062,27 @@ It comes with safe defaults and easily configurable options.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0sjbmk8m4mmd9g99n6c6lx9nv2jwwqp6qsqhl945w2m0f1sknwdh")))) + (base32 "1rj0qwyxapxnp84fi4lhmvh3d91fdiwz7hibw77x3d5i72knqaa9")))) (arguments - ;; Tests fail PEP8 compliance. See: - ;; https://github.com/maxcountryman/flask-login/issues/340 - `(#:tests? #f)) + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'avoid-yanc + ;; Work around '.nosetests-real: error: no such option: --with-yanc'. + (lambda _ + (setenv "NOCOLOR" "set") + #t))))) (build-system python-build-system) + (propagated-inputs + `(("python-flask" ,python-flask))) + (native-inputs + ;; For tests. + `(("python-blinker" ,python-blinker) + ("python-mock" ,python-mock) + ("python-nose" ,python-nose) + ("python-pep8" ,python-pep8) + ("python-pyflakes" ,python-pyflakes) + ("python-semantic-version" ,python-semantic-version) + ("python-werkzeug" ,python-werkzeug))) (home-page "https://github.com/maxcountryman/flask-login") (synopsis "User session management for Flask") (description -- cgit v1.2.3 From 238d950b79b78365337e625d2a06247fe464d765 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 13:52:11 +0200 Subject: gnu: python-nose-timer: Update to 0.7.3. * gnu/packages/check.scm (python-nose-timer): Update to 0.7.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 f4596010ea..866fa801c0 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1926,14 +1926,14 @@ create data based on random numbers and yet remain repeatable.") (define-public python-nose-timer (package (name "python-nose-timer") - (version "0.7.2") + (version "0.7.3") (source (origin (method url-fetch) (uri (pypi-uri "nose-timer" version)) (sha256 (base32 - "0ywg223p528014z5s0vzck74r4xyw3kvcp2casfnc85dkvir1zj7")))) + "0hfz5aqnhf493i9kyb6prm4zm8vx7wmfsyg3nvsnh24lzh2kwx44")))) (build-system python-build-system) (propagated-inputs `(("python-nose" ,python-nose) -- cgit v1.2.3 From 6d7ca74ba60053ddd53636d5850d8ee97fb4ccf5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 11:39:12 +0200 Subject: gnu: 389-ds-base: Fix build. * gnu/packages/openldap.scm (389-ds-base)[inputs]: Add openssl. --- gnu/packages/openldap.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 4b615b5d32..962a9c8cfe 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -295,6 +295,7 @@ servers from Python programs.") ("nspr" ,nspr) ("nss" ,nss) ("openldap" ,openldap) + ("openssl" ,openssl) ; #included by net-snmp ("pcre" ,pcre) ("perl" ,perl) ("python" ,python) -- cgit v1.2.3 From 06e6b17bd7ab0258536c62c3639fba38134d84ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:14:58 +0200 Subject: gnu: python-pexpect: Use INVOKE. * gnu/packages/python.scm (python-pexpect)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 86ce70254d..5c6c79da88 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4550,7 +4550,7 @@ displayed.") ;; Why does it not work? Delete for now. (delete-file "tests/test_socket.py") #t)) - (replace 'check (lambda _ (zero? (system* "nosetests" "-v"))))))) + (replace 'check (lambda _ (invoke "nosetests" "-v")))))) (native-inputs `(("python-nose" ,python-nose) ("python-pytest" ,python-pytest) -- cgit v1.2.3 From 38e1095d8294e824444c8669765da2358c9b13bd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 03:38:24 +0200 Subject: gnu: python-wsgiproxy2: Update to 0.4.5. * gnu/packages/python-web.scm (python-wsgiproxy2): Update to 0.4.5. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 456134c1ce..2a7487202a 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1351,14 +1351,14 @@ Amazon Web Services (AWS) API.") (define-public python-wsgiproxy2 (package (name "python-wsgiproxy2") - (version "0.4.4") + (version "0.4.5") (source (origin (method url-fetch) (uri (pypi-uri "WSGIProxy2" version ".tar.gz")) (sha256 (base32 - "16532rjc94h3w74x52jfckf3yzsp8h6z34522jk4xgjy82hpnd7r")))) + "19d9dva282vfjs784i0zkxp078lxfz4h3f621z30ij9wbf5rba6a")))) (build-system python-build-system) (native-inputs `(("python-webtest" ,python-webtest))) -- cgit v1.2.3 From 35f903778a658f9778e945acb8b26d47ca240163 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 24 Sep 2018 13:59:35 +0200 Subject: gnu: Add guile-next. * gnu/packages/guile.scm (guile-next): Rewrite to refer to Guile 3.0. --- gnu/packages/guile.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c66183b9db..6d8ab71c78 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -317,7 +317,45 @@ without requiring the source code to be rewritten.") "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")))))) (define-public guile-next - (deprecated-package "guile-next" guile-2.2)) + ;; This is the upcoming Guile 3.0, with JIT support. + (let ((commit "a74b4a45fab1a78e34954bce5f031e8a9765f827") + (revision "0")) + (package + (inherit guile-2.2) + (name "guile-next") + (version (git-version "2.99" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/guile.git") + (commit commit))) + (sha256 + (base32 + "0kq6mabv7j4gdlwmpz3iaddv98sc7awkl2358sg8j50sg10yw8nx")) + (file-name (git-file-name name version)))) + (native-inputs + `(("autoconf", autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("gettext" ,gnu-gettext) + ("texinfo" ,texinfo) + ("flex" ,flex) + ,@(package-native-inputs guile-2.2))) + (arguments + (substitute-keyword-arguments (package-arguments guile-2.2) + ((#:phases phases '%standard-phases) + ;; XXX: The default 'bootstrap' phase tries to execute the + ;; ./bootstrap directory. + `(modify-phases ,phases + (replace 'bootstrap + (lambda _ + (patch-shebang "build-aux/git-version-gen") + (invoke "autoreconf" "-vfi"))) + (add-before 'check 'skip-version-test + (lambda _ + ;; Remove this test that's bound to fail. + (delete-file "test-suite/tests/version.test") + #t))))))))) (define (make-guile-readline guile) (package -- cgit v1.2.3 From a7a887718ad0624940d782f9e9b25d275a8f40d6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 24 Sep 2018 14:08:40 +0200 Subject: gnu: diffoscope: Update to 102. * gnu/packages/package-management.scm (diffoscope): Update to 102. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 5edfb5dffb..3bc8ac6073 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -568,13 +568,13 @@ transactions from C or Python.") (define-public diffoscope (package (name "diffoscope") - (version "100") + (version "102") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "0sh7g26i5ndpa8l7xq6rnijbi3jz5izjn0b98zcnm6wpgghszw48")))) + "0v2z98xx7n4viw12yq83flpb9ir5ahy1gn44pic0i3dam18xhcm6")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 2e3a6250f8b1232c7f49f84ee7320bcd9869508a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 24 Sep 2018 14:16:13 +0200 Subject: gnupg: Change default keyserver. * guix/gnupg.scm (%openpgp-key-server): Change default to "pool.sks-keyservers.net". --- guix/gnupg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/gnupg.scm b/guix/gnupg.scm index b30ce461b4..40feb44561 100644 --- a/guix/gnupg.scm +++ b/guix/gnupg.scm @@ -57,7 +57,7 @@ (define %openpgp-key-server ;; The default key server. Note that keys.gnupg.net appears to be ;; unreliable. - (make-parameter "pgp.mit.edu")) + (make-parameter "pool.sks-keyservers.net")) (define* (gnupg-verify sig file #:optional (keyring (current-keyring))) -- cgit v1.2.3 From cfe19684ea21feaee97d5c31e248b5a69921f784 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 25 Sep 2018 10:22:59 +0200 Subject: progress: 'progress-reporter-report!' takes any number of arguments. * guix/progress.scm (progress-reporter-report!): Accept an arbitrary number of arguments and pass them to REPORT. --- guix/progress.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/progress.scm b/guix/progress.scm index c9c3cd12a0..53aea1c56d 100644 --- a/guix/progress.scm +++ b/guix/progress.scm @@ -70,11 +70,11 @@ stopped." (($ start report stop) (start)))) -(define (progress-reporter-report! reporter) +(define (progress-reporter-report! reporter . args) "Low-level procedure to lead REPORTER to emit a report." (match reporter (($ start report stop) - (report)))) + (apply report args)))) (define (stop-progress-reporter! reporter) "Low-level procedure to stop REPORTER." -- cgit v1.2.3 From f85dbc4f3bcdc9f11cea9cca4feffee2e57a4412 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 25 Sep 2018 12:28:55 +0200 Subject: substitute: Progress port really closes underlying port. * guix/scripts/substitute.scm (progress-report-port): Use 'close-port' instead of 'close-connection'. Move 'stop' call first. --- guix/scripts/substitute.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 6d31dfdaa4..50c6a22064 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -837,8 +837,8 @@ REPORTER, which should be a object." (make-custom-binary-input-port "progress-port-proc" read! #f #f (lambda () - (close-connection port) - (stop))))))) + (stop) + (close-port port))))))) (define-syntax with-networking (syntax-rules () -- cgit v1.2.3 From 88268a34bc76c88c5c5e4ecc244924f3c8503d16 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 25 Sep 2018 18:44:38 +0200 Subject: pull: Try harder to use the host's X.509 certificates. * guix/scripts/pull.scm (honor-x509-certificates): Use commonly-found certificate bundles. --- guix/scripts/pull.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 10e1a99e54..39aebb18e2 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -180,9 +180,25 @@ Download and deploy the latest version of Guix.\n")) (define (honor-x509-certificates store) "Use the right X.509 certificates for Git checkouts over HTTPS." - (let ((file (getenv "SSL_CERT_FILE")) + ;; On distros such as CentOS 7, /etc/ssl/certs contains only a couple of + ;; files (instead of all the certificates) among which "ca-bundle.crt". On + ;; other distros /etc/ssl/certs usually contains the whole set of + ;; certificates along with "ca-certificates.crt". Try to choose the right + ;; one. + (let ((file (letrec-syntax ((choose + (syntax-rules () + ((_ file rest ...) + (let ((f file)) + (if (and f (file-exists? f)) + f + (choose rest ...)))) + ((_) + #f)))) + (choose (getenv "SSL_CERT_FILE") + "/etc/ssl/certs/ca-certificates.crt" + "/etc/ssl/certs/ca-bundle.crt"))) (directory (or (getenv "SSL_CERT_DIR") "/etc/ssl/certs"))) - (if (or (and file (file-exists? file)) + (if (or file (and=> (stat directory #f) (lambda (st) (> (stat:nlink st) 2)))) -- cgit v1.2.3 From 280fc8351230a8fea086d9bbce919ba8395f312c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 15 Sep 2018 11:53:40 +0200 Subject: git-download: Don't assume the working directory is the parent of ".git". This makes it do the right thing w.r.t. git worktrees. * guix/git-download.scm (git-file-list): Use REPOSITORY-WORKING-DIRECTORY to locate checkout. Rename from "top" to "workdir". --- guix/git-download.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/guix/git-download.scm b/guix/git-download.scm index 24cf11be5e..fa94fad8f8 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -156,22 +156,23 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." The result is similar to that of the 'git ls-files' command, except that it also includes directories, not just regular files. The returned file names are relative to DIRECTORY, which is not necessarily the root of the checkout." - (let* ((directory (canonicalize-path directory)) + (let* (;; 'repository-working-directory' always returns a trailing "/", + ;; so add one here to ease the comparisons below. + (directory (string-append (canonicalize-path directory) "/")) (dot-git (repository-discover directory)) - (top (dirname dot-git)) (repository (repository-open dot-git)) + ;; XXX: This procedure is mistakenly private in Guile-Git 0.1.0. + (workdir ((@@ (git repository) repository-working-directory) + repository)) (head (repository-head repository)) (oid (reference-target head)) (commit (commit-lookup repository oid)) (tree (commit-tree commit)) (files (tree-list tree))) (repository-close! repository) - (if (string=? top directory) + (if (string=? workdir directory) files - (let ((relative (string-append - (string-drop directory - (+ 1 (string-length top))) - "/"))) + (let ((relative (string-drop directory (string-length workdir)))) (filter-map (lambda (file) (and (string-prefix? relative file) (string-drop file (string-length relative)))) -- cgit v1.2.3 From 52b87855ea64f02a254f6b510346dfb0e20dd5a7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 02:07:56 +0200 Subject: gnu: enchant: Update home page. * gnu/packages/enchant.scm (enchant)[home-page]: Set to URL mentioned on the legacy home page. --- gnu/packages/enchant.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index 8b2796d0e2..1c6506ebf1 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -57,5 +57,5 @@ Enchant steps in to provide uniformity and conformity on top of these libraries, and implement certain features that may be lacking in any individual provider library. Everything should \"just work\" for any and every definition of \"just working\".") - (home-page "http://www.abisource.com/projects/enchant") + (home-page "https://abiword.github.io/enchant/") (license lgpl2.1+))) -- cgit v1.2.3 From 18ef85b64a3433bccf8dc8b32d338de91fd85a8a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 03:47:45 +0200 Subject: gnu: enchant: Don't build libenchant.a. * gnu/packages/enchant.scm (enchant)[arguments]: Add #:configure-flags. --- gnu/packages/enchant.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index 1c6506ebf1..b5e9084a42 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -40,6 +40,8 @@ (base32 "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g")))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (inputs `(("aspell" ,aspell) ;; Currently, the only supported backend in Guix ("glib" ,glib))) ;; is aspell. (This information might be old) -- cgit v1.2.3 From 9a59b29411e2f007a6ba32b88d3b6f50bd6c1f45 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 17:15:00 +0200 Subject: gnu: enchant: Propagate Glib. * gnu/packages/enchant.scm (enchant)[inputs]: Move GLIB ... [propagated-inputs]: ... here. New field. --- gnu/packages/enchant.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index b5e9084a42..c3f75ccf2e 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -43,8 +43,10 @@ (arguments '(#:configure-flags '("--disable-static"))) (inputs - `(("aspell" ,aspell) ;; Currently, the only supported backend in Guix - ("glib" ,glib))) ;; is aspell. (This information might be old) + `(("aspell" ,aspell))) ;; Currently, the only supported backend in Guix + (propagated-inputs ;; is aspell. (This information might be old) + ;; Required by enchant.pc. + `(("glib" ,glib))) (native-inputs `(("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From c1d59b3c2a88427aa268a405116a01958db84a5b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 04:03:23 +0200 Subject: gnu: enchant: Update to 2.2.3. * gnu/packages/enchant.scm (enchant): Update to 2.2.3. [arguments]: Add "--enable-relocatable" to #:configure-flags. [native-inputs]: Add UNITTEST-CPP. (enchant-1.6): New public variable. * gnu/packages/fcitx.scm (fcitx)[inputs]: Change ENCHANT to ENCHANT-1.6. * gnu/packages/gnome.scm (gspell): Likewise. * gnu/packages/mate.scm (pluma): Likewise. * gnu/packages/gtk.scm (gtkspell3)[propagated-inputs]: Likewise. [inputs]: Remove duplicate ENCHANT. --- gnu/packages/enchant.scm | 50 ++++++++++++++++++++++++++++++++++-------------- gnu/packages/fcitx.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/gtk.scm | 5 ++--- gnu/packages/mate.scm | 2 +- 5 files changed, 41 insertions(+), 20 deletions(-) diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index c3f75ccf2e..0392a709e2 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Marek Benc +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,29 +20,32 @@ (define-module (gnu packages enchant) #:use-module (gnu packages) #:use-module (gnu packages aspell) + #:use-module (gnu packages check) #:use-module (gnu packages glib) #:use-module (gnu packages pkg-config) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module (guix licenses)) + #:use-module (guix licenses) + #:use-module (srfi srfi-1)) (define-public enchant (package (name "enchant") - (version "1.6.0") - (source - (origin - (method url-fetch) - (uri - (string-append "http://www.abisource.com/downloads/" name "/" version - "/" name "-" version ".tar.gz")) - (sha256 - (base32 "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g")))) - + (version "2.2.3") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/AbiWord/enchant/releases" + "/download/v" version "/enchant-" + version ".tar.gz")) + (sha256 + (base32 + "0v87p1ls0gym95qirijpclk650sjbkcjjl6ssk059zswcwaykn5b")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-static"))) + '(#:configure-flags '("--disable-static" + ;; Tests require a relocatable build. + "--enable-relocatable"))) (inputs `(("aspell" ,aspell))) ;; Currently, the only supported backend in Guix (propagated-inputs ;; is aspell. (This information might be old) @@ -49,8 +53,8 @@ `(("glib" ,glib))) (native-inputs `(("glib:bin" ,glib "bin") - ("pkg-config" ,pkg-config))) - + ("pkg-config" ,pkg-config) + ("unittest-cpp" ,unittest-cpp))) (synopsis "Multi-backend spell-checking library wrapper") (description "On the surface, Enchant appears to be a generic spell checking library. @@ -63,3 +67,21 @@ library. Everything should \"just work\" for any and every definition of \"just working\".") (home-page "https://abiword.github.io/enchant/") (license lgpl2.1+))) + +;; Some packages are not ready for the 2.x API yet, so we keep this version +;; around. The library and executables of Enchant 2 have been designed not to +;; conflict with 1.x, so it's OK if both end up in the same profile. +(define-public enchant-1.6 + (package + (inherit enchant) + (version "1.6.0") + (arguments '(#:configure-flags '("--disable-static"))) + (native-inputs (alist-delete "unittest-cpp" + (package-native-inputs enchant))) + (source (origin + (method url-fetch) + (uri (string-append "http://www.abisource.com/downloads/enchant/" + version "/enchant-" version ".tar.gz")) + (sha256 + (base32 + "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g")))))) diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm index bcd5f12dd1..b05d9b7146 100644 --- a/gnu/packages/fcitx.scm +++ b/gnu/packages/fcitx.scm @@ -75,7 +75,7 @@ ("pkg-config" ,pkg-config))) (inputs `(("dbus" ,dbus) - ("enchant" ,enchant) + ("enchant" ,enchant-1.6) ("gettext" ,gettext-minimal) ("gtk2" ,gtk+-2) ("gtk3" ,gtk+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1ca354a432..8d684cd36d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6969,7 +6969,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).") ("aspell-dict-en" ,aspell-dict-en) ("xorg-server" ,xorg-server))) (propagated-inputs - `(("enchant" ,enchant))) ; enchant.pc is required by gspell-1.pc + `(("enchant" ,enchant-1.6))) ; enchant.pc is required by gspell-1.pc (home-page "https://wiki.gnome.org/Projects/gspell") (synopsis "GNOME's alternative spell checker") (description diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0b85a1723f..76e64b36bc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1582,12 +1582,11 @@ glass artworks done by Venicians glass blowers.") `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("enchant" ,enchant) - ("gobject-introspection" ,gobject-introspection) + `(("gobject-introspection" ,gobject-introspection) ("gtk+" ,gtk+) ("pango" ,pango))) (propagated-inputs - `(("enchant" ,enchant))) ; gtkspell3-3.0.pc refers to it. + `(("enchant" ,enchant-1.6))) ;gtkspell3-3.0.pc refers to it (home-page "http://gtkspell.sourceforge.net") (synopsis "Spell-checking addon for GTK's TextView widget") (description diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 88f64fdb66..5919c714ee 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -1411,7 +1411,7 @@ can be used as backgrounds in the MATE Desktop environment.") (inputs `(("atk" ,atk) ("cairo" ,cairo) - ("enchant" ,enchant) + ("enchant" ,enchant-1.6) ("glib" ,glib) ("gtk+" ,gtk+) ("gtksourceview" ,gtksourceview) -- cgit v1.2.3 From 9b1bb75781118b1460563171aae503aa9ba702a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 28 Aug 2018 05:49:30 +0200 Subject: gnu: gspell: Update to 1.8.1. * gnu/packages/gnome.scm (gspell): Update to 1.8.1. [propagated-inputs]: Change ENCHANT-1.6 to ENCHANT. --- 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 8d684cd36d..1e8522c500 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6927,7 +6927,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).") (define-public gspell (package (name "gspell") - (version "1.4.2") + (version "1.8.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6935,7 +6935,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).") name "-" version ".tar.xz")) (sha256 (base32 - "1683vyyfq3q0ph665jj6id8hnlyid4qxzmqiwpv97gmz8zksg6x5")) + "1rdv873ixhwr15jwgc2z6k6y0hj353fqnwsy7zkh0c30qwiiv6l1")) (patches (search-patches "gspell-dash-test.patch")))) (build-system glib-or-gtk-build-system) (arguments @@ -6969,7 +6969,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).") ("aspell-dict-en" ,aspell-dict-en) ("xorg-server" ,xorg-server))) (propagated-inputs - `(("enchant" ,enchant-1.6))) ; enchant.pc is required by gspell-1.pc + `(("enchant" ,enchant))) ;enchant.pc is required by gspell-1.pc (home-page "https://wiki.gnome.org/Projects/gspell") (synopsis "GNOME's alternative spell checker") (description -- cgit v1.2.3 From a0c9ba1d64be641192a22de3284aee2acb69214e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Sep 2018 16:56:15 +0200 Subject: gnu: webkitgtk: Remove obsolete phase. * gnu/packages/webkit.scm (webkitgtk)[arguments]: Remove #:phases. (webkitgtk-2.22)[arguments]: Don't reference removed phase. --- gnu/packages/webkit.scm | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 976411dbbc..c5238a8a65 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -87,23 +87,7 @@ ;; XXX Disable WOFF2 ‘web fonts’. These were never ;; supported in our previous builds. Enabling them ;; requires building libwoff2 and possibly woff2dec. - "-DUSE_WOFF2=OFF") - #:phases - (modify-phases %standard-phases - (add-after - 'set-paths 'add-gst-plugins-base-include-path - (lambda* (#:key inputs #:allow-other-keys) - ;; XXX Work around a problem in the build system, which neglects - ;; to add -I for gst-plugins-base when compiling - ;; Source/WebKit2/UIProcess/WebPageProxy.cpp, apparently assuming - ;; that it will be in the same directory as gstreamer's header - ;; files. - (setenv "CPATH" - (string-append (getenv "C_INCLUDE_PATH") - ":" - (assoc-ref inputs "gst-plugins-base") - "/include/gstreamer-1.0")) - #t))))) + "-DUSE_WOFF2=OFF"))) (native-inputs `(("bison" ,bison) ("gettext" ,gettext-minimal) @@ -171,14 +155,12 @@ HTML/CSS applications to full-fledged web browsers.") `(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer ,@(package-native-inputs webkitgtk))) (arguments - (substitute-keyword-arguments (package-arguments webkitgtk) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'add-gst-plugins-base-include-path - 'work-around-gcc-7-include-path-issue - ;; FIXME: Work around a problem with gcc-7 includes (see - ;; ). - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)))))))) + `(#:phases (modify-phases %standard-phases + (add-before 'configure 'work-around-gcc-7-include-path-issue + ;; FIXME: Work around a problem with gcc-7 includes (see + ;; ). + (lambda _ + (unsetenv "C_INCLUDE_PATH") + (unsetenv "CPLUS_INCLUDE_PATH") + #t))) + ,@(package-arguments webkitgtk))))) -- cgit v1.2.3 From 020c4ef18e2a1ab877de803d697ca96acfa46624 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 24 Sep 2018 14:43:53 +0200 Subject: gnu: node: Delete expired tests. * gnu/packages/node.scm (node)[arguments]: Delete tests for which the TLS certificates have expired. --- gnu/packages/node.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index d1de7a536c..de7d59c6b5 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -125,6 +125,14 @@ "test/sequential/test-child-process-emfile.js" "test/sequential/test-benchmark-child-process.js" "test/sequential/test-http-regr-gh-2928.js")) + + ;; These tests have an expiry date: they depend on the validity of + ;; TLS certificates that are bundled with the source. We want this + ;; package to be reproducible forever, so remove those. + ;; TODO: Regenerate certs instead. + (for-each delete-file + '("test/parallel/test-tls-passphrase.js" + "test/parallel/test-tls-server-verify.js")) #t)) (replace 'configure ;; Node's configure script is actually a python script, so we can't -- cgit v1.2.3 From e789b85841aa013c4f6bd18f4dff99b30bf0b3a4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Sep 2018 13:12:23 +0200 Subject: gnu: Add Node LTS. * gnu/packages/node.scm (node)[arguments]: Adjust 'patch-files' phase to ignore missing files. (node-lts): New public variable. --- gnu/packages/node.scm | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index de7d59c6b5..b525804bdb 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Ludovic Courtès ;;; Copyright © 2017 Mike Gerwitz ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,6 +87,14 @@ (modify-phases %standard-phases (add-before 'configure 'patch-files (lambda* (#:key inputs #:allow-other-keys) + + ;; This phase is inherited by Node LTS, which does not have all + ;; the files listed here. Use this helper for convenience. + (define (delete-if-exists file) + (if (file-exists? file) + (delete-file file) + '())) + ;; Fix hardcoded /bin/sh references. (substitute* '("lib/child_process.js" "lib/internal/v8_prof_polyfill.js" @@ -103,7 +112,7 @@ ;; FIXME: These tests depend on being able to install eslint. ;; See https://github.com/nodejs/node/issues/17098. - (for-each delete-file + (for-each delete-if-exists '("test/parallel/test-eslint-alphabetize-errors.js" "test/parallel/test-eslint-buffer-constructor.js" "test/parallel/test-eslint-documented-errors.js" @@ -111,7 +120,7 @@ ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. - (for-each delete-file + (for-each delete-if-exists '("test/async-hooks/test-ttywrap.readstream.js" "test/parallel/test-util-inspect.js" "test/parallel/test-v8-serdes.js" @@ -130,7 +139,7 @@ ;; TLS certificates that are bundled with the source. We want this ;; package to be reproducible forever, so remove those. ;; TODO: Regenerate certs instead. - (for-each delete-file + (for-each delete-if-exists '("test/parallel/test-tls-passphrase.js" "test/parallel/test-tls-server-verify.js")) #t)) @@ -188,3 +197,16 @@ devices.") (home-page "https://nodejs.org/") (license expat) (properties '((timeout . 3600))))) ; 1 h + +(define-public node-lts + (package + (inherit node) + (name "node-lts") + (version "8.12.0") + (source (origin + (inherit (package-source node)) + (uri (string-append "https://nodejs.org/dist/v" version + "/node-v" version ".tar.xz")) + (sha256 + (base32 + "16j1rrxkhmvpcw689ndw1raql1gz4jqn7n82z55zn63c05cgz7as")))))) -- cgit v1.2.3 From 5f33e9063b9b047801d0206e7a74eee8bf6fc52d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 23:31:10 +0200 Subject: gnu: varnish: Use absolute file name of "rm". * gnu/packages/web.scm (varnish)[arguments]: Rename 'patch-bin-sh-phase to 'use-absolute-file-names and add substitution. --- gnu/packages/web.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b6bee57f9f..26c2e9128a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5019,12 +5019,14 @@ deployments.") "--localstatedir=/var") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-/bin/sh + (add-after 'unpack 'use-absolute-file-names (lambda _ (substitute* '("bin/varnishtest/vtc_varnish.c" "bin/varnishtest/vtc_process.c" "bin/varnishd/mgt/mgt_vcc.c") (("/bin/sh") (which "sh"))) + (substitute* "bin/varnishd/mgt/mgt_shmem.c" + (("rm -rf") (string-append (which "rm") " -rf"))) #t)) (add-before 'install 'patch-Makefile (lambda _ -- cgit v1.2.3 From 3b97a1779f3b65d582b8edc8c154b6414314b946 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 26 Aug 2018 23:33:48 +0200 Subject: services: Add Varnish service. * gnu/services/web.scm (): New record type. (%varnish-accounts, %varnish-service-type): New variables. (varnish-shepherd-service): New procedure. * gnu/tests/web.scm (%varnish-vcl, %varnish-os): New variables. (%test-varnish): New test. * doc/guix.texi (Web Services): Document it. --- doc/guix.texi | 80 +++++++++++++++++++++++++++++++++++++++++++ gnu/services/web.scm | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++- gnu/tests/web.scm | 41 ++++++++++++++++++++++ 3 files changed, 216 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 76ec718b07..6b4b06f46d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -16888,6 +16888,86 @@ body of a named location block cannot contain location blocks. @end table @end deftp +@subsubheading Varnish Cache +@cindex Varnish +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. + +@defvr {Scheme Variable} varnish-service-type +Service type for the Varnish daemon. +@end defvr + +@deftp {Data Type} varnish-configuration +Data type representing the @code{varnish} service configuration. +This type has the following parameters: + +@table @asis +@item @code{package} (default: @code{varnish}) +The Varnish package to use. + +@item @code{name} (default: @code{"default"}) +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. + +Pass the @code{-n} argument to other Varnish programs to connect to the +named instance, e.g. @command{varnishncsa -n default}. + +@item @code{backend} (default: @code{"localhost:8080"}) +The backend to use. This option has no effect if @code{vcl} is set. + +@item @code{vcl} (default: #f) +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. + +@c Varnish does not support HTTPS, so keep this URL to avoid confusion. +For example, to mirror @url{http://www.gnu.org,www.gnu.org} with VCL you +can do something along these lines: + +@example +(define %gnu-mirror + (plain-file + "gnu.vcl" + "vcl 4.1; +backend gnu @{ .host = "www.gnu.org"; @}")) + +(operating-system + ... + (services (cons (service varnish-service-type + (varnish-configuration + (listen '(":80")) + (vcl %gnu-mirror))) + %base-services))) +@end example + +The configuration of an already running Varnish instance can be inspected +and changed using the @command{varnishadm} program. + +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. + +@item @code{listen} (default: @code{'("localhost:80")}) +List of addresses Varnish will listen on. + +@item @code{storage} (default: @code{'("malloc,128m")}) +List of storage backends that will be available in VCL. + +@item @code{parameters} (default: @code{'()}) +List of run-time parameters in the form @code{'(("parameter" . "value"))}. + +@item @code{extra-options} (default: @code{'()}) +Additional arguments to pass to the @command{varnishd} process. + +@end table +@end deftp + +@subsubheading FastCGI @cindex fastcgi @cindex fcgiwrap FastCGI is an interface between the front-end and the back-end of a web diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 1c38e7d8d3..1edb1f4d34 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2017 Christopher Baines +;;; Copyright © 2018 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -190,7 +191,21 @@ tailon-configuration-config-file tailon-configuration-package - tailon-service-type)) + tailon-service-type + + + varnish-configuration + varnish-configuration? + varnish-configuration-package + varnish-configuration-name + varnish-configuration-backend + varnish-configuration-vcl + varnish-configuration-listen + varnish-configuration-storage + varnish-configuration-parameters + varnish-configuration-extra-options + + varnish-service-type)) ;;; Commentary: ;;; @@ -1162,3 +1177,82 @@ files.") (files (append (tailon-configuration-file-files old-config-file) files)))))))) (default-value (tailon-configuration)))) + + +;;; +;;; Varnish +;;; + +(define-record-type* + varnish-configuration make-varnish-configuration + varnish-configuration? + (package varnish-configuration-package ; + (default varnish)) + (name varnish-configuration-name ;string + (default "default")) + (backend varnish-configuration-backend ;string + (default "localhost:8080")) + (vcl varnish-configuration-vcl ;#f | + (default #f)) + (listen varnish-configuration-listen ;list of strings + (default '("localhost:80"))) + (storage varnish-configuration-storage ;list of strings + (default '("malloc,128m"))) + (parameters varnish-configuration-parameters ;list of string pairs + (default '())) + (extra-options varnish-configuration-extra-options ;list of strings + (default '()))) + +(define %varnish-accounts + (list (user-group + (name "varnish") + (system? #t)) + (user-account + (name "varnish") + (group "varnish") + (system? #t) + (comment "Varnish Cache User") + (home-directory "/var/varnish") + (shell (file-append shadow "/sbin/nologin"))))) + +(define varnish-shepherd-service + (match-lambda + (($ package name backend vcl listen storage + parameters extra-options) + (list (shepherd-service + (provision (list (symbol-append 'varnish- (string->symbol name)))) + (documentation (string-append "The Varnish Web Accelerator" + " (" name ")")) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/varnishd") + "-n" #$name + #$@(if vcl + #~("-f" #$vcl) + #~("-b" #$backend)) + #$@(append-map (lambda (a) (list "-a" a)) listen) + #$@(append-map (lambda (s) (list "-s" s)) storage) + #$@(append-map (lambda (p) + (list "-p" (format #f "~a=~a" + (car p) (cdr p)))) + parameters) + #$@extra-options) + ;; Varnish will drop privileges to the "varnish" user when + ;; it exists. Not passing #:user here allows the service + ;; to bind to ports < 1024. + #:pid-file (if (string-prefix? "/" #$name) + (string-append #$name "/_.pid") + (string-append "/var/varnish/" #$name "/_.pid")))) + (stop #~(make-kill-destructor))))))) + +(define varnish-service-type + (service-type + (name 'varnish) + (description "Run the Varnish cache server.") + (extensions + (list (service-extension account-service-type + (const %varnish-accounts)) + (service-extension shepherd-root-service-type + varnish-shepherd-service))) + (default-value + (varnish-configuration)))) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 45fcb668fb..bcc919137b 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -32,6 +32,7 @@ #:use-module (guix store) #:export (%test-httpd %test-nginx + %test-varnish %test-php-fpm %test-hpcguix-web %test-tailon)) @@ -167,6 +168,46 @@ HTTP-PORT." (value (run-webserver-test name %nginx-os #:log-file "/var/log/nginx/access.log")))) + +;;; +;;; Varnish +;;; + +(define %varnish-vcl + (mixed-text-file + "varnish-test.vcl" + "vcl 4.0; +backend dummy { .host = \"127.1.1.1\"; } +sub vcl_recv { return(synth(200, \"OK\")); } +sub vcl_synth { + synthetic(\"" %index.html-contents "\"); + set resp.http.Content-Type = \"text/plain\"; + return(deliver); +}")) + +(define %varnish-os + (simple-operating-system + (dhcp-client-service) + ;; Pretend to be a web server that serves %index.html-contents. + (service varnish-service-type + (varnish-configuration + (name "/tmp/server") + ;; Use a small VSL buffer to fit in the test VM. + (parameters '(("vsl_space" . "4M"))) + (vcl %varnish-vcl))) + ;; Proxy the "server" using the builtin configuration. + (service varnish-service-type + (varnish-configuration + (parameters '(("vsl_space" . "4M"))) + (backend "localhost:80") + (listen '(":8080")))))) + +(define %test-varnish + (system-test + (name "varnish") + (description "Test the Varnish Cache server.") + (value (run-webserver-test "varnish-default" %varnish-os)))) + ;;; ;;; PHP-FPM -- cgit v1.2.3 From ffec356a29a58d97ec34e1152aa3136e78471dc6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 Sep 2018 14:45:34 +0200 Subject: gnu: node: Build against libuv@1.19. * gnu/packages/libevent.scm (libuv-1.19): New public variable. * gnu/packages/node.scm (node)[inputs]: Change LIBUV to LIBUV-1.19. --- gnu/packages/libevent.scm | 13 +++++++++++++ gnu/packages/node.scm | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index bc7f6c670d..2de29707ca 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -152,6 +152,19 @@ resolution, asynchronous file system operations, and threading primitives.") ;; details. Documentation is CC-BY 4.0 as of 1.12.0; see 'LICENSE-docs'. (license (list expat cc-by4.0)))) +;; This version is required for Node versions < 10. +(define-public libuv-1.19 + (package + (inherit libuv) + (version "1.19.2") + (source (origin + (method url-fetch) + (uri (string-append "https://dist.libuv.org/dist/v" version + "/libuv-v" version ".tar.gz")) + (sha256 + (base32 + "1msk9ac1z69whww88ibrwjqkd1apdla6l77cm2fwy5kigq0z5g3w")))))) + (define-public perl-anyevent (package (name "perl-anyevent") diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index b525804bdb..a0221601dd 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -184,7 +184,7 @@ `(("c-ares" ,c-ares) ("http-parser" ,http-parser) ("icu4c" ,icu4c) - ("libuv" ,libuv) + ("libuv" ,libuv-1.19) ("nghttp2" ,nghttp2 "lib") ("openssl" ,openssl) ("zlib" ,zlib))) -- cgit v1.2.3 From 257e3247910610fe24ae1b86f38e85552d53e48c Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 23 Sep 2018 04:46:59 -0400 Subject: gnu: icecat: Unbundle graphite2 and harfbuzz. * gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch: New file. * gnu/packages/patches/icecat-use-system-graphite2.patch, gnu/packages/patches/icecat-use-system-harfbuzz.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Update accordingly. * gnu/packages/gnuzilla.scm (icecat)[source]: Add new patch. Delete bundled graphite2 and harfbuzz in snippet. [inputs]: Add graphite2 and harfbuzz. [arguments]: Add --with-system-{graphite2,harfbuzz} to configure flags. --- gnu/local.mk | 3 +- gnu/packages/gnuzilla.scm | 19 +- .../icecat-use-system-graphite2+harfbuzz.patch | 226 +++++++++++++++++ .../patches/icecat-use-system-graphite2.patch | 248 ------------------ .../patches/icecat-use-system-harfbuzz.patch | 279 --------------------- 5 files changed, 236 insertions(+), 539 deletions(-) create mode 100644 gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch delete mode 100644 gnu/packages/patches/icecat-use-system-graphite2.patch delete mode 100644 gnu/packages/patches/icecat-use-system-harfbuzz.patch diff --git a/gnu/local.mk b/gnu/local.mk index fe2b573dd5..35e78e7816 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -811,8 +811,7 @@ dist_patch_DATA = \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icecat-CVE-2018-12383.patch \ - %D%/packages/patches/icecat-use-system-graphite2.patch \ - %D%/packages/patches/icecat-use-system-harfbuzz.patch \ + %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 653cee93d5..ad83444e3c 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -495,9 +495,8 @@ security standards.") "0lqx7g79x15941rhjr3qsfwsny6vzc7d7abdmvjy6jjbqkqlc1zl")) (patches (list - (search-patch "icecat-avoid-bundled-libraries.patch") - ;; FIXME (search-patch "icecat-use-system-harfbuzz.patch") - ;; FIXME (search-patch "icecat-use-system-graphite2.patch") + (search-patch "icecat-avoid-bundled-libraries.patch") + (search-patch "icecat-use-system-graphite2+harfbuzz.patch") (mozilla-patch "icecat-CVE-2018-12385.patch" "80a4a7ef2813" "1vgcbimpnfjqj934v0cryq1g13xac3wfmd4jyhcb5s60x8xyssf5") (search-patch "icecat-CVE-2018-12383.patch") (mozilla-patch "icecat-bug-1489744.patch" "6546ee839d30" "11mhvj77r789b428bfxqq5wdx8yr7lbrdjzr8qjj6fw197pldn51"))) @@ -535,8 +534,8 @@ security standards.") "media/libvpx" "security/nss" ;; UNBUNDLE-ME "gfx/cairo" - ;; UNBUNDLE-ME "gfx/harfbuzz" - ;; UNBUNDLE-ME "gfx/graphite2" + "gfx/harfbuzz" + "gfx/graphite2" "js/src/ctypes/libffi" "db/sqlite3")) ;; Delete .pyc files, typically present in icecat source tarballs @@ -557,10 +556,10 @@ security standards.") ("glib" ,glib) ("gtk+" ,gtk+) ("gtk+-2" ,gtk+-2) - ;; UNBUNDLE-ME ("graphite2" ,graphite2) + ("graphite2" ,graphite2) ("pango" ,pango) ("freetype" ,freetype) - ;; UNBUNDLE-ME ("harfbuzz" ,harfbuzz) + ("harfbuzz" ,harfbuzz) ("hunspell" ,hunspell) ("libcanberra" ,libcanberra) ("libgnome" ,libgnome) @@ -643,8 +642,8 @@ security standards.") "--with-system-icu" "--with-system-nspr" "--with-system-nss" - ;; UNBUNDLE-ME "--with-system-harfbuzz" - ;; UNBUNDLE-ME "--with-system-graphite2" + "--with-system-harfbuzz" + "--with-system-graphite2" "--enable-system-pixman" ;; UNBUNDLE-ME "--enable-system-cairo" "--enable-system-ffi" @@ -697,7 +696,7 @@ security standards.") all))) #t)) (add-after 'patch-source-shebangs 'patch-cargo-checksums - (lambda* _ + (lambda _ (use-modules (guix build cargo-build-system)) (let ((null-file "/dev/null") (null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) diff --git a/gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch b/gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch new file mode 100644 index 0000000000..94c211b797 --- /dev/null +++ b/gnu/packages/patches/icecat-use-system-graphite2+harfbuzz.patch @@ -0,0 +1,226 @@ +Allow building against system-wide graphite2/harfbuzz. +See +Based on: + https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-bug847568?revision=472833&view=co +Modified for use with patch -p1, and to apply cleanly to GNU IceCat. + +--- icecat-60.2.0/config/system-headers.mozbuild ++++ icecat-60.2.0/config/system-headers.mozbuild +@@ -1311,6 +1311,19 @@ + 'pixman.h', + ] + ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++ system_headers += [ ++ 'graphite2/Font.h', ++ 'graphite2/Segment.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ system_headers += [ ++ 'harfbuzz/hb-glib.h', ++ 'harfbuzz/hb-ot.h', ++ 'harfbuzz/hb.h', ++ ] ++ + if CONFIG['MOZ_SYSTEM_LIBVPX']: + system_headers += [ + 'vpx_mem/vpx_mem.h', +--- icecat-60.2.0/dom/base/moz.build ++++ icecat-60.2.0/dom/base/moz.build +@@ -474,6 +474,9 @@ + if CONFIG['MOZ_X11']: + CXXFLAGS += CONFIG['TK_CFLAGS'] + ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + GENERATED_FILES += [ + 'PropertyUseCounterMap.inc', + 'UseCounterList.h', +--- icecat-60.2.0/gfx/graphite2/moz-gr-update.sh ++++ icecat-60.2.0/gfx/graphite2/moz-gr-update.sh +@@ -1,6 +1,7 @@ + #!/bin/bash + + # Script used to update the Graphite2 library in the mozilla source tree ++# and bump version for --with-system-graphite2 + + # This script lives in gfx/graphite2, along with the library source, + # but must be run from the top level of the mozilla-central tree. +@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla + #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; + #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; + ++# chase version for --with-system-graphite2 ++perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \ ++ if /GR2_VERSION_REQUIRE/" old-configure.in ++ + # summarize what's been touched + echo Updated to $RELEASE. + echo Here is what changed in the gfx/graphite2 directory: + echo + +-hg stat gfx/graphite2 ++hg stat old-configure.in gfx/graphite2 + + echo + echo If gfx/graphite2/src/files.mk has changed, please make corresponding +--- icecat-60.2.0/gfx/moz.build ++++ icecat-60.2.0/gfx/moz.build +@@ -10,6 +10,12 @@ with Files('**'): + if CONFIG['MOZ_TREE_CAIRO']: + DIRS += ['cairo'] + ++if not CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++ DIRS += ['graphite2/src' ] ++ ++if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ DIRS += ['harfbuzz/src'] ++ + DIRS += [ + '2d', + 'ycbcr', +@@ -18,8 +24,6 @@ DIRS += [ + 'qcms', + 'gl', + 'layers', +- 'graphite2/src', +- 'harfbuzz/src', + 'ots/src', + 'thebes', + 'ipc', +--- icecat-60.2.0/gfx/skia/generate_mozbuild.py ++++ icecat-60.2.0/gfx/skia/generate_mozbuild.py +@@ -148,6 +148,9 @@ + '-Wno-unused-private-field', + ] + ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): + CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] + CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] +--- icecat-60.2.0/gfx/skia/moz.build ++++ icecat-60.2.0/gfx/skia/moz.build +@@ -822,6 +822,9 @@ + '-Wno-unused-private-field', + ] + ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): + CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] + CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] +--- icecat-60.2.0/gfx/thebes/moz.build ++++ icecat-60.2.0/gfx/thebes/moz.build +@@ -272,7 +272,13 @@ + + LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] + +-DEFINES['GRAPHITE2_STATIC'] = True ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] ++else: ++ DEFINES['GRAPHITE2_STATIC'] = True ++ ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + + if CONFIG['CC_TYPE'] == 'clang': + # Suppress warnings from Skia header files. +--- icecat-60.2.0/intl/unicharutil/util/moz.build ++++ icecat-60.2.0/intl/unicharutil/util/moz.build +@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [ + 'nsUnicodeProperties.cpp', + ] + ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ++ + FINAL_LIBRARY = 'xul' +--- icecat-60.2.0/netwerk/dns/moz.build ++++ icecat-60.2.0/netwerk/dns/moz.build +@@ -76,3 +76,6 @@ + + if CONFIG['CC_TYPE'] in ('clang', 'gcc'): + CXXFLAGS += ['-Wno-error=shadow'] ++ ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] +--- icecat-60.2.0/old-configure.in ++++ icecat-60.2.0/old-configure.in +@@ -3995,6 +3995,27 @@ + AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) + + dnl ======================================================== ++dnl Check for graphite2 ++dnl ======================================================== ++if test -n "$MOZ_SYSTEM_GRAPHITE2"; then ++ dnl graphite2.pc has bogus version, check manually ++ _SAVE_CFLAGS=$CFLAGS ++ CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS" ++ AC_TRY_COMPILE([ #include ++ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \ ++ ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \ ++ * 100 + GR2_VERSION_BUGFIX >= \ ++ (major) * 10000 + (minor) * 100 + (bugfix) ) ++ ], [ ++ #if !GR2_VERSION_REQUIRE(1,3,10) ++ #error "Insufficient graphite2 version." ++ #endif ++ ], [], ++ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])]) ++ CFLAGS=$_SAVE_CFLAGS ++fi ++ ++dnl ======================================================== + dnl Check for pixman and cairo + dnl ======================================================== + +--- icecat-60.2.0/toolkit/library/moz.build ++++ icecat-60.2.0/toolkit/library/moz.build +@@ -235,6 +235,12 @@ + if CONFIG['MOZ_SYSTEM_PNG']: + OS_LIBS += CONFIG['MOZ_PNG_LIBS'] + ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: ++ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] ++ + if CONFIG['MOZ_SYSTEM_HUNSPELL']: + OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] + +--- icecat-60.2.0/toolkit/moz.configure ++++ icecat-60.2.0/toolkit/moz.configure +@@ -1051,6 +1051,26 @@ + add_old_configure_assignment('FT2_CFLAGS', + ft2_info.cflags) + ++# Graphite2 ++# ============================================================== ++option('--with-system-graphite2', ++ help="Use system graphite2 (located with pkgconfig)") ++ ++system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2', ++ when='--with-system-graphite2') ++ ++set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True)) ++ ++# HarfBuzz ++# ============================================================== ++option('--with-system-harfbuzz', ++ help="Use system harfbuzz (located with pkgconfig)") ++ ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.7.4', ++ when='--with-system-harfbuzz') ++ ++set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) ++ + # Mortar + # ============================================================== + option('--enable-mortar', help='Enable mortar extension') diff --git a/gnu/packages/patches/icecat-use-system-graphite2.patch b/gnu/packages/patches/icecat-use-system-graphite2.patch deleted file mode 100644 index 188fba2bc9..0000000000 --- a/gnu/packages/patches/icecat-use-system-graphite2.patch +++ /dev/null @@ -1,248 +0,0 @@ -Copied from -See - -diff --git a/config/Makefile.in b/config/Makefile.in ---- a/config/Makefile.in -+++ b/config/Makefile.in -@@ -36,16 +36,17 @@ ifdef WRAP_SYSTEM_INCLUDES - export-preqs = \ - $(call mkdir_deps,system_wrappers) \ - $(NULL) - - export:: $(export-preqs) - $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \ - -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \ - -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \ -+ -DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \ - -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \ - -DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \ - -DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \ - -DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \ - -DMOZ_SYSTEM_PNG=$(MOZ_SYSTEM_PNG) \ - -DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \ - -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \ - -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \ -diff --git a/config/system-headers b/config/system-headers ---- a/config/system-headers -+++ b/config/system-headers -@@ -1260,16 +1260,20 @@ zlib.h - #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION - libsn/sn.h - libsn/sn-common.h - libsn/sn-launchee.h - libsn/sn-launcher.h - libsn/sn-monitor.h - libsn/sn-util.h - #endif -+#if MOZ_SYSTEM_GRAPHITE2==1 -+graphite2/Font.h -+graphite2/Segment.h -+#endif - #if MOZ_SYSTEM_HARFBUZZ==1 - harfbuzz/hb-glib.h - harfbuzz/hb-ot.h - harfbuzz/hb.h - #endif - #if MOZ_SYSTEM_HUNSPELL==1 - hunspell.hxx - #endif -diff --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh ---- a/gfx/graphite2/moz-gr-update.sh -+++ b/gfx/graphite2/moz-gr-update.sh -@@ -1,11 +1,12 @@ - #!/bin/bash - - # Script used to update the Graphite2 library in the mozilla source tree -+# and bump version for --with-system-graphite2 - - # This script lives in gfx/graphite2, along with the library source, - # but must be run from the top level of the mozilla-central tree. - - # Run as - # - # ./gfx/graphite2/moz-gr-update.sh RELEASE - # -@@ -32,22 +33,26 @@ echo "This directory contains the Graphi - echo "$TARBALL" >> gfx/graphite2/README.mozilla - echo "" - echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla - - # fix up includes because of bug 721839 (cstdio) and bug 803066 (Windows.h) - #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; - #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; - -+# chase version for --with-system-graphite2 -+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \ -+ if /GR2_VERSION_REQUIRE/" old-configure.in -+ - # summarize what's been touched - echo Updated to $RELEASE. - echo Here is what changed in the gfx/graphite2 directory: - echo - --hg stat gfx/graphite2 -+hg stat old-configure.in gfx/graphite2 - - echo - echo If gfx/graphite2/src/files.mk has changed, please make corresponding - echo changes to gfx/graphite2/src/moz.build - echo - - echo - echo Now use hg commands to create a patch for the mozilla tree. -diff --git a/gfx/moz.build b/gfx/moz.build ---- a/gfx/moz.build -+++ b/gfx/moz.build -@@ -2,28 +2,30 @@ - # vim: set filetype=python: - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - if CONFIG['MOZ_TREE_CAIRO']: - DIRS += ['cairo'] - -+if not CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ DIRS += ['graphite2/src' ] -+ - if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: - DIRS += ['harfbuzz/src'] - - DIRS += [ - '2d', - 'ycbcr', - 'angle', - 'src', - 'qcms', - 'gl', - 'layers', -- 'graphite2/src', - 'ots/src', - 'thebes', - 'ipc', - 'vr', - 'config', - ] - - if CONFIG['MOZ_ENABLE_SKIA']: -diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build ---- a/gfx/thebes/moz.build -+++ b/gfx/thebes/moz.build -@@ -261,16 +261,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] - - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): - CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] - - LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] - LOCAL_INCLUDES += ['/media/libyuv/include'] - --DEFINES['GRAPHITE2_STATIC'] = True -+if CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] -+else: -+ DEFINES['GRAPHITE2_STATIC'] = True - - if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] - - if CONFIG['CLANG_CXX']: - # Suppress warnings from Skia header files. - SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough'] -diff --git a/moz.configure b/moz.configure ---- a/moz.configure -+++ b/moz.configure -@@ -260,16 +260,28 @@ def extra_programs(target): - - check_prog('DSYMUTIL', delayed_getattr(extra_programs, 'DSYMUTIL'), - allow_missing=True) - check_prog('GENISOIMAGE', delayed_getattr(extra_programs, 'GENISOIMAGE'), - allow_missing=True) - check_prog('RPMBUILD', delayed_getattr(extra_programs, 'RPMBUILD'), - allow_missing=True) - -+option('--with-system-graphite2', -+ help="Use system graphite2 (located with pkgconfig)") -+ -+@depends('--with-system-graphite2', compile_environment) -+def check_for_graphite2(value, compile_env): -+ return value and compile_env -+ -+system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2', -+ check_for_graphite2) -+ -+set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True)) -+ - option('--with-system-harfbuzz', - help="Use system harfbuzz (located with pkgconfig)") - - @depends('--with-system-harfbuzz', compile_environment) - def check_for_harfbuzz(value, compile_env): - return value and compile_env - - system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.3.3', -diff --git a/old-configure.in b/old-configure.in ---- a/old-configure.in -+++ b/old-configure.in -@@ -5060,16 +5060,37 @@ if test "$USE_FC_FREETYPE"; then - CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS" - MOZ_CHECK_HEADERS([fontconfig/fcfreetype.h], , - [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)], [#include ]) - CPPFLAGS="$_SAVE_CPPFLAGS" - fi - fi - - dnl ======================================================== -+dnl Check for graphite2 -+dnl ======================================================== -+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then -+ dnl graphite2.pc has bogus version, check manually -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS" -+ AC_TRY_COMPILE([ #include -+ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \ -+ ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \ -+ * 100 + GR2_VERSION_BUGFIX >= \ -+ (major) * 10000 + (minor) * 100 + (bugfix) ) -+ ], [ -+ #if !GR2_VERSION_REQUIRE(1,3,8) -+ #error "Insufficient graphite2 version." -+ #endif -+ ], [], -+ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])]) -+ CFLAGS=$_SAVE_CFLAGS -+fi -+ -+dnl ======================================================== - dnl Check for pixman and cairo - dnl ======================================================== - - MOZ_TREE_CAIRO=1 - MOZ_ARG_ENABLE_BOOL(system-cairo, - [ --enable-system-cairo Use system cairo (located with pkgconfig)], - MOZ_TREE_CAIRO=, - MOZ_TREE_CAIRO=1 ) -diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build ---- a/toolkit/library/moz.build -+++ b/toolkit/library/moz.build -@@ -221,16 +221,19 @@ if CONFIG['SERVO_TARGET_DIR']: - OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo'] - - if CONFIG['MOZ_SYSTEM_JPEG']: - OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] - - if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] - -+if CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] - - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] - - if CONFIG['MOZ_SYSTEM_LIBEVENT']: - OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - diff --git a/gnu/packages/patches/icecat-use-system-harfbuzz.patch b/gnu/packages/patches/icecat-use-system-harfbuzz.patch deleted file mode 100644 index 083d404c13..0000000000 --- a/gnu/packages/patches/icecat-use-system-harfbuzz.patch +++ /dev/null @@ -1,279 +0,0 @@ -Copied from -See - -diff --git a/config/Makefile.in b/config/Makefile.in ---- a/config/Makefile.in -+++ b/config/Makefile.in -@@ -36,16 +36,17 @@ ifdef WRAP_SYSTEM_INCLUDES - export-preqs = \ - $(call mkdir_deps,system_wrappers) \ - $(NULL) - - export:: $(export-preqs) - $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \ - -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \ - -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \ -+ -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \ - -DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \ - -DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \ - -DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \ - -DMOZ_SYSTEM_PNG=$(MOZ_SYSTEM_PNG) \ - -DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \ - -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \ - -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \ - -DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \ -diff --git a/config/system-headers b/config/system-headers ---- a/config/system-headers -+++ b/config/system-headers -@@ -1260,16 +1260,21 @@ zlib.h - #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION - libsn/sn.h - libsn/sn-common.h - libsn/sn-launchee.h - libsn/sn-launcher.h - libsn/sn-monitor.h - libsn/sn-util.h - #endif -+#if MOZ_SYSTEM_HARFBUZZ==1 -+harfbuzz/hb-glib.h -+harfbuzz/hb-ot.h -+harfbuzz/hb.h -+#endif - #if MOZ_SYSTEM_HUNSPELL==1 - hunspell.hxx - #endif - #if MOZ_SYSTEM_BZ2==1 - bzlib.h - #endif - #ifdef MOZ_ENABLE_GIO - gio/gio.h -diff --git a/dom/base/moz.build b/dom/base/moz.build ---- a/dom/base/moz.build -+++ b/dom/base/moz.build -@@ -474,16 +474,19 @@ for var in ('MOZ_B2G_RIL'): - DEFINES[var] = True - - if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: - DEFINES['HAVE_SIDEBAR'] = True - - if CONFIG['MOZ_X11']: - CXXFLAGS += CONFIG['TK_CFLAGS'] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - GENERATED_FILES += [ - 'PropertyUseCounterMap.inc', - 'UseCounterList.h', - ] - - countermap = GENERATED_FILES['PropertyUseCounterMap.inc'] - countermap.script = 'gen-usecounters.py:property_map' - countermap.inputs = ['UseCounters.conf'] -diff --git a/gfx/harfbuzz/README-mozilla b/gfx/harfbuzz/README-mozilla ---- a/gfx/harfbuzz/README-mozilla -+++ b/gfx/harfbuzz/README-mozilla -@@ -14,8 +14,13 @@ this file when updating harfbuzz, and ch - - The normal approach to updating harfbuzz, therefore, is to pull the latest HB - source into a scratch directory and do a local build; then copy the original - sources AND the generated header mentioned above from the build directory into - the mozilla tree. - - If the collection of source files changes, manual updates to moz.build may be - needed, as we don't use the upstream makefiles. -+ -+The in-tree copy may be omitted during build by --with-system-harfbuzz. -+Make sure to keep pkg-config version check within old-configure.in in sync -+with checkout version or increment latest tag by one if it's not based -+on upstream release. -diff --git a/gfx/moz.build b/gfx/moz.build ---- a/gfx/moz.build -+++ b/gfx/moz.build -@@ -2,26 +2,28 @@ - # vim: set filetype=python: - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - if CONFIG['MOZ_TREE_CAIRO']: - DIRS += ['cairo'] - -+if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ DIRS += ['harfbuzz/src'] -+ - DIRS += [ - '2d', - 'ycbcr', - 'angle', - 'src', - 'qcms', - 'gl', - 'layers', - 'graphite2/src', -- 'harfbuzz/src', - 'ots/src', - 'thebes', - 'ipc', - 'vr', - 'config', - ] - - if CONFIG['MOZ_ENABLE_SKIA']: -diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py ---- a/gfx/skia/generate_mozbuild.py -+++ b/gfx/skia/generate_mozbuild.py -@@ -138,16 +138,19 @@ if CONFIG['GNU_CXX'] and not CONFIG['CLA - if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: - CXXFLAGS += [ - '-Wno-implicit-fallthrough', - '-Wno-inconsistent-missing-override', - '-Wno-macro-redefined', - '-Wno-unused-private-field', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'): - CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] - - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): - CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] - """ - -diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build ---- a/gfx/skia/moz.build -+++ b/gfx/skia/moz.build -@@ -748,14 +748,17 @@ if CONFIG['GNU_CXX'] and not CONFIG['CLA - if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']: - CXXFLAGS += [ - '-Wno-implicit-fallthrough', - '-Wno-inconsistent-missing-override', - '-Wno-macro-redefined', - '-Wno-unused-private-field', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android'): - CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] - - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): - CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] -diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build ---- a/gfx/thebes/moz.build -+++ b/gfx/thebes/moz.build -@@ -263,11 +263,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): - CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS'] - - LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] - LOCAL_INCLUDES += ['/media/libyuv/include'] - - DEFINES['GRAPHITE2_STATIC'] = True - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['CLANG_CXX']: - # Suppress warnings from Skia header files. - SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough'] -diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build ---- a/intl/unicharutil/util/moz.build -+++ b/intl/unicharutil/util/moz.build -@@ -37,9 +37,12 @@ if CONFIG['_MSC_VER']: - DEFINES['_USE_ANSI_CPP'] = True - # Don't include directives about which CRT to use - CFLAGS += ['-Zl'] - CXXFLAGS += ['-Zl'] - - if CONFIG['ENABLE_INTL_API']: - USE_LIBS += ['icu'] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - DIST_INSTALL = True -diff --git a/moz.configure b/moz.configure ---- a/moz.configure -+++ b/moz.configure -@@ -260,16 +260,28 @@ def extra_programs(target): - - check_prog('DSYMUTIL', delayed_getattr(extra_programs, 'DSYMUTIL'), - allow_missing=True) - check_prog('GENISOIMAGE', delayed_getattr(extra_programs, 'GENISOIMAGE'), - allow_missing=True) - check_prog('RPMBUILD', delayed_getattr(extra_programs, 'RPMBUILD'), - allow_missing=True) - -+option('--with-system-harfbuzz', -+ help="Use system harfbuzz (located with pkgconfig)") -+ -+@depends('--with-system-harfbuzz', compile_environment) -+def check_for_harfbuzz(value, compile_env): -+ return value and compile_env -+ -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.3.3', -+ check_for_harfbuzz) -+ -+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) -+ - option('--enable-system-hunspell', - help="Use system hunspell (located with pkgconfig)") - - @depends('--enable-system-hunspell', compile_environment) - def check_for_hunspell(value, compile_env): - return value and compile_env - - system_hunspell = pkg_check_modules('MOZ_HUNSPELL', 'hunspell', -diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build ---- a/netwerk/dns/moz.build -+++ b/netwerk/dns/moz.build -@@ -61,16 +61,19 @@ etld_data = GENERATED_FILES['etld_data.i - etld_data.script = 'prepare_tlds.py' - etld_data.inputs = ['effective_tld_names.dat'] - - # need to include etld_data.inc - LOCAL_INCLUDES += [ - '/netwerk/base', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['ENABLE_INTL_API']: - DEFINES['IDNA2008'] = True - USE_LIBS += ['icu'] - else: - UNIFIED_SOURCES += [ - 'nameprep.c', - ] - -diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build ---- a/toolkit/library/moz.build -+++ b/toolkit/library/moz.build -@@ -221,16 +221,19 @@ if CONFIG['SERVO_TARGET_DIR']: - OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo'] - - if CONFIG['MOZ_SYSTEM_JPEG']: - OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] - - if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] - - if CONFIG['MOZ_SYSTEM_LIBEVENT']: - OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - - if CONFIG['MOZ_SYSTEM_LIBVPX']: - OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS'] - -- cgit v1.2.3 From 94e96f7f68c3b9053fdb5dee5b0ab614163aaa08 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 24 Sep 2018 00:10:37 -0400 Subject: gnu: icecat: Unbundle libevent, libogg, and libvorbis. * gnu/packages/patches/icecat-use-system-media-libs.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/patches/icecat-avoid-bundled-libraries.patch: Add another hunk to enable removal of libevent. * gnu/packages/gnuzilla.scm (icecat)[source]: Add patch. In the snippet, add libevent, libogg, libvorbis, and libtremor to the list of bundled libraries to remove. Add a comment regarding theora. Remove comments regarding unbundling cairo, which is no longer supported. [inputs]: Add libevent, libogg, and libvorbis. [arguments]: Add --with-system-{libevent,ogg,vorbis} to configure flags. Add custom bootstrap phase. Add comments. --- gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 39 ++- .../patches/icecat-avoid-bundled-libraries.patch | 14 + .../patches/icecat-use-system-media-libs.patch | 381 +++++++++++++++++++++ 4 files changed, 423 insertions(+), 12 deletions(-) create mode 100644 gnu/packages/patches/icecat-use-system-media-libs.patch diff --git a/gnu/local.mk b/gnu/local.mk index 35e78e7816..244c79d221 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -812,6 +812,7 @@ dist_patch_DATA = \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icecat-CVE-2018-12383.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 \ %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ad83444e3c..6834d82426 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -36,6 +36,7 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cargo) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages databases) @@ -62,6 +63,7 @@ #:use-module (gnu packages rust) #:use-module (gnu packages icu4c) #:use-module (gnu packages video) + #:use-module (gnu packages xiph) #:use-module (gnu packages xdisorg) #:use-module (gnu packages readline)) @@ -497,6 +499,7 @@ security standards.") (list (search-patch "icecat-avoid-bundled-libraries.patch") (search-patch "icecat-use-system-graphite2+harfbuzz.patch") + (search-patch "icecat-use-system-media-libs.patch") (mozilla-patch "icecat-CVE-2018-12385.patch" "80a4a7ef2813" "1vgcbimpnfjqj934v0cryq1g13xac3wfmd4jyhcb5s60x8xyssf5") (search-patch "icecat-CVE-2018-12383.patch") (mozilla-patch "icecat-bug-1489744.patch" "6546ee839d30" "11mhvj77r789b428bfxqq5wdx8yr7lbrdjzr8qjj6fw197pldn51"))) @@ -516,24 +519,29 @@ security standards.") ;; FIXME: A script from the bundled nspr is used. ;;"nsprpub" ;; - ;; TODO: Use system media libraries. Waiting for: + ;; TODO: Use more system media libraries. See: ;; - ;; * libogg - ;; * libtheora - ;; * libvorbis - ;; * libtremor (not yet in guix) + ;; * libtheora: esr60 wants v1.2, not yet released. + ;; * soundtouch: avoiding the bundled library would + ;; result in some loss of functionality. There's + ;; also an issue with exception handling + ;; configuration. It seems that this is needed in + ;; some moz.build: + ;; DEFINES['ST_NO_EXCEPTION_HANDLING'] = 1 ;; * libopus ;; * speex - ;; * soundtouch (not yet in guix) ;; "modules/freetype2" "modules/zlib" "modules/libbz2" - ;; UNBUNDLE-ME "ipc/chromium/src/third_party/libevent" + "ipc/chromium/src/third_party/libevent" "media/libjpeg" "media/libvpx" + "media/libogg" + "media/libvorbis" + ;; "media/libtheora" ; wants theora-1.2, not yet released + "media/libtremor" "security/nss" - ;; UNBUNDLE-ME "gfx/cairo" "gfx/harfbuzz" "gfx/graphite2" "js/src/ctypes/libffi" @@ -549,7 +557,6 @@ security standards.") (inputs `(("alsa-lib" ,alsa-lib) ("bzip2" ,bzip2) - ;; UNBUNDLE-ME ("cairo" ,cairo) ("cups" ,cups) ("dbus-glib" ,dbus-glib) ("gdk-pixbuf" ,gdk-pixbuf) @@ -564,8 +571,11 @@ security standards.") ("libcanberra" ,libcanberra) ("libgnome" ,libgnome) ("libjpeg-turbo" ,libjpeg-turbo) + ("libogg" ,libogg) + ;; ("libtheora" ,libtheora) ; wants theora-1.2, not yet released + ("libvorbis" ,libvorbis) ("libxft" ,libxft) - ;; UNBUNDLE-ME ("libevent" ,libevent-2.0) + ("libevent" ,libevent) ("libxinerama" ,libxinerama) ("libxscrnsaver" ,libxscrnsaver) ("libxcomposite" ,libxcomposite) @@ -637,7 +647,10 @@ security standards.") "--with-system-zlib" "--with-system-bz2" "--with-system-jpeg" ; must be libjpeg-turbo - ;; UNBUNDLE-ME "--with-system-libevent" + "--with-system-libevent" + "--with-system-ogg" + "--with-system-vorbis" + ;; "--with-system-theora" ; wants theora-1.2, not yet released "--with-system-libvpx" "--with-system-icu" "--with-system-nspr" @@ -645,7 +658,6 @@ security standards.") "--with-system-harfbuzz" "--with-system-graphite2" "--enable-system-pixman" - ;; UNBUNDLE-ME "--enable-system-cairo" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-sqlite" @@ -695,6 +707,9 @@ security standards.") 'avcodec', 'avutil', 'pulse' ]\n\n" all))) #t)) + (replace 'bootstrap + (lambda _ + (invoke "sh" "-c" "autoconf old-configure.in > old-configure"))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ (use-modules (guix build cargo-build-system)) diff --git a/gnu/packages/patches/icecat-avoid-bundled-libraries.patch b/gnu/packages/patches/icecat-avoid-bundled-libraries.patch index b5e9fb887e..33203b1a33 100644 --- a/gnu/packages/patches/icecat-avoid-bundled-libraries.patch +++ b/gnu/packages/patches/icecat-avoid-bundled-libraries.patch @@ -33,3 +33,17 @@ Fixes needed when avoiding bundled libraries. '/dom/base', '/dom/storage', '/ipc/glue', +--- icecat-60.2.0/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build.orig 2018-09-13 17:40:54.000000000 -0400 ++++ icecat-60.2.0/media/webrtc/trunk/webrtc/base/rtc_task_queue_gn/moz.build 2018-09-23 21:33:12.319975105 -0400 +@@ -130,11 +130,6 @@ + DEFINES["WEBRTC_POSIX"] = True + DEFINES["_FILE_OFFSET_BITS"] = "64" + +- LOCAL_INCLUDES += [ +- "/ipc/chromium/src/third_party/libevent/include/", +- "/ipc/chromium/src/third_party/libevent/linux/" +- ] +- + UNIFIED_SOURCES += [ + "/media/webrtc/trunk/webrtc/base/task_queue_libevent.cc", + "/media/webrtc/trunk/webrtc/base/task_queue_posix.cc" diff --git a/gnu/packages/patches/icecat-use-system-media-libs.patch b/gnu/packages/patches/icecat-use-system-media-libs.patch new file mode 100644 index 0000000000..648585a6f0 --- /dev/null +++ b/gnu/packages/patches/icecat-use-system-media-libs.patch @@ -0,0 +1,381 @@ +Support building with system media libraries. +See + +Based on: + https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-z-bug517422?revision=472833&view=markup + +Changes to files within the bundled libraries are omitted, since those files +are removed from Guix sources. Modified for use with patch -p1, and to apply +cleanly to GNU IceCat. + +--- icecat-60.2.0/build/moz.configure/old.configure ++++ icecat-60.2.0/build/moz.configure/old.configure +@@ -273,7 +273,12 @@ + '--with-system-libvpx', + '--with-system-nspr', + '--with-system-nss', ++ '--with-system-ogg', + '--with-system-png', ++ '--with-system-soundtouch', ++ '--with-system-theora', ++ '--with-system-tremor', ++ '--with-system-vorbis', + '--with-system-zlib', + '--with-thumb', + '--with-thumb-interwork', +--- icecat-60.2.0/config/external/moz.build ++++ icecat-60.2.0/config/external/moz.build +@@ -23,12 +23,21 @@ + + external_dirs += ['modules/xz-embedded'] + +-if CONFIG['MOZ_VORBIS']: ++if not CONFIG['MOZ_SYSTEM_OGG']: ++ external_dirs += ['media/libogg'] ++ ++if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_SYSTEM_VORBIS']: + external_dirs += ['media/libvorbis'] + +-if CONFIG['MOZ_TREMOR']: ++if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_SYSTEM_TREMOR']: + external_dirs += ['media/libtremor'] + ++if not CONFIG['MOZ_SYSTEM_THEORA']: ++ external_dirs += ['media/libtheora'] ++ ++if not CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: ++ external_dirs += ['media/libsoundtouch'] ++ + if CONFIG['MOZ_WEBM_ENCODER']: + external_dirs += ['media/libmkv'] + +@@ -51,11 +60,8 @@ + 'media/kiss_fft', + 'media/libcubeb', + 'media/libnestegg', +- 'media/libogg', + 'media/libopus', +- 'media/libtheora', + 'media/libspeex_resampler', +- 'media/libsoundtouch', + 'media/mp4parse-rust', + 'media/psshparser' + ] +--- icecat-60.2.0/config/system-headers.mozbuild ++++ icecat-60.2.0/config/system-headers.mozbuild +@@ -1324,6 +1324,28 @@ + 'harfbuzz/hb.h', + ] + ++if CONFIG['MOZ_SYSTEM_OGG']: ++ system_headers += [ ++ 'ogg/ogg.h', ++ 'ogg/os_types.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_THEORA']: ++ system_headers += [ ++ 'theora/theoradec.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_VORBIS']: ++ system_headers += [ ++ 'vorbis/codec.h', ++ 'vorbis/vorbisenc.h', ++ ] ++ ++if CONFIG['MOZ_SYSTEM_TREMOR']: ++ system_headers += [ ++ 'tremor/ivorbiscodec.h', ++ ] ++ + if CONFIG['MOZ_SYSTEM_LIBVPX']: + system_headers += [ + 'vpx_mem/vpx_mem.h', +--- icecat-60.2.0/dom/media/AudioStream.cpp ++++ icecat-60.2.0/dom/media/AudioStream.cpp +@@ -121,7 +121,9 @@ + : mMonitor("AudioStream") + , mChannels(0) + , mOutChannels(0) ++#ifndef MOZ_SYSTEM_SOUNDTOUCH + , mTimeStretcher(nullptr) ++#endif + , mDumpFile(nullptr) + , mState(INITIALIZED) + , mDataSource(aSource) +@@ -142,9 +144,11 @@ + if (mDumpFile) { + fclose(mDumpFile); + } ++#ifndef MOZ_SYSTEM_SOUNDTOUCH + if (mTimeStretcher) { + soundtouch::destroySoundTouchObj(mTimeStretcher); + } ++#endif + #if defined(XP_WIN) + if (XRE_IsContentProcess()) { + audio::AudioNotificationReceiver::Unregister(this); +@@ -168,7 +172,11 @@ + { + mMonitor.AssertCurrentThreadOwns(); + if (!mTimeStretcher) { ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++ mTimeStretcher = new soundtouch::SoundTouch(); ++#else + mTimeStretcher = soundtouch::createSoundTouchObj(); ++#endif + mTimeStretcher->setSampleRate(mAudioClock.GetInputRate()); + mTimeStretcher->setChannels(mOutChannels); + mTimeStretcher->setPitch(1.0); +--- icecat-60.2.0/dom/media/AudioStream.h ++++ icecat-60.2.0/dom/media/AudioStream.h +@@ -15,7 +15,11 @@ + #include "mozilla/TimeStamp.h" + #include "mozilla/UniquePtr.h" + #include "CubebUtils.h" ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++#include "soundtouch/SoundTouch.h" ++#else + #include "soundtouch/SoundTouchFactory.h" ++#endif + + #if defined(XP_WIN) + #include "mozilla/audio/AudioNotificationReceiver.h" +@@ -297,7 +301,11 @@ + uint32_t mChannels; + uint32_t mOutChannels; + AudioClock mAudioClock; ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++ nsAutoPtr mTimeStretcher; ++#else + soundtouch::SoundTouch* mTimeStretcher; ++#endif + + // Output file for dumping audio + FILE* mDumpFile; +--- icecat-60.2.0/dom/media/moz.build ++++ icecat-60.2.0/dom/media/moz.build +@@ -327,6 +327,21 @@ + + DEFINES['MOZILLA_INTERNAL_API'] = True + ++if CONFIG['MOZ_SYSTEM_OGG']: ++ CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS'] ++ ++if CONFIG['MOZ_SYSTEM_THEORA']: ++ CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS'] ++ ++if CONFIG['MOZ_SYSTEM_VORBIS']: ++ CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS'] ++ ++if CONFIG['MOZ_SYSTEM_TREMOR']: ++ CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS'] ++ ++if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: ++ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS'] ++ + if CONFIG['MOZ_ANDROID_HLS_SUPPORT']: + DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True + +--- icecat-60.2.0/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp ++++ icecat-60.2.0/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp +@@ -15,9 +15,13 @@ + #include + #endif + ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++#include "nsXPCOMPrivate.h" // for XUL_DLL ++#else + // We use a known symbol located in lgpllibs to determine its location. + // soundtouch happens to be always included in lgpllibs + #include "soundtouch/SoundTouch.h" ++#endif + + namespace mozilla { + +@@ -64,6 +68,12 @@ + + sLinkStatus = LinkStatus_FAILED; + ++#ifdef MOZ_SYSTEM_SOUNDTOUCH ++ // We retrieve the path of the XUL library as this is where mozavcodec and ++ // mozavutil libs are located. ++ char* path = ++ PR_GetLibraryFilePathname(XUL_DLL, (PRFuncPtr)&FFVPXRuntimeLinker::Init); ++#else + // We retrieve the path of the lgpllibs library as this is where mozavcodec + // and mozavutil libs are located. + PathString lgpllibsname = GetLibraryName(nullptr, "lgpllibs"); +@@ -73,6 +83,7 @@ + PathString path = + GetLibraryFilePathname(lgpllibsname.get(), + (PRFuncPtr)&soundtouch::SoundTouch::getVersionId); ++#endif + if (path.IsEmpty()) { + return false; + } +--- icecat-60.2.0/old-configure.in ++++ icecat-60.2.0/old-configure.in +@@ -2451,6 +2451,111 @@ + fi + fi # COMPILE_ENVIRONMENT + ++dnl ======================================================== ++dnl Check for libogg ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-ogg, ++[ --with-system-ogg Use system libogg (located with pkgconfig)], ++MOZ_SYSTEM_OGG=1, ++MOZ_SYSTEM_OGG=) ++ ++if test -n "$MOZ_SYSTEM_OGG"; then ++ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.3.3) ++ ++ _SAVE_LIBS=$LIBS ++ LIBS="$LIBS $MOZ_OGG_LIBS" ++ AC_CHECK_FUNC(ogg_set_mem_functions, [], ++ [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)]) ++ LIBS=$_SAVE_LIBS ++fi ++ ++AC_SUBST(MOZ_SYSTEM_OGG) ++ ++dnl ======================================================== ++dnl Check for libvorbis ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-vorbis, ++[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], ++MOZ_SYSTEM_VORBIS=1, ++MOZ_SYSTEM_VORBIS=) ++ ++if test -n "$MOZ_SYSTEM_VORBIS"; then ++ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.6) ++fi ++ ++AC_SUBST(MOZ_SYSTEM_VORBIS) ++ ++dnl ======================================================== ++dnl Check for integer-only libvorbis aka tremor ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-tremor, ++[ --with-system-tremor Use system libtremor (located with pkgconfig)], ++MOZ_SYSTEM_TREMOR=1, ++MOZ_SYSTEM_TREMOR=) ++ ++if test -n "$MOZ_SYSTEM_TREMOR"; then ++ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1) ++fi ++ ++AC_SUBST(MOZ_SYSTEM_TREMOR) ++ ++dnl ======================================================== ++dnl Check for libtheora ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-theora, ++[ --with-system-theora Use system libtheora (located with pkgconfig)], ++MOZ_SYSTEM_THEORA=1, ++MOZ_SYSTEM_THEORA=) ++ ++if test -n "$MOZ_SYSTEM_THEORA"; then ++ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2) ++fi ++ ++AC_SUBST(MOZ_SYSTEM_THEORA) ++ ++dnl ======================================================== ++dnl Check for libSoundTouch ++dnl ======================================================== ++ ++MOZ_ARG_WITH_BOOL(system-soundtouch, ++[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)], ++MOZ_SYSTEM_SOUNDTOUCH=1, ++MOZ_SYSTEM_SOUNDTOUCH=) ++ ++if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then ++ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0) ++ ++ AC_LANG_SAVE ++ AC_LANG_CPLUSPLUS ++ _SAVE_CXXFLAGS=$CXXFLAGS ++ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS" ++ AC_CACHE_CHECK(for soundtouch sample type, ++ ac_cv_soundtouch_sample_type, ++ [AC_TRY_COMPILE([#include ++ #ifndef SOUNDTOUCH_INTEGER_SAMPLES ++ #error soundtouch expects float samples ++ #endif], ++ [], ++ [ac_cv_soundtouch_sample_type=short], ++ [ac_cv_soundtouch_sample_type=float])]) ++ CXXFLAGS=$_SAVE_CXXFLAGS ++ AC_LANG_RESTORE ++ ++ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \ ++ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then ++ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.]) ++ fi ++fi ++ ++if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then ++ AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH) ++fi ++AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH) ++ + dnl system libvpx Support + dnl ======================================================== + MOZ_ARG_WITH_BOOL(system-libvpx, +--- icecat-60.2.0/toolkit/library/moz.build ++++ icecat-60.2.0/toolkit/library/moz.build +@@ -244,6 +244,21 @@ + if CONFIG['MOZ_SYSTEM_HUNSPELL']: + OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] + ++if CONFIG['MOZ_SYSTEM_OGG']: ++ OS_LIBS += CONFIG['MOZ_OGG_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_THEORA']: ++ OS_LIBS += CONFIG['MOZ_THEORA_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_VORBIS']: ++ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_TREMOR']: ++ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS'] ++ ++if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: ++ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS'] ++ + if CONFIG['MOZ_SYSTEM_LIBEVENT']: + OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] + +--- icecat-60.2.0/xpcom/build/XPCOMInit.cpp ++++ icecat-60.2.0/xpcom/build/XPCOMInit.cpp +@@ -138,7 +138,9 @@ + + #include "mozilla/ipc/GeckoChildProcessHost.h" + ++#ifndef MOZ_OGG_NO_MEM_REPORTING + #include "ogg/ogg.h" ++#endif + #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) + #if defined(HAVE_STDINT_H) + // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in +@@ -639,11 +641,13 @@ + // this oddness. + mozilla::SetICUMemoryFunctions(); + ++#ifndef MOZ_OGG_NO_MEM_REPORTING + // Do the same for libogg. + ogg_set_mem_functions(OggReporter::CountingMalloc, + OggReporter::CountingCalloc, + OggReporter::CountingRealloc, + OggReporter::CountingFree); ++#endif + + #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) + // And for VPX. -- cgit v1.2.3 From 6d328879378fac95240005233331f596fb5c68ed Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 25 Sep 2018 17:13:59 -0400 Subject: gnu: icecat: Rebundle NSPR and NSS [security fix]. Works around . * gnu/packages/gnuzilla.scm (icecat)[source]: In snippet, don't remove NSS. [inputs]: Remove 'nspr' and 'nss'. [arguments]: Remove --with-system-{nspr,nss} from configure flags. --- gnu/packages/gnuzilla.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 6834d82426..ea3b61c231 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -519,6 +519,13 @@ security standards.") ;; FIXME: A script from the bundled nspr is used. ;;"nsprpub" ;; + ;; FIXME: With the update to IceCat 60, using system NSS + ;; broke certificate validation. See + ;; . For now, we use + ;; the bundled NSPR and NSS. TODO: Investigate, + ;; and try to unbundle these libraries again. + ;; UNBUNDLE-ME! "security/nss" + ;; ;; TODO: Use more system media libraries. See: ;; ;; * libtheora: esr60 wants v1.2, not yet released. @@ -541,7 +548,6 @@ security standards.") "media/libvorbis" ;; "media/libtheora" ; wants theora-1.2, not yet released "media/libtremor" - "security/nss" "gfx/harfbuzz" "gfx/graphite2" "js/src/ctypes/libffi" @@ -588,8 +594,10 @@ security standards.") ("pulseaudio" ,pulseaudio) ("mesa" ,mesa) ("mit-krb5" ,mit-krb5) - ("nspr" ,nspr) - ("nss" ,nss) + ;; See + ;; and related comments in the 'snippet' above. + ;; UNBUNDLE-ME! ("nspr" ,nspr) + ;; UNBUNDLE-ME! ("nss" ,nss) ("sqlite" ,sqlite) ("startup-notification" ,startup-notification) ("unzip" ,unzip) @@ -653,8 +661,12 @@ security standards.") ;; "--with-system-theora" ; wants theora-1.2, not yet released "--with-system-libvpx" "--with-system-icu" - "--with-system-nspr" - "--with-system-nss" + + ;; See + ;; and related comments in the 'snippet' above. + ;; UNBUNDLE-ME! "--with-system-nspr" + ;; UNBUNDLE-ME! "--with-system-nss" + "--with-system-harfbuzz" "--with-system-graphite2" "--enable-system-pixman" -- cgit v1.2.3 From fe73352e8073ea0a0e6f6b5591f24395671998ab Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 25 Sep 2018 19:31:50 -0400 Subject: gnu: linux-libre: Enable SHPC PCI Hotplug driver, now built-in only. Fixes . * gnu/packages/aux-files/linux-libre/4.18-x86_64.conf, gnu/packages/aux-files/linux-libre/4.18-i686.conf: Add CONFIG_HOTPLUG_PCI_SHPC=y, plus updates made by 'make oldconfig'. --- gnu/packages/aux-files/linux-libre/4.18-i686.conf | 6 ++++-- gnu/packages/aux-files/linux-libre/4.18-x86_64.conf | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/aux-files/linux-libre/4.18-i686.conf b/gnu/packages/aux-files/linux-libre/4.18-i686.conf index 606616b9fa..859b8b10b6 100644 --- a/gnu/packages/aux-files/linux-libre/4.18-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.18-i686.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.0-gnu Kernel Configuration +# Linux/x86 4.18.9-gnu Kernel Configuration # # @@ -255,6 +255,7 @@ CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -294,6 +295,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -853,7 +855,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -# CONFIG_HOTPLUG_PCI_SHPC is not set +CONFIG_HOTPLUG_PCI_SHPC=y # # PCI controller drivers diff --git a/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf b/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf index 81fd822756..2a66c483d6 100644 --- a/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/4.18-x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.0-gnu Kernel Configuration +# Linux/x86 4.18.9-gnu Kernel Configuration # # @@ -265,6 +265,7 @@ CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_CRASH_CORE=y CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -304,6 +305,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -869,7 +871,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -# CONFIG_HOTPLUG_PCI_SHPC is not set +CONFIG_HOTPLUG_PCI_SHPC=y # # PCI controller drivers -- cgit v1.2.3 From 06619128274c0f7e3ebfefab03db337e886fec51 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 25 Sep 2018 17:57:59 +0200 Subject: Fix URL in emacs-magit and emacs-groovy-modes. * gnu/packages/emacs.scm (emacs-magit)[source]: Fix URL. * gnu/packages/emacs.scm (emacs-groovy-modes)[source]: Fix URL. --- 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 f29040c372..c541c51483 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -458,7 +458,7 @@ on stdout instead of using a socket as the Emacsclient does.") (method url-fetch) (uri (string-append "https://github.com/magit/magit/releases/download/" - version "/" name "-" version ".tar.gz")) + version "/magit-" version ".tar.gz")) (sha256 (base32 "1ygaah3dd3nxpyd17297xgvdcgr7pgzzwlmpnmchki0kiwgg3sbc")))) @@ -8019,7 +8019,7 @@ supports multiple backends such as @code{vlc}, @code{mpg123}, (source (origin (method url-fetch) (uri (string-append - "https://github.com/Groovy-Emacs-Modes/" name + "https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes" "/archive/" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 -- cgit v1.2.3 From 9bd85a785f47d039b027de854b78b9ded0892e02 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 26 Sep 2018 15:42:15 +0200 Subject: gnu: shepherd: Update to 0.5.0. * gnu/packages/admin.scm (shepherd): Update to 0.5.0. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8f504cafef..ded7ce3b97 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -173,14 +173,14 @@ and provides a \"top-like\" mode (monitoring).") (define-public shepherd (package (name "shepherd") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (string-append "https://alpha.gnu.org/gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "1lgmsbxn8i8xdasxzkdp2cml75n128pplw6icvmspl6s0n9xmw8n")))) + "1wmciqml9yplnx1s4ynn00giqyk06rbrcsgvpjj2df47sawk2jp8")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var"))) -- cgit v1.2.3 From 4245ddcbc9f935804c17c97872b90ec1050c2d75 Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Sun, 26 Aug 2018 21:54:14 +1000 Subject: guix system: Load all services on reconfigure, not just stopped ones. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This uses the 'replacement' service slot introduced in the Shepherd version 0.5.0. * gnu/services/shepherd.scm (shepherd-service-upgrade): Return a list of services that need to be restarted to complete their upgrade. * guix/scripts/system.scm (call-with-service-upgrade-info): Rename an internal variable to reflect the change to shepherd-service-upgrade. (upgrade-shepherd-services): Call 'load-services/safe' instead of 'load-services'. Print a message about services that need to be manually restarted. * gnu/services/herd.scm (load-services/safe): New procedure. * doc/guix.texi (Invoking guix system): Document the new behaviour. Co-authored-by: Ludovic Courtès --- doc/guix.texi | 8 ++++---- gnu/services/herd.scm | 20 ++++++++++++++++++++ gnu/services/shepherd.scm | 23 ++++++++--------------- guix/scripts/system.scm | 25 ++++++++++++++++--------- 4 files changed, 48 insertions(+), 28 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 6b4b06f46d..e1046eb512 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -33,7 +33,7 @@ Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* -Copyright @copyright{} 2017 Carlo Zancanaro@* +Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* @@ -21920,9 +21920,9 @@ systems already running GuixSD.}. 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, it does not -attempt to upgrade it since this would not be possible without stopping it -first. +currently running; if a service is currently running this command will +arrange for it to be upgraded the next time it is stopped (eg. by +@code{herd stop X} or @code{herd restart X}). This command creates a new generation whose number is one greater than the current generation (as reported by @command{guix system diff --git a/gnu/services/herd.scm b/gnu/services/herd.scm index 8c96b70731..8ff817759d 100644 --- a/gnu/services/herd.scm +++ b/gnu/services/herd.scm @@ -50,6 +50,7 @@ unload-services unload-service load-services + load-services/safe start-service stop-service)) @@ -232,6 +233,25 @@ returns a shepherd object." `(primitive-load ,file)) files)))) +(define (load-services/safe files) + "This is like 'load-services', but make sure only the subset of FILES that +can be safely reloaded is actually reloaded. + +This is done to accommodate the Shepherd < 0.15.0 where services lacked the +'replacement' slot, and where 'register-services' would throw an exception +when passed a service with an already-registered name." + (eval-there `(let* ((services (map primitive-load ',files)) + (slots (map slot-definition-name + (class-slots ))) + (can-replace? (memq 'replacement slots))) + (define (registered? service) + (not (null? (lookup-services (canonical-name service))))) + + (apply register-services + (if can-replace? + services + (remove registered? services)))))) + (define (start-service name) (with-shepherd-action name ('start) result result)) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 4cd2249841..4c7e72049f 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2018 Ludovic Courtès ;;; Copyright © 2017 Clément Lassieur +;;; Copyright © 2018 Carlo Zancanaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -329,7 +330,7 @@ symbols provided/required by a service." (define (shepherd-service-upgrade live target) "Return two values: the subset of LIVE (a list of ) that needs to be unloaded, and the subset of TARGET (a list of ) that -needs to be loaded." +need to be restarted to complete their upgrade." (define (essential? service) (memq (first (live-service-provision service)) '(root shepherd))) @@ -346,12 +347,6 @@ needs to be loaded." (and=> (lookup-live (shepherd-service-canonical-name service)) live-service-running)) - (define (stopped service) - (match (lookup-live (shepherd-service-canonical-name service)) - (#f #f) - (service (and (not (live-service-running service)) - service)))) - (define live-service-dependents (shepherd-service-back-edges live #:provision live-service-provision @@ -362,16 +357,14 @@ needs to be loaded." (#f (every obsolete? (live-service-dependents service))) (_ #f))) - (define to-load - ;; Only load services that are either new or currently stopped. - (remove running? target)) + (define to-restart + ;; Restart services that are currently running. + (filter running? target)) (define to-unload - ;; Unload services that are (1) no longer required, or (2) are in TO-LOAD. - (remove essential? - (append (filter obsolete? live) - (filter-map stopped to-load)))) + ;; Unload services that are no longer required. + (remove essential? (filter obsolete? live))) - (values to-unload to-load)) + (values to-unload to-restart)) ;;; shepherd.scm ends here diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 69bd05b516..1e7620f147 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -310,9 +310,9 @@ names of services to load (upgrade), and the list of names of services to unload." (match (current-services) ((services ...) - (let-values (((to-unload to-load) + (let-values (((to-unload to-restart) (shepherd-service-upgrade services new-services))) - (mproc to-load + (mproc to-restart (map (compose first live-service-provision) to-unload)))) (#f @@ -335,25 +335,32 @@ bring the system down." ;; Arrange to simply emit a warning if the service upgrade fails. (with-shepherd-error-handling (call-with-service-upgrade-info new-services - (lambda (to-load to-unload) + (lambda (to-restart to-unload) (for-each (lambda (unload) (info (G_ "unloading service '~a'...~%") unload) (unload-service unload)) to-unload) (with-monad %store-monad - (munless (null? to-load) - (let ((to-load-names (map shepherd-service-canonical-name to-load)) - (to-start (filter shepherd-service-auto-start? to-load))) - (info (G_ "loading new services:~{ ~a~}...~%") to-load-names) + (munless (null? new-services) + (let ((new-service-names (map shepherd-service-canonical-name new-services)) + (to-restart-names (map shepherd-service-canonical-name to-restart)) + (to-start (filter shepherd-service-auto-start? new-services))) + (info (G_ "loading new services:~{ ~a~}...~%") new-service-names) + (unless (null? to-restart-names) + ;; Listing TO-RESTART-NAMES in the message below wouldn't help + ;; because many essential services cannot be meaningfully + ;; restarted. See . + (format #t (G_ "To complete the upgrade, run 'herd restart SERVICE' to stop, +upgrade, and restart each service that was not automatically restarted.\n"))) (mlet %store-monad ((files (mapm %store-monad (compose lower-object shepherd-service-file) - to-load))) + new-services))) ;; Here we assume that FILES are exactly those that were computed ;; as part of the derivation that built OS, which is normally the ;; case. - (load-services (map derivation->output-path files)) + (load-services/safe (map derivation->output-path files)) (for-each start-service (map shepherd-service-canonical-name to-start)) -- cgit v1.2.3 From 2a5f2b1f7550db701172a338e98179e1cac55a1c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 26 Sep 2018 16:35:37 +0200 Subject: gnu: Remove incorrect Emacs package deprecations. This is a followup to 5c8031ff7382ec9079040d08ae5a05b4dd2352b7. An upgrade would wrongfully report things like: guix package: package 'emacs-typo' has been superseded by 'emacs-typo' guix package: package 'emacs-org-tree-slide' has been superseded by 'emacs-org-tree-slide' guix package: package 'emacs-emms' has been superseded by 'emacs-emms' * gnu/packages/emacs.scm (flycheck, emms, typo, org-tree-slide) (butler): Remove. (emacs-emms-mode-line-cycle)[propagated-inputs]: Use EMACS-EMMS instead of EMMS. --- gnu/packages/emacs.scm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c541c51483..9dc11c59fc 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -782,9 +782,6 @@ different tools. It highlights errors and warnings inline in the buffer, and provides an optional IDE-like error list.") (license license:gpl3+))) ;+GFDLv1.3+ for the manual -(define-public flycheck - (deprecated-package "flycheck" emacs-flycheck)) - ;;; ;;; Web browsing. @@ -1066,9 +1063,6 @@ light user interface.") (home-page "https://www.gnu.org/software/emms/") (license license:gpl3+))) -(define-public emms - (deprecated-package "emacs-emms" emacs-emms)) - (define-public emacs-emms-player-mpv ;; A new mpv backend is included in Emms from 5.0. (deprecated-package "emacs-emms-player-mpv" emacs-emms)) @@ -1088,7 +1082,7 @@ light user interface.") "0ifszi930pnaxk1x8pcydmvnp06868gc7nfx14q17zbajbx735k6")))) (build-system emacs-build-system) (propagated-inputs - `(("emms" ,emms))) + `(("emms" ,emacs-emms))) (home-page "https://github.com/momomo5717/emms-mode-line-cycle") (synopsis "Display the EMMS mode line as a ticker") (description @@ -2722,9 +2716,6 @@ view the build status of those servers' build jobs, and possibly to trigger build jobs.") (license license:gpl3+))) -(define-public butler - (deprecated-package "emacs-butler" emacs-butler)) - (define-public emacs-company (package (name "emacs-company") @@ -2874,9 +2865,6 @@ automatically inserts a Unicode opening or closing quotation mark, depending on context.") (license license:gpl3+))) -(define-public typo - (deprecated-package "emacs-typo" emacs-typo)) - (define-public emacs-scheme-complete (let ((commit "9b5cf224bf2a5994bc6d5b152ff487517f1a9bb5")) (package @@ -8061,9 +8049,6 @@ navigation with the grails mode.") @kbd{C-<} to jump to the next and previous slide.") (license license:gpl3+)))) -(define-public org-tree-slide - (deprecated-package "emacs-org-tree-slide" emacs-org-tree-slide)) - (define-public emacs-scratch-el (let ((commit "2cdf2b841ce7a0987093f65b0cc431947549f897") (revision "1")) -- cgit v1.2.3 From 6f03b08089167ec863361352ab200830bffeb0b7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 26 Sep 2018 22:30:16 +0200 Subject: services: dhcp-client: Use 'read-pid-file'. * gnu/services/networking.scm (dhcp-client-service-type)[start]: Use 'read-pid-file' instead of the custom and possibly infinite loop. --- gnu/services/networking.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index bd1d5a2706..3fdb2bb9f7 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016 John Darrington @@ -191,19 +191,7 @@ fe80::1%lo0 apps.facebook.com\n") (cons* #$dhclient "-nw" "-pf" #$pid-file ifaces)))) (and (zero? (cdr (waitpid pid))) - (let loop () - (catch 'system-error - (lambda () - (call-with-input-file #$pid-file read)) - (lambda args - ;; 'dhclient' returned before PID-FILE was created, - ;; so try again. - (let ((errno (system-error-errno args))) - (if (= ENOENT errno) - (begin - (sleep 1) - (loop)) - (apply throw args)))))))))) + (read-pid-file #$pid-file))))) (stop #~(make-kill-destructor)))))) (define* (dhcp-client-service #:key (dhcp isc-dhcp)) -- cgit v1.2.3 From a56c4eb8f43ae5555985d8a84308d150c0763c5a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 26 Sep 2018 22:52:38 +0200 Subject: services: shepherd: Add workaround for 0.5.0 in containers. * gnu/services/shepherd.scm (%containerized-shepherd-service): New service. * gnu/system.scm (essential-services): Use it when CONTAINER? is true. --- gnu/services/shepherd.scm | 16 ++++++++++++++++ gnu/system.scm | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 4c7e72049f..49d08cc30f 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -59,6 +59,7 @@ %default-modules shepherd-service-file + %containerized-shepherd-service shepherd-service-lookup-procedure shepherd-service-back-edges @@ -327,6 +328,21 @@ symbols provided/required by a service." (lambda (service) (vhash-foldq* cons '() service edges))) +(define %containerized-shepherd-service + ;; XXX: This service works around a bug in the Shepherd 0.5.0: shepherd + ;; calls reboot(2) (via 'disable-reboot-on-ctrl-alt-del') when it starts, + ;; but in a container that fails with EINVAL. This was fixed in Shepherd + ;; commit 92e806bac1abaeeaf5d60f0ab50d1ae85ba6a62f. + (simple-service 'containerized-shepherd + shepherd-root-service-type + (list (shepherd-service + (provision '(containerized-shepherd)) + (start #~(lambda () + (set! (@@ (shepherd) + disable-reboot-on-ctrl-alt-del) + (const #t)) + #t)))))) + (define (shepherd-service-upgrade live target) "Return two values: the subset of LIVE (a list of ) that needs to be unloaded, and the subset of TARGET (a list of ) that diff --git a/gnu/system.scm b/gnu/system.scm index e4a57475a9..99bc09873d 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -501,7 +501,7 @@ a container or that of a \"bare metal\" system." ;; Add the firmware service, unless we are building for a ;; container. (if container? - '() + (list %containerized-shepherd-service) (list %linux-bare-metal-service (service firmware-service-type (operating-system-firmware os)))))))) -- cgit v1.2.3 From 23784f0c3342a0fab5bf2a1c15c300b9f0856872 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 26 Sep 2018 22:58:23 +0200 Subject: services: udev: Don't attempt to read "modules.devname" from a container. Fixes . Reported by Julien Lepiller . * gnu/services/base.scm (udev-shepherd-service)[start]: Check whether DIRECTORY exists and skip 'make-static-device-nodes' call if it doesn't. --- gnu/services/base.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 5ba2c6b86d..9dfabd9807 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1881,7 +1881,12 @@ item of @var{packages}." (string-append linux-module-directory "/" kernel-release)) (old-umask (umask #o022))) - (make-static-device-nodes directory) + ;; If we're in a container, DIRECTORY might not exist, + ;; for instance because the host runs a different + ;; kernel. In that case, skip it; we'll just miss a few + ;; nodes like /dev/fuse. + (when (file-exists? directory) + (make-static-device-nodes directory)) (umask old-umask)) (let ((pid (fork+exec-command (list udevd)))) -- cgit v1.2.3 From 09b7300c01a8e7100467c6caae9b2c8d8e673971 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 26 Sep 2018 23:01:33 +0200 Subject: services: virtual-terminal: Write to "default_utf8" only if necessary. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a bug in containers whereby 'virtual-terminal' would always fail to start because writing to /sys/…/default_utf8 would fail with EROFS. * gnu/services/base.scm (virtual-terminal-service-type): Read from "default_utf8" before attempting to write to it. --- gnu/services/base.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 9dfabd9807..47c7d8bb27 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -685,17 +685,20 @@ to add @var{device} to the kernel's entropy pool. The service will fail if (shepherd-service-type 'virtual-terminal (lambda (utf8?) - (shepherd-service - (documentation "Set virtual terminals in UTF-8 module.") - (provision '(virtual-terminal)) - (requirement '(root-file-system)) - (start #~(lambda _ - (call-with-output-file - "/sys/module/vt/parameters/default_utf8" - (lambda (port) - (display 1 port))) - #t)) - (stop #~(const #f)))) + (let ((knob "/sys/module/vt/parameters/default_utf8")) + (shepherd-service + (documentation "Set virtual terminals in UTF-8 module.") + (provision '(virtual-terminal)) + (requirement '(root-file-system)) + (start #~(lambda _ + ;; In containers /sys is read-only so don't insist on + ;; writing to this file. + (unless (= 1 (call-with-input-file #$knob read)) + (call-with-output-file #$knob + (lambda (port) + (display 1 port)))) + #t)) + (stop #~(const #f))))) #t)) ;default to UTF-8 (define console-keymap-service-type -- cgit v1.2.3 From e15ede6e28cfaf5fe951faf88d7c1e3213a476a4 Mon Sep 17 00:00:00 2001 From: Timo Eisenmann Date: Wed, 26 Sep 2018 17:01:33 +0200 Subject: gnu: enlightenment: Fix initial locale and keyboard selection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/enlightenment.scm (enlightenment)[arguments]: In 'set-system-actions', set absolute file name to 'locale' and 'xorg.lst'. Signed-off-by: Ludovic Courtès --- gnu/packages/enlightenment.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 45dc1dbbeb..c7812e8874 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Timo Eisenmann ;;; ;;; This file is part of GNU Guix. ;;; @@ -268,13 +269,19 @@ Libraries with some extra bells and whistles.") (add-before 'configure 'set-system-actions (lambda* (#:key inputs #:allow-other-keys) (let ((xkeyboard (assoc-ref inputs "xkeyboard-config")) - (utils (assoc-ref inputs "util-linux"))) + (utils (assoc-ref inputs "util-linux")) + (libc (assoc-ref inputs "libc"))) ;; We need to patch the path to 'base.lst' to be able ;; to switch the keyboard layout in E. - (substitute* "src/modules/xkbswitch/e_mod_parse.c" + (substitute* (list "src/modules/xkbswitch/e_mod_parse.c" + "src/modules/wizard/page_011.c") (("/usr/share/X11/xkb/rules/xorg.lst") (string-append xkeyboard "/share/X11/xkb/rules/base.lst"))) + (substitute* (list "src/bin/e_intl.c" + "src/modules/conf_intl/e_int_config_intl.c" + "src/modules/wizard/page_010.c") + (("locale -a") (string-append libc "/bin/locale -a"))) (substitute* "src/modules/everything/evry_plug_apps.c" (("/usr/bin/") "")) (substitute* "configure" -- cgit v1.2.3 From a9994b273585914a273f5c50bf2d39af1f657fd0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 20:58:07 +0200 Subject: gnu: perl-crypt-openssl-rsa: Update to 0.31. * gnu/packages/tls.scm (perl-crypt-openssl-rsa): Update to 0.31. --- 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 0cdb02b0aa..bdb63c0dbf 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -681,7 +681,7 @@ servers or clients for more complicated applications.") (define-public perl-crypt-openssl-rsa (package (name "perl-crypt-openssl-rsa") - (version "0.30") + (version "0.31") (source (origin (method url-fetch) @@ -691,7 +691,7 @@ servers or clients for more complicated applications.") ".tar.gz")) (sha256 (base32 - "1b19kaaw4wda8dy6kjiwqa2prpbs2dqcyjyj9zdh5wbs74qkbq93")))) + "0djl5i6kibl7862b6ih29q8dhg5zpwzq77q9j8hp6xngshx40ws1")))) (build-system perl-build-system) (native-inputs `(("perl-crypt-openssl-guess" ,perl-crypt-openssl-guess))) -- cgit v1.2.3 From 6f52db245564b5732577e4e40e0f3127d37fcaf0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 23:27:44 +0200 Subject: gnu: perl-catalyst-runtime: Update to 5.90119. * gnu/packages/web.scm (perl-catalyst-runtime): Update to 5.90119. --- gnu/packages/web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 26c2e9128a..2251daabf7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1862,15 +1862,15 @@ MIME type directly to the browser, without being processed through Catalyst.") (define-public perl-catalyst-runtime (package (name "perl-catalyst-runtime") - (version "5.90118") + (version "5.90119") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/H/HA/HAARG/" + (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "Catalyst-Runtime-" version ".tar.gz")) (sha256 (base32 - "0cws3szx3vvh0372qdx8fypgv6qphcc3v81rbq30sl1ghby7ksd3")))) + "1iw7x9rqk3sz2hm1bw01blz5vwm7zlljdf4xj3r8vz54f1yggzqr")))) (build-system perl-build-system) (native-inputs `(("perl-test-fatal" ,perl-test-fatal))) -- cgit v1.2.3 From af44f05af78e3187589c2c628c3d3436df7ceed0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 12:38:47 +0200 Subject: gnu: perl-net-dns: Update to 1.18. * gnu/packages/networking.scm (perl-net-dns): Update to 1.18. --- 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 4800c2496b..0d6de040e5 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -902,7 +902,7 @@ private (reserved).") (define-public perl-net-dns (package (name "perl-net-dns") - (version "1.17") + (version "1.18") (source (origin (method url-fetch) @@ -914,7 +914,7 @@ private (reserved).") version ".tar.gz"))) (sha256 (base32 - "1q62w9rf2w8kjzqagzr0rdn20ybl8gj3l6cdq4k8fw0sxa7zsycs")))) + "1lx902cbvlfl63bqfdrnyavmfwbjvrfdnwgdc1dgs1wpzja19kjj")))) (build-system perl-build-system) (inputs `(("perl-digest-hmac" ,perl-digest-hmac))) -- cgit v1.2.3 From 3d190d6a219d03dc94c8d33614766df0fed1473f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 27 Sep 2018 03:47:24 +0200 Subject: gnu: dico: Update to 2.7. * gnu/packages/dico.scm (dico): Update to 2.7. [arguments]: Work around dodgy test in 'check' phase. --- gnu/packages/dico.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/dico.scm b/gnu/packages/dico.scm index a85987d9b1..d96dbb86d9 100644 --- a/gnu/packages/dico.scm +++ b/gnu/packages/dico.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2018 Ludovic Courtès ;;; Copyright © 2016, 2018 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,14 +38,14 @@ (define-public dico (package (name "dico") - (version "2.6") + (version "2.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/dico/dico-" version ".tar.xz")) (sha256 (base32 - "0zmi041gv5nd5fmyzgdrgrsy2pvjaq9p8dvvhxwi842hiyng5b7i")))) + "0dg4aacnmlf3ljssd7dwh8z5644xzq8k1501mbsx8nz8p8a9mbsq")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--with-guile-site-dir=" %output @@ -57,7 +58,11 @@ ;; infrastructure. Gag it. (setenv "GUILE_AUTO_COMPILE" "0") (setenv "GUILE_WARN_DEPRECATED" "no") - #t))))) + #t)) + (replace 'check + (lambda _ + ;; Test '71: append + dooffs + env' fails if $V is not 2. + (invoke "make" "check" "V=2")))))) (inputs `(("m4" ,m4) ;used at run time ("pcre" ,pcre) -- cgit v1.2.3 From b733dbc0fb5bd1648f1fdce6471f048886e69e73 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 25 Sep 2018 10:15:37 +0200 Subject: gnu: python-setproctitle: Use INVOKE. * gnu/packages/python.scm (python-setproctitle)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5c6c79da88..4703d95a2d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10482,7 +10482,7 @@ theme for the Sphinx documentation system. It's the default theme of Sphinx.") (setenv "CC" "gcc") ;; No need to extend PYTHONPATH to find the built package, since ;; the Makefile will build anyway - (zero? (system* "make" "check"))))))) + (invoke "make" "check")))))) (native-inputs `(("procps" ,procps))) ; required for tests (home-page -- cgit v1.2.3 From 428d2ca2ecc57780fb4be90ca6009ea1d00eeade Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 24 Sep 2018 20:33:00 +0200 Subject: gnu: youtube-dl: Update to 2018.09.18. * gnu/packages/video.scm (youtube-dl): Update to 2018.09.18. --- 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 448773e0d9..54ffef86de 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1271,7 +1271,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2018.09.08") + (version "2018.09.18") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1279,7 +1279,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "0vwc4faqdddrb3nm4fzmkr60n5rc2zwyy8jwrrjad60kcp8isf05")))) + "0mlsdmddmyy3xaqy366k48xds14g17l81al3kglndjkbrrji63sb")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From c4a3ea38850e97cdc12252440c7fa9cdefd5790f Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 27 Sep 2018 09:50:01 +0200 Subject: gnu: mame: Update to 0.202. * gnu/packages/emulators.scm (mame): Update to 0.202. --- 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 782bff5b18..443137f141 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1184,7 +1184,7 @@ play them on systems for which they were never designed!") (define-public mame (package (name "mame") - (version "0.201") + (version "0.202") (source (origin (method git-fetch) @@ -1194,7 +1194,7 @@ play them on systems for which they were never designed!") (file-name (git-file-name name version)) (sha256 (base32 - "00whiig4ld3d4fkl34q48vlf28ygvvp5g7fp0rb5n31ymhl4kajk")) + "1v9gm124p65nbj678gfkcvwphp9qc15ky2p12ca6g3rllma94di5")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit v1.2.3 From e07cb04d40eaea8aa792e2375f7f127ef54a79f3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 27 Sep 2018 05:51:20 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.158. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.158. --- 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 170c77374d..95a5234c76 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -452,8 +452,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.157" - "00bnfqwkr0jfdabmwx5qk5bqxn5vwnnzwqbm5rfg7lggii74kk54" + (make-linux-libre "4.4.158" + "1l3blfaw50a8l9bp735vzsmk1naq4l40qidza10dwkkrd2ip3n41" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 202190ec392d3284b0dae753b356cb74f4962682 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 27 Sep 2018 05:52:00 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.129. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.129. --- 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 95a5234c76..b3ccaef89f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,8 +446,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.128" - "0lww23xcyyg0dwzrap5x9d700gy3lbxln55n6sqqkm7m89dkqwha" + (make-linux-libre "4.9.129" + "0y7p1xgbpn4nmr5pmqb58shr54lvryr5rxwm9m66knwzj332f3rh" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From e0b6085a7f69a8b2a8ff4fe90d8ef28f9ef50769 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 27 Sep 2018 05:52:52 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.72. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.72. (%linux-libre-4.14-hash): 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 b3ccaef89f..93005e16da 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,8 +436,8 @@ It has been modified to remove all non-free binary blobs.") #:patches %linux-libre-4.18-patches #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.71") -(define %linux-libre-4.14-hash "1akvykaccy7ikl8v04grwxvgs4z2rrs7drf2s85ysqwq79mdh3gq") +(define %linux-libre-4.14-version "4.14.72") +(define %linux-libre-4.14-hash "1ngz5p8mvga45y1n6hbw6niy0ji5mfl4vc3bxlckjg42dcp5qf64") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 1d1e4f8f9c46b13ed2c4a61bc4c5f25c6748649b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 27 Sep 2018 05:53:46 -0400 Subject: gnu: linux-libre: Update to 4.18.10. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.18.10. (%linux-libre-hash): 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 93005e16da..2503676396 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -405,8 +405,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.18.9") -(define %linux-libre-hash "0wwmhnfvcsdlqhzwwwyz1x5a3ldjky6l0xir1pi6pysr0lak402x") +(define %linux-libre-version "4.18.10") +(define %linux-libre-hash "1znc6kh3j8plmxail6hn2ss0r0fvbcp50s3xv5gxys7jc7k42znj") (define %linux-libre-4.18-patches (list %boot-logo-patch -- cgit v1.2.3 From de1158d53fd106103214e79f8523a91b9cfa89d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Sep 2018 19:55:49 +0200 Subject: gnu: eolie: Update to 0.9.38. * gnu/packages/gnome.scm (eolie): Update to 0.9.38. --- 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 1e8522c500..de938e4b14 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4090,15 +4090,15 @@ work and the interface is well tested.") (define-public eolie (package (name "eolie") - (version "0.9.37") + (version "0.9.38") (source (origin (method url-fetch) (uri (string-append "https://gitlab.gnome.org/World/eolie/" - "uploads/4341cb428b7a45670308ee3fb3fa07dd/" + "uploads/9814c06a1bc83ea09c3da8719a9ed11b/" "eolie-" version ".tar.xz")) (sha256 (base32 - "126m0nwwy3lqv7z8aj9hiwangih03b1nlkg3xja9p7wbf7zcvp2n")))) + "10vrh91rapgfmqwc6jkcybpmlvn4q0y8bnklw3rddzigf9kvqsff")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From ea1a3601999887a0762a942460317145f3f53b30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Sep 2018 20:02:55 +0200 Subject: gnu: emacs-ert-runner: Do not use package name in directory. * gnu/packages/emacs.scm (emacs-ert-runner)[arguments]: Use the upstream name instead of the Guix package name in the "install-executable" phase. This is a follow-up to commit 5c8031ff7382ec9079040d08ae5a05b4dd2352b7. --- 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 9dc11c59fc..8da5add886 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -6982,8 +6982,8 @@ Emacs.") (substitute* "bin/ert-runner" (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") (string-append "ERT_RUNNER=\"" out - "/share/emacs/site-lisp/guix.d/" - ,name "-" ,version))) + "/share/emacs/site-lisp/guix.d/ert-runner-" + ,version))) (install-file "bin/ert-runner" (string-append out "/bin")) (wrap-program (string-append out "/bin/ert-runner") (list "EMACSLOADPATH" ":" 'prefix -- cgit v1.2.3 From 363d7d6608d599776f78525e50a920b1d641805b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 27 Sep 2018 21:52:07 +0200 Subject: gnu: yoshimi: Update to 1.5.9. * gnu/packages/music.scm (yoshimi): Update to 1.5.9. --- 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 e563062018..2d834d8c1f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1996,7 +1996,7 @@ capabilities, custom envelopes, effects, etc.") (define-public yoshimi (package (name "yoshimi") - (version "1.5.8.2") + (version "1.5.9") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/yoshimi/" @@ -2004,7 +2004,7 @@ capabilities, custom envelopes, effects, etc.") "/yoshimi-" version ".tar.bz2")) (sha256 (base32 - "1kg7d6mnzdwzsqhrf7pmrf1hzgfpbpm5lv8xkaz32wiv391qrnxc")))) + "1nqwxwq6814m860zrh33r85vdyi2bgkvjg5372h3ngcdmxnb7wr0")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit v1.2.3 From fe65b559a671390ed5034d2d0b2c58c276e5abff Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 25 Sep 2018 10:30:21 +0200 Subject: progress: Add 'display-download-progress'. * guix/progress.scm (display-download-progress): New procedure. (progress-reporter/file)[render]: Rewrite in terms of 'display-download-progress'. --- guix/progress.scm | 72 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/guix/progress.scm b/guix/progress.scm index 53aea1c56d..d4ebb32991 100644 --- a/guix/progress.scm +++ b/guix/progress.scm @@ -39,6 +39,7 @@ progress-reporter/file progress-reporter/bar + display-download-progress byte-count->string current-terminal-columns @@ -183,6 +184,42 @@ width of the bar is BAR-WIDTH." move the cursor to the beginning of the line." (display "\r\x1b[K" port)) +(define* (display-download-progress file size + #:key + start-time (transferred 0) + (log-port (current-error-port))) + "Write the progress report to LOG-PORT. Use START-TIME (a SRFI-19 time +object) and TRANSFERRED (a total number of bytes) to determine the +throughput." + (define elapsed + (duration->seconds + (time-difference (current-time time-monotonic) start-time))) + (if (number? size) + (let* ((% (* 100.0 (/ transferred size))) + (throughput (/ transferred elapsed)) + (left (format #f " ~a ~a" file + (byte-count->string size))) + (right (format #f "~a/s ~a ~a~6,1f%" + (byte-count->string throughput) + (seconds->string elapsed) + (progress-bar %) %))) + (erase-current-line log-port) + (display (string-pad-middle left right + (current-terminal-columns)) + log-port) + (force-output log-port)) + (let* ((throughput (/ transferred elapsed)) + (left (format #f " ~a" file)) + (right (format #f "~a/s ~a | ~a transferred" + (byte-count->string throughput) + (seconds->string elapsed) + (byte-count->string transferred)))) + (erase-current-line log-port) + (display (string-pad-middle left right + (current-terminal-columns)) + log-port) + (force-output log-port)))) + (define* (progress-reporter/file file size #:optional (log-port (current-output-port)) #:key (abbreviation basename)) @@ -192,37 +229,10 @@ ABBREVIATION used to shorten FILE for display." (let ((start-time (current-time time-monotonic)) (transferred 0)) (define (render) - "Write the progress report to LOG-PORT." - (define elapsed - (duration->seconds - (time-difference (current-time time-monotonic) start-time))) - (if (number? size) - (let* ((% (* 100.0 (/ transferred size))) - (throughput (/ transferred elapsed)) - (left (format #f " ~a ~a" - (abbreviation file) - (byte-count->string size))) - (right (format #f "~a/s ~a ~a~6,1f%" - (byte-count->string throughput) - (seconds->string elapsed) - (progress-bar %) %))) - (erase-current-line log-port) - (display (string-pad-middle left right - (current-terminal-columns)) - log-port) - (force-output log-port)) - (let* ((throughput (/ transferred elapsed)) - (left (format #f " ~a" - (abbreviation file))) - (right (format #f "~a/s ~a | ~a transferred" - (byte-count->string throughput) - (seconds->string elapsed) - (byte-count->string transferred)))) - (erase-current-line log-port) - (display (string-pad-middle left right - (current-terminal-columns)) - log-port) - (force-output log-port)))) + (display-download-progress (abbreviation file) size + #:start-time start-time + #:transferred transferred + #:log-port log-port)) (progress-reporter (start render) -- cgit v1.2.3 From dc0f74e5fc26977a3ee6c4f2aa74a141f4359982 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 18 Jan 2017 23:21:29 +0100 Subject: Add (guix status) and use it for pretty colored output. * guix/progress.scm (progress-reporter/trace): New procedure. (%progress-interval): New variable. (progress-reporter/file): Use it. * guix/scripts/build.scm (set-build-options-from-command-line): Pass #:print-extended-build-trace?. (%default-options): Add 'print-extended-build-trace?'. (guix-build): Parameterize CURRENT-TERMINAL-COLUMNS. Use 'build-status-updater'. * guix/scripts/environment.scm (%default-options): Add 'print-extended-build-trace?'. (guix-environment): Wrap body in 'with-status-report'. * guix/scripts/pack.scm (%default-options): Add 'print-build-trace?' and 'print-extended-build-trace?'. (guix-pack): Wrap body in 'with-status-report'. * guix/scripts/package.scm (%default-options, guix-package): Likewise. * guix/scripts/system.scm (%default-options, guix-system): Likewise. * guix/scripts/pull.scm (%default-options, guix-pull): Likewise. * guix/scripts/substitute.scm (progress-report-port): Don't call STOP when TOTAL is zero. (process-substitution): Add #:print-build-trace? and honor it. (guix-substitute)[print-build-trace?]: New variable. Pass #:print-build-trace? to 'process-substitution'. * guix/status.scm: New file. * guix/store.scm (set-build-options): Add #:print-extended-build-trace?; pass it into PAIRS. (%protocol-version): Bump. (protocol-version, nix-server-version): New procedures. (current-store-protocol-version): New variable. (with-store, build-things): Parameterize it. * guix/ui.scm (build-output-port): Remove. (colorize-string): Export. * po/guix/POTFILES.in: Add guix/status.scm. * tests/status.scm: New file. * Makefile.am (SCM_TESTS): Add it. * nix/libstore/worker-protocol.hh (PROTOCOL_VERSION): Bump to 0x162. * nix/libstore/build.cc (DerivationGoal::registerOutputs) (SubstitutionGoal::finished): Print a "@ hash-mismatch" trace before throwing. --- .dir-locals.el | 1 + Makefile.am | 2 + guix/progress.scm | 38 ++- guix/scripts/build.scm | 13 +- guix/scripts/environment.scm | 116 ++++----- guix/scripts/pack.scm | 142 +++++------ guix/scripts/package.scm | 25 +- guix/scripts/perform-download.scm | 1 + guix/scripts/pull.scm | 66 ++--- guix/scripts/substitute.scm | 42 +++- guix/scripts/system.scm | 11 +- guix/status.scm | 493 ++++++++++++++++++++++++++++++++++++++ guix/store.scm | 53 +++- guix/ui.scm | 122 +--------- nix/libstore/build.cc | 27 ++- nix/libstore/worker-protocol.hh | 2 +- po/guix/POTFILES.in | 1 + tests/status.scm | 115 +++++++++ 18 files changed, 939 insertions(+), 331 deletions(-) create mode 100644 guix/status.scm create mode 100644 tests/status.scm diff --git a/.dir-locals.el b/.dir-locals.el index eb99a5bcc1..793117c0ae 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -59,6 +59,7 @@ (eval . (put 'emacs-substitute-variables 'scheme-indent-function 1)) (eval . (put 'with-derivation-narinfo 'scheme-indent-function 1)) (eval . (put 'with-derivation-substitute 'scheme-indent-function 2)) + (eval . (put 'with-status-report 'scheme-indent-function 1)) (eval . (put 'mlambda 'scheme-indent-function 1)) (eval . (put 'mlambdaq 'scheme-indent-function 1)) diff --git a/Makefile.am b/Makefile.am index 5c8639d665..7fd29b90a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -131,6 +131,7 @@ MODULES = \ guix/svn-download.scm \ guix/i18n.scm \ guix/ui.scm \ + guix/status.scm \ guix/build/android-ndk-build-system.scm \ guix/build/ant-build-system.scm \ guix/build/download.scm \ @@ -340,6 +341,7 @@ SCM_TESTS = \ tests/glob.scm \ tests/grafts.scm \ tests/ui.scm \ + tests/status.scm \ tests/records.scm \ tests/upstream.scm \ tests/combinators.scm \ diff --git a/guix/progress.scm b/guix/progress.scm index d4ebb32991..3b9ff408cd 100644 --- a/guix/progress.scm +++ b/guix/progress.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Sou Bunnbu ;;; Copyright © 2015 Steve Sprang -;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2017, 2018 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,8 +38,11 @@ progress-reporter/silent progress-reporter/file progress-reporter/bar + progress-reporter/trace display-download-progress + erase-current-line + progress-bar byte-count->string current-terminal-columns @@ -220,6 +223,10 @@ throughput." log-port) (force-output log-port)))) +(define %progress-interval + ;; Default interval between subsequent outputs for rate-limited displays. + (make-time time-monotonic 200000000 0)) + (define* (progress-reporter/file file size #:optional (log-port (current-output-port)) #:key (abbreviation basename)) @@ -238,8 +245,7 @@ ABBREVIATION used to shorten FILE for display." (start render) ;; Report the progress every 300ms or longer. (report - (let ((rate-limited-render - (rate-limited render (make-time time-monotonic 300000000 0)))) + (let ((rate-limited-render (rate-limited render %progress-interval))) (lambda (value) (set! transferred value) (rate-limited-render)))) @@ -279,6 +285,32 @@ tasks is performed. Write PREFIX at the beginning of the line." (newline port)) (force-output port))))) +(define* (progress-reporter/trace file url size + #:optional (log-port (current-output-port))) + "Like 'progress-reporter/file', but instead of returning human-readable +progress reports, write \"build trace\" lines to be processed elsewhere." + (define (report-progress transferred) + (define message + (format #f "@ download-progress ~a ~a ~a ~a~%" + file url (or size "-") transferred)) + + (display message log-port) ;should be atomic + (flush-output-port log-port)) + + (progress-reporter + (start (lambda () + (display (format #f "@ download-started ~a ~a ~a~%" + file url (or size "-")) + log-port))) + (report (rate-limited report-progress %progress-interval)) + (stop (lambda () + (report-progress size) + (display (format #f "@ download-succeeded ~a ~a ~a~%" + file url + (or (and=> (stat file #f) stat:size) + size)) + log-port))))) + ;; TODO: replace '(@ (guix build utils) dump-port))'. (define* (dump-port* in out #:key (buffer-size 16384) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 9d38610633..5a6ba62bc3 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -45,6 +45,9 @@ #:use-module (srfi srfi-37) #:autoload (gnu packages) (specification->package %package-module-path) #:autoload (guix download) (download-to-store) + #:use-module (guix status) + #:use-module ((guix progress) #:select (current-terminal-columns)) + #:use-module ((guix build syscalls) #:select (terminal-columns)) #:export (%standard-build-options set-build-options-from-command-line set-build-options-from-command-line* @@ -390,6 +393,8 @@ options handled by 'set-build-options-from-command-line', and listed in #:max-silent-time (assoc-ref opts 'max-silent-time) #:timeout (assoc-ref opts 'timeout) #:print-build-trace (assoc-ref opts 'print-build-trace?) + #:print-extended-build-trace? + (assoc-ref opts 'print-extended-build-trace?) #:verbosity (assoc-ref opts 'verbosity))) (define set-build-options-from-command-line* @@ -499,6 +504,7 @@ options handled by 'set-build-options-from-command-line', and listed in (substitutes? . #t) (build-hook? . #t) (print-build-trace? . #t) + (print-extended-build-trace? . #t) (verbosity . 0))) (define (show-help) @@ -733,11 +739,12 @@ needed." ;; Set the build options before we do anything else. (set-build-options-from-command-line store opts) - (parameterize ((current-build-output-port + (parameterize ((current-terminal-columns (terminal-columns)) + (current-build-output-port (if quiet? (%make-void-port "w") - (build-output-port #:verbose? #t - #:port (duplicate-port (current-error-port) "w"))))) + (build-event-output-port + (build-status-updater print-build-event))))) (let* ((mode (assoc-ref opts 'build-mode)) (drv (options->derivations store opts)) (urls (map (cut string-append <> "/log") diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 1c04800e42..9fc7edcd36 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -21,6 +21,7 @@ (define-module (guix scripts environment) #:use-module (guix ui) #:use-module (guix store) + #:use-module (guix status) #:use-module (guix grafts) #:use-module (guix derivations) #:use-module (guix packages) @@ -173,6 +174,8 @@ COMMAND or an interactive shell in that environment.\n")) (substitutes? . #t) (build-hook? . #t) (graft? . #t) + (print-build-trace? . #t) + (print-extended-build-trace? . #t) (verbosity . 0))) (define (tag-package-arg opts arg) @@ -661,59 +664,60 @@ message if any test fails." (leave (G_ "'--user' cannot be used without '--container'~%"))) (with-store store - (set-build-options-from-command-line store opts) - - ;; Use the bootstrap Guile when requested. - (parameterize ((%graft? (assoc-ref opts 'graft?)) - (%guile-for-build - (package-derivation - store - (if bootstrap? - %bootstrap-guile - (canonical-package guile-2.2))))) - (run-with-store store - ;; Containers need a Bourne shell at /bin/sh. - (mlet* %store-monad ((bash (environment-bash container? - bootstrap? - system)) - (prof-drv (manifest->derivation - manifest system bootstrap?)) - (profile -> (derivation->output-path prof-drv)) - (gc-root -> (assoc-ref opts 'gc-root))) - - ;; First build the inputs. This is necessary even for - ;; --search-paths. Additionally, we might need to build bash for - ;; a container. - (mbegin %store-monad - (build-environment (if (derivation? bash) - (list prof-drv bash) - (list prof-drv)) - opts) - (mwhen gc-root - (register-gc-root profile gc-root)) - - (cond - ((assoc-ref opts 'dry-run?) - (return #t)) - ((assoc-ref opts 'search-paths) - (show-search-paths profile manifest #:pure? pure?) - (return #t)) - (container? - (let ((bash-binary - (if bootstrap? - bash - (string-append (derivation->output-path bash) - "/bin/sh")))) - (launch-environment/container #:command command - #:bash bash-binary - #:user user - #:user-mappings mappings - #:profile profile - #:manifest manifest - #:link-profile? link-prof? - #:network? network?))) - (else - (return - (exit/status - (launch-environment/fork command profile manifest - #:pure? pure?))))))))))))) + (with-status-report print-build-event + (set-build-options-from-command-line store opts) + + ;; Use the bootstrap Guile when requested. + (parameterize ((%graft? (assoc-ref opts 'graft?)) + (%guile-for-build + (package-derivation + store + (if bootstrap? + %bootstrap-guile + (canonical-package guile-2.2))))) + (run-with-store store + ;; Containers need a Bourne shell at /bin/sh. + (mlet* %store-monad ((bash (environment-bash container? + bootstrap? + system)) + (prof-drv (manifest->derivation + manifest system bootstrap?)) + (profile -> (derivation->output-path prof-drv)) + (gc-root -> (assoc-ref opts 'gc-root))) + + ;; First build the inputs. This is necessary even for + ;; --search-paths. Additionally, we might need to build bash for + ;; a container. + (mbegin %store-monad + (build-environment (if (derivation? bash) + (list prof-drv bash) + (list prof-drv)) + opts) + (mwhen gc-root + (register-gc-root profile gc-root)) + + (cond + ((assoc-ref opts 'dry-run?) + (return #t)) + ((assoc-ref opts 'search-paths) + (show-search-paths profile manifest #:pure? pure?) + (return #t)) + (container? + (let ((bash-binary + (if bootstrap? + bash + (string-append (derivation->output-path bash) + "/bin/sh")))) + (launch-environment/container #:command command + #:bash bash-binary + #:user user + #:user-mappings mappings + #:profile profile + #:manifest manifest + #:link-profile? link-prof? + #:network? network?))) + (else + (return + (exit/status + (launch-environment/fork command profile manifest + #:pure? pure?)))))))))))))) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 1916f3b9d7..163f5b1dc1 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -25,6 +25,7 @@ #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix store) + #:use-module (guix status) #:use-module (guix grafts) #:use-module (guix monads) #:use-module (guix modules) @@ -538,6 +539,8 @@ please email '~a'~%") (substitutes? . #t) (build-hook? . #t) (graft? . #t) + (print-build-trace? . #t) + (print-extended-build-trace? . #t) (verbosity . 0) (symlinks . ()) (compressor . ,(first %compressors)))) @@ -684,72 +687,73 @@ Create a bundle of PACKAGE.\n")) (with-error-handling (with-store store - ;; Set the build options before we do anything else. - (set-build-options-from-command-line store opts) - - (parameterize ((%graft? (assoc-ref opts 'graft?)) - (%guile-for-build (package-derivation - store - (if (assoc-ref opts 'bootstrap?) - %bootstrap-guile - (canonical-package guile-2.2)) - (assoc-ref opts 'system) - #:graft? (assoc-ref opts 'graft?)))) - (let* ((dry-run? (assoc-ref opts 'dry-run?)) - (relocatable? (assoc-ref opts 'relocatable?)) - (manifest (let ((manifest (manifest-from-args store opts))) - ;; Note: We cannot honor '--bootstrap' here because - ;; 'glibc-bootstrap' lacks 'libc.a'. - (if relocatable? - (map-manifest-entries wrapped-package manifest) - manifest))) - (pack-format (assoc-ref opts 'format)) - (name (string-append (symbol->string pack-format) - "-pack")) - (target (assoc-ref opts 'target)) - (bootstrap? (assoc-ref opts 'bootstrap?)) - (compressor (if bootstrap? - bootstrap-xz - (assoc-ref opts 'compressor))) - (archiver (if (equal? pack-format 'squashfs) - squashfs-tools-next - (if bootstrap? - %bootstrap-coreutils&co - tar))) - (symlinks (assoc-ref opts 'symlinks)) - (build-image (match (assq-ref %formats pack-format) - ((? procedure? proc) proc) - (#f - (leave (G_ "~a: unknown pack format~%") - pack-format)))) - (localstatedir? (assoc-ref opts 'localstatedir?))) - (run-with-store store - (mlet* %store-monad ((profile (profile-derivation - manifest - #:relative-symlinks? relocatable? - #:hooks (if bootstrap? - '() - %default-profile-hooks) - #:locales? (not bootstrap?) - #:target target)) - (drv (build-image name profile - #:target - target - #:compressor - compressor - #:symlinks - symlinks - #:localstatedir? - localstatedir? - #:archiver - archiver))) - (mbegin %store-monad - (show-what-to-build* (list drv) - #:use-substitutes? - (assoc-ref opts 'substitutes?) - #:dry-run? dry-run?) - (munless dry-run? - (built-derivations (list drv)) - (return (format #t "~a~%" - (derivation->output-path drv)))))) - #:system (assoc-ref opts 'system))))))) + (with-status-report print-build-event + ;; Set the build options before we do anything else. + (set-build-options-from-command-line store opts) + + (parameterize ((%graft? (assoc-ref opts 'graft?)) + (%guile-for-build (package-derivation + store + (if (assoc-ref opts 'bootstrap?) + %bootstrap-guile + (canonical-package guile-2.2)) + (assoc-ref opts 'system) + #:graft? (assoc-ref opts 'graft?)))) + (let* ((dry-run? (assoc-ref opts 'dry-run?)) + (relocatable? (assoc-ref opts 'relocatable?)) + (manifest (let ((manifest (manifest-from-args store opts))) + ;; Note: We cannot honor '--bootstrap' here because + ;; 'glibc-bootstrap' lacks 'libc.a'. + (if relocatable? + (map-manifest-entries wrapped-package manifest) + manifest))) + (pack-format (assoc-ref opts 'format)) + (name (string-append (symbol->string pack-format) + "-pack")) + (target (assoc-ref opts 'target)) + (bootstrap? (assoc-ref opts 'bootstrap?)) + (compressor (if bootstrap? + bootstrap-xz + (assoc-ref opts 'compressor))) + (archiver (if (equal? pack-format 'squashfs) + squashfs-tools-next + (if bootstrap? + %bootstrap-coreutils&co + tar))) + (symlinks (assoc-ref opts 'symlinks)) + (build-image (match (assq-ref %formats pack-format) + ((? procedure? proc) proc) + (#f + (leave (G_ "~a: unknown pack format~%") + pack-format)))) + (localstatedir? (assoc-ref opts 'localstatedir?))) + (run-with-store store + (mlet* %store-monad ((profile (profile-derivation + manifest + #:relative-symlinks? relocatable? + #:hooks (if bootstrap? + '() + %default-profile-hooks) + #:locales? (not bootstrap?) + #:target target)) + (drv (build-image name profile + #:target + target + #:compressor + compressor + #:symlinks + symlinks + #:localstatedir? + localstatedir? + #:archiver + archiver))) + (mbegin %store-monad + (show-what-to-build* (list drv) + #:use-substitutes? + (assoc-ref opts 'substitutes?) + #:dry-run? dry-run?) + (munless dry-run? + (built-derivations (list drv)) + (return (format #t "~a~%" + (derivation->output-path drv)))))) + #:system (assoc-ref opts 'system)))))))) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index c3ed2ac935..93a77915fe 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -24,6 +24,7 @@ (define-module (guix scripts package) #:use-module (guix ui) + #:use-module (guix status) #:use-module (guix store) #:use-module (guix grafts) #:use-module (guix derivations) @@ -330,7 +331,8 @@ ENTRIES, a list of manifest entries, in the context of PROFILE." (graft? . #t) (substitutes? . #t) (build-hook? . #t) - (print-build-trace? . #t))) + (print-build-trace? . #t) + (print-extended-build-trace? . #t))) (define (show-help) (display (G_ "Usage: guix package [OPTION]... @@ -941,15 +943,12 @@ processed, #f otherwise." (or (process-query opts) (parameterize ((%store (open-connection)) (%graft? (assoc-ref opts 'graft?))) - (set-build-options-from-command-line (%store) opts) - - (parameterize ((%guile-for-build - (package-derivation - (%store) - (if (assoc-ref opts 'bootstrap?) - %bootstrap-guile - (canonical-package guile-2.2)))) - (current-build-output-port - (build-output-port #:verbose? verbose? - #:port (duplicate-port (current-error-port) "w")))) - (process-actions (%store) opts)))))) + (with-status-report print-build-event/quiet + (set-build-options-from-command-line (%store) opts) + (parameterize ((%guile-for-build + (package-derivation + (%store) + (if (assoc-ref opts 'bootstrap?) + %bootstrap-guile + (canonical-package guile-2.2))))) + (process-actions (%store) opts))))))) diff --git a/guix/scripts/perform-download.scm b/guix/scripts/perform-download.scm index 18e2fc92f2..9f6ecc00d2 100644 --- a/guix/scripts/perform-download.scm +++ b/guix/scripts/perform-download.scm @@ -48,6 +48,7 @@ OUTPUT. Note: Unless OUTPUT is #f, we don't read the value of 'out' in DRV since the actual output is different from that when we're doing a 'bmCheck' or 'bmRepair' build." + ;; TODO: Use 'trace-progress-proc' when possible. (derivation-let drv ((url "url") (output* "out") (executable "executable") diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 39aebb18e2..803f7cf142 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -20,6 +20,7 @@ (define-module (guix scripts pull) #:use-module (guix ui) #:use-module (guix utils) + #:use-module (guix status) #:use-module (guix scripts) #:use-module (guix store) #:use-module (guix config) @@ -61,6 +62,8 @@ `((system . ,(%current-system)) (substitutes? . #t) (build-hook? . #t) + (print-build-trace? . #t) + (print-extended-build-trace? . #t) (graft? . #t) (verbosity . 0))) @@ -447,36 +450,37 @@ Use '~/.config/guix/channels.scm' instead.")) #t) ;XXX: not very useful (else (with-store store - (parameterize ((%graft? (assoc-ref opts 'graft?)) - (%repository-cache-directory cache)) - (set-build-options-from-command-line store opts) - (honor-x509-certificates store) - - (let ((instances (latest-channel-instances store channels))) - (format (current-error-port) - (N_ "Building from this channel:~%" - "Building from these channels:~%" - (length instances))) - (for-each (lambda (instance) - (let ((channel - (channel-instance-channel instance))) - (format (current-error-port) - " ~10a~a\t~a~%" - (channel-name channel) - (channel-url channel) - (string-take - (channel-instance-commit instance) - 7)))) - instances) - (parameterize ((%guile-for-build - (package-derivation - store - (if (assoc-ref opts 'bootstrap?) - %bootstrap-guile - (canonical-package guile-2.2))))) - (run-with-store store - (build-and-install instances profile - #:verbose? - (assoc-ref opts 'verbose?))))))))))))) + (with-status-report print-build-event + (parameterize ((%graft? (assoc-ref opts 'graft?)) + (%repository-cache-directory cache)) + (set-build-options-from-command-line store opts) + (honor-x509-certificates store) + + (let ((instances (latest-channel-instances store channels))) + (format (current-error-port) + (N_ "Building from this channel:~%" + "Building from these channels:~%" + (length instances))) + (for-each (lambda (instance) + (let ((channel + (channel-instance-channel instance))) + (format (current-error-port) + " ~10a~a\t~a~%" + (channel-name channel) + (channel-url channel) + (string-take + (channel-instance-commit instance) + 7)))) + instances) + (parameterize ((%guile-for-build + (package-derivation + store + (if (assoc-ref opts 'bootstrap?) + %bootstrap-guile + (canonical-package guile-2.2))))) + (run-with-store store + (build-and-install instances profile + #:verbose? + (assoc-ref opts 'verbose?)))))))))))))) ;;; pull.scm ends here diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 50c6a22064..eb82224016 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -837,7 +837,16 @@ REPORTER, which should be a object." (make-custom-binary-input-port "progress-port-proc" read! #f #f (lambda () - (stop) + ;; XXX: Kludge! When used through + ;; 'decompressed-port', this port ends + ;; up being closed twice: once in a + ;; child process early on, and at the + ;; end in the parent process. Ignore + ;; the early close so we don't output + ;; a spurious "download-succeeded" + ;; trace. + (unless (zero? total) + (stop)) (close-port port))))))) (define-syntax with-networking @@ -930,7 +939,7 @@ authorized substitutes." (error "unknown `--query' command" wtf)))) (define* (process-substitution store-item destination - #:key cache-urls acl) + #:key cache-urls acl print-build-trace?) "Substitute STORE-ITEM (a store file name) from CACHE-URLS, and write it to DESTINATION as a nar file. Verify the substitute against ACL." (let* ((narinfo (lookup-narinfo cache-urls store-item @@ -943,8 +952,10 @@ DESTINATION as a nar file. Verify the substitute against ACL." ;; Tell the daemon what the expected hash of the Nar itself is. (format #t "~a~%" (narinfo-hash narinfo)) - (format (current-error-port) - (G_ "Downloading ~a...~%") (uri->string uri)) + (unless print-build-trace? + (format (current-error-port) + (G_ "Downloading ~a...~%") (uri->string uri))) + (let*-values (((raw download-size) ;; Note that Hydra currently generates Nars on the fly ;; and doesn't specify a Content-Length, so @@ -955,10 +966,15 @@ DESTINATION as a nar file. Verify the substitute against ACL." (dl-size (or download-size (and (equal? comp "none") (narinfo-size narinfo)))) - (reporter (progress-reporter/file - (uri->string uri) dl-size - (current-error-port) - #:abbreviation nar-uri-abbreviation))) + (reporter (if print-build-trace? + (progress-reporter/trace + destination + (uri->string uri) dl-size + (current-error-port)) + (progress-reporter/file + (uri->string uri) dl-size + (current-error-port) + #:abbreviation nar-uri-abbreviation)))) (progress-report-port reporter raw))) ((input pids) ;; NOTE: This 'progress' port of current process will be @@ -1058,6 +1074,13 @@ default value." (define (guix-substitute . args) "Implement the build daemon's substituter protocol." + (define print-build-trace? + (match (or (find-daemon-option "untrusted-print-extended-build-trace") + (find-daemon-option "print-extended-build-trace")) + (#f #f) + ((= string->number number) (> number 0)) + (_ #f))) + (mkdir-p %narinfo-cache-directory) (maybe-remove-expired-cache-entries %narinfo-cache-directory cached-narinfo-files @@ -1111,7 +1134,8 @@ default value." (parameterize ((current-terminal-columns (client-terminal-columns))) (process-substitution store-path destination #:cache-urls (substitute-urls) - #:acl (current-acl)))) + #:acl (current-acl) + #:print-build-trace? print-build-trace?))) ((or ("-V") ("--version")) (show-version-and-exit "guix substitute")) (("--help") diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 1e7620f147..f9d6b9e5b6 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -23,6 +23,7 @@ (define-module (guix scripts system) #:use-module (guix config) #:use-module (guix ui) + #:use-module (guix status) #:use-module (guix store) #:autoload (guix store database) (register-path) #:use-module (guix grafts) @@ -1079,6 +1080,8 @@ Some ACTIONS support additional ARGS.\n")) `((system . ,(%current-system)) (substitutes? . #t) (build-hook? . #t) + (print-build-trace? . #t) + (print-extended-build-trace? . #t) (graft? . #t) (verbosity . 0) (file-system-type . "ext4") @@ -1253,9 +1256,11 @@ argument list and OPTS is the option alist." parse-sub-command)) (args (option-arguments opts)) (command (assoc-ref opts 'action))) - (parameterize ((%graft? (assoc-ref opts 'graft?)) - (current-terminal-columns (terminal-columns))) - (process-command command args opts))))) + (parameterize ((%graft? (assoc-ref opts 'graft?))) + (with-status-report (if (memq command '(init reconfigure)) + print-build-event/quiet + print-build-event) + (process-command command args opts)))))) ;;; Local Variables: ;;; eval: (put 'call-with-service-upgrade-info 'scheme-indent-function 1) diff --git a/guix/status.scm b/guix/status.scm new file mode 100644 index 0000000000..94d4748af5 --- /dev/null +++ b/guix/status.scm @@ -0,0 +1,493 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017, 2018 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 (guix status) + #:use-module (guix records) + #:use-module (guix i18n) + #:use-module ((guix ui) #:select (colorize-string)) + #:use-module (guix progress) + #:autoload (guix build syscalls) (terminal-columns) + #:use-module ((guix build download) + #:select (nar-uri-abbreviation)) + #:use-module ((guix store) + #:select (current-build-output-port + current-store-protocol-version + log-file)) + #:use-module (guix derivations) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-9) + #:use-module (srfi srfi-19) + #:use-module (srfi srfi-26) + #:use-module (ice-9 regex) + #:use-module (ice-9 match) + #:use-module (ice-9 format) + #:use-module (ice-9 binary-ports) + #:use-module (rnrs bytevectors) + #:use-module ((system foreign) + #:select (bytevector->pointer pointer->bytevector)) + #:export (build-event-output-port + compute-status + + build-status + build-status? + build-status-building + build-status-downloading + build-status-builds-completed + build-status-downloads-completed + + download? + download + download-item + download-uri + download-size + download-start + download-end + download-transferred + + build-status-updater + print-build-event + print-build-event/quiet + print-build-status + + with-status-report)) + +;;; Commentary: +;;; +;;; This module provides facilities to track the status of ongoing builds and +;;; downloads in a given session, as well as tools to report about the current +;;; status to user interfaces. It does so by analyzing the output of +;;; 'current-build-output-port'. The build status is maintained in a +;;; record. +;;; +;;; Code: + + +;;; +;;; Build status tracking. +;;; + +;; Builds and substitutions performed by the daemon. +(define-record-type* build-status make-build-status + build-status? + (building build-status-building ;list of drv + (default '())) + (downloading build-status-downloading ;list of + (default '())) + (builds-completed build-status-builds-completed ;list of drv + (default '())) + (downloads-completed build-status-downloads-completed ;list of store items + (default '()))) + +;; On-going or completed downloads. Downloads can be stem from substitutes +;; and from "builtin:download" fixed-output derivations. +(define-record-type + (%download item uri size start end transferred) + download? + (item download-item) ;store item + (uri download-uri) ;string | #f + (size download-size) ;integer | #f + (start download-start) ;